From 9837b5b4293b4e9a324049c0a59b4f9dcf45ea14 Mon Sep 17 00:00:00 2001 From: Nestor Date: Mon, 4 Feb 2019 09:26:25 +0100 Subject: [PATCH 1/2] add volumeMounts/mountPath to varreference Signed-off-by: Nestor --- .../config/defaultconfig/varreference.go | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pkg/transformers/config/defaultconfig/varreference.go b/pkg/transformers/config/defaultconfig/varreference.go index 35a92d78e..068d83fd8 100644 --- a/pkg/transformers/config/defaultconfig/varreference.go +++ b/pkg/transformers/config/defaultconfig/varreference.go @@ -105,5 +105,47 @@ varReference: - path: spec/tls/hosts kind: Ingress + +- path: spec/template/spec/containers/volumeMounts/mountPath + kind: StatefulSet + +- path: spec/template/spec/initContainers/volumeMounts/mountPath + kind: StatefulSet + +- path: spec/containers/volumeMounts/mountPath + kind: Pod + +- path: spec/initContainers/volumeMounts/mountPath + kind: Pod + +- path: spec/template/spec/containers/volumeMounts/mountPath + kind: ReplicaSet + +- path: spec/template/spec/initContainers/volumeMounts/mountPath + kind: ReplicaSet + +- path: spec/template/spec/containers/volumeMounts/mountPath + kind: Job + +- path: spec/template/spec/initContainers/volumeMounts/mountPath + kind: Job + +- path: spec/template/spec/containers/volumeMounts/mountPath + kind: CronJob + +- path: spec/template/spec/initContainers/volumeMounts/mountPath + kind: CronJob + +- path: spec/template/spec/containers/volumeMounts/mountPath + kind: DaemonSet + +- path: spec/template/spec/initContainers/volumeMounts/mountPath + kind: DaemonSet + +- path: spec/template/spec/containers/volumeMounts/mountPath + kind: Deployment + +- path: spec/template/spec/initContainers/volumeMounts/mountPath + kind: Deployment ` ) From d968c0b4b10c429535f295b01633a9b122e58e6f Mon Sep 17 00:00:00 2001 From: Nestor Date: Mon, 11 Feb 2019 07:51:03 +0100 Subject: [PATCH 2/2] add varref mountpath test case --- pkg/target/variableref_test.go | 77 ++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/pkg/target/variableref_test.go b/pkg/target/variableref_test.go index afe6ea3cb..60aa47add 100644 --- a/pkg/target/variableref_test.go +++ b/pkg/target/variableref_test.go @@ -723,3 +723,80 @@ spec: - kustomized-nginx.example.com `) } + +func TestVariableRefMounthPath(t *testing.T) { + th := NewKustTestHarness(t, "/app/base") + th.writeK("/app/base", ` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- deployment.yaml +- namespace.yaml + +vars: +- name: NAMESPACE + objref: + apiVersion: v1 + kind: Namespace + name: my-namespace + +`) + th.writeF("/app/base/deployment.yaml", ` + apiVersion: apps/v1 + kind: Deployment + metadata: + name: my-deployment + spec: + template: + spec: + containers: + - name: app + image: busybox + volumeMounts: + - name: my-volume + mountPath: "/$(NAMESPACE)" + env: + - name: NAMESPACE + value: $(NAMESPACE) + volumes: + - name: my-volume + emptyDir: {} +`) + th.writeF("/app/base/namespace.yaml", ` + apiVersion: v1 + kind: Namespace + metadata: + name: my-namespace +`) + + m, err := th.makeKustTarget().MakeCustomizedResMap() + if err != nil { + t.Fatalf("Err: %v", err) + } + th.assertActualEqualsExpected(m, ` +apiVersion: v1 +kind: Namespace +metadata: + name: my-namespace +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: my-deployment +spec: + template: + spec: + containers: + - env: + - name: NAMESPACE + value: my-namespace + image: busybox + name: app + volumeMounts: + - mountPath: /my-namespace + name: my-volume + volumes: + - emptyDir: {} + name: my-volume +`) +}