[v9] helm: Backport chart changes from unit test addition (#11336)

gravitational · Mar 22, 2022 · f303f41 · f303f41
1 parent ebc3406
commit f303f41
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 4 deletions.
diff --git a/.../chart/teleport-cluster/.lint/service.yml → ...chart/teleport-cluster/.lint/service.yaml b/.../chart/teleport-cluster/.lint/service.yml → ...chart/teleport-cluster/.lint/service.yaml
diff --git a/examples/chart/teleport-cluster/.lint/standalone-customsize.yaml b/examples/chart/teleport-cluster/.lint/standalone-customsize.yaml
@@ -1,7 +1,7 @@
 clusterName: test-standalone-cluster
 chartMode: standalone
 standalone:
-  existingClaimName: teleport-storage
+  volumeSize: 50Gi
 acme: true
 acmeEmail: [email protected]
 labels:

diff --git a/examples/chart/teleport-cluster/.lint/standalone-existingpvc.yaml b/examples/chart/teleport-cluster/.lint/standalone-existingpvc.yaml
@@ -1,7 +1,7 @@
 clusterName: test-standalone-cluster
 chartMode: standalone
 standalone:
-  volumeSize: 50Gi
+  existingClaimName: teleport-storage
 acme: true
 acmeEmail: [email protected]
 labels:

diff --git a/examples/chart/teleport-cluster/.lint/volumes.yaml b/examples/chart/teleport-cluster/.lint/volumes.yaml
@@ -1,7 +1,7 @@
 clusterName: helm-lint
 extraVolumeMounts:
 - name: "my-mount"
-  path: "/path/to/mount"
+  mountPath: "/path/to/mount"
 extraVolumes:
 - name: "my-mount"
   secret:

diff --git a/examples/chart/teleport-kube-agent/.lint/existing-data-volume.yaml b/examples/chart/teleport-kube-agent/.lint/existing-data-volume.yaml
@@ -0,0 +1,5 @@
+authToken: auth-token
+proxyAddr: proxy.example.com:3080
+roles: kube
+kubeClusterName: test-kube-cluster
+existingDataVolume: teleport-kube-agent-data
diff --git a/examples/chart/teleport-kube-agent/.lint/image-pull-policy-stateful.yaml b/examples/chart/teleport-kube-agent/.lint/image-pull-policy-stateful.yaml
@@ -0,0 +1,7 @@
+authToken: auth-token
+proxyAddr: proxy.example.com:3080
+kubeClusterName: test-kube-cluster-name
+storage:
+  enabled: true
+  storageClassName: "aws-gp2"
+imagePullPolicy: Always
diff --git a/examples/chart/teleport-kube-agent/.lint/image-pull-policy.yaml b/examples/chart/teleport-kube-agent/.lint/image-pull-policy.yaml
@@ -0,0 +1,5 @@
+authToken: auth-token
+proxyAddr: proxy.example.com:3080
+roles: kube
+kubeClusterName: test-kube-cluster
+imagePullPolicy: Always
diff --git a/examples/chart/teleport-kube-agent/.lint/service-account-name.yaml b/examples/chart/teleport-kube-agent/.lint/service-account-name.yaml
@@ -0,0 +1,5 @@
+authToken: auth-token
+proxyAddr: proxy.example.com:3080
+roles: kube
+kubeClusterName: test-kube-cluster
+serviceAccountName: teleport-kube-agent-sa
diff --git a/examples/chart/teleport-kube-agent/.lint/volumes.yaml b/examples/chart/teleport-kube-agent/.lint/volumes.yaml
@@ -4,7 +4,7 @@ roles: kube
 kubeClusterName: test-kube-cluster
 extraVolumeMounts:
 - name: "my-mount"
-  path: "/path/to/mount"
+  mountPath: "/path/to/mount"
 extraVolumes:
 - name: "my-mount"
   secret:

diff --git a/examples/chart/teleport-kube-agent/templates/deployment.yaml b/examples/chart/teleport-kube-agent/templates/deployment.yaml
@@ -114,6 +114,9 @@ spec:
       containers:
       - name: "teleport"
         image: "{{ if .Values.enterprise }}{{ .Values.enterpriseImage }}{{ else }}{{ .Values.image }}{{ end }}:{{ .teleportVersion }}"
+        {{- if .Values.imagePullPolicy }}
+        imagePullPolicy: {{ toYaml .Values.imagePullPolicy }}
+        {{- end }}
         {{- if .Values.extraEnv }}
         env:
           {{- toYaml .Values.extraEnv | nindent 10 }}

diff --git a/examples/chart/teleport-kube-agent/templates/statefulset.yaml b/examples/chart/teleport-kube-agent/templates/statefulset.yaml
@@ -110,6 +110,9 @@ spec:
       containers:
       - name: "teleport"
         image: "{{ if .Values.enterprise }}{{ .Values.enterpriseImage }}{{ else }}{{ .Values.image }}{{ end }}:{{ .teleportVersion }}"
+        {{- if .Values.imagePullPolicy }}
+        imagePullPolicy: {{ toYaml .Values.imagePullPolicy }}
+        {{- end }}
         {{- if .Values.extraEnv }}
         env:
           {{- toYaml .Values.extraEnv | nindent 10 }}

diff --git a/examples/chart/teleport-kube-agent/values.yaml b/examples/chart/teleport-kube-agent/values.yaml
@@ -67,6 +67,7 @@ insecureSkipProxyTLSVerify: false
 
 # If set, will use an existing volume mounted via extraVolumes
 # as the Teleport data directory.
+# If anything is set under the "storage" key, this will be ignored.
 existingDataVolume: ""
 
 # If true, create & use Pod Security Policy resources