summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-12 23:46:20 +0000
committerGerrit Code Review <review@openstack.org>2018-11-12 23:46:20 +0000
commit1dcb2de9e1ac52164039ac5b1e2a1bf300d886db (patch)
treeff7af091ef24c9c1476a2ccd7633ae22d0213f66
parenteebedea5f2fb70c73851f94da4dfd71586236a23 (diff)
parent461f4e93d5e56c2327005aa13f7660b377704a4d (diff)
Merge "Change all ConfigMap to Secret"
-rw-r--r--divingbell/templates/daemonset-ethtool.yaml18
-rw-r--r--divingbell/templates/daemonset-limits.yaml18
-rw-r--r--divingbell/templates/daemonset-mounts.yaml18
-rw-r--r--divingbell/templates/daemonset-sysctl.yaml18
-rw-r--r--divingbell/templates/daemonset-uamlite.yaml18
-rw-r--r--divingbell/templates/secret-ethtool.yaml (renamed from divingbell/templates/configmap-ethtool.yaml)10
-rw-r--r--divingbell/templates/secret-limits.yaml (renamed from divingbell/templates/configmap-limits.yaml)10
-rw-r--r--divingbell/templates/secret-mounts.yaml (renamed from divingbell/templates/configmap-mounts.yaml)10
-rw-r--r--divingbell/templates/secret-sysctl.yaml (renamed from divingbell/templates/configmap-sysctl.yaml)10
-rw-r--r--divingbell/templates/secret-uamlite.yaml (renamed from divingbell/templates/configmap-uamlite.yaml)10
10 files changed, 70 insertions, 70 deletions
diff --git a/divingbell/templates/daemonset-ethtool.yaml b/divingbell/templates/daemonset-ethtool.yaml
index 3f21328..f58b5d1 100644
--- a/divingbell/templates/daemonset-ethtool.yaml
+++ b/divingbell/templates/daemonset-ethtool.yaml
@@ -16,7 +16,7 @@
16 16
17{{- define "divingbell.daemonset.ethtool" }} 17{{- define "divingbell.daemonset.ethtool" }}
18 {{- $daemonset := index . 0 }} 18 {{- $daemonset := index . 0 }}
19 {{- $configMapName := index . 1 }} 19 {{- $secretName := index . 1 }}
20 {{- $envAll := index . 2 }} 20 {{- $envAll := index . 2 }}
21 {{- with $envAll }} 21 {{- with $envAll }}
22--- 22---
@@ -46,7 +46,7 @@ spec:
46 volumeMounts: 46 volumeMounts:
47 - name: rootfs-{{ $daemonset }} 47 - name: rootfs-{{ $daemonset }}
48 mountPath: {{ .Values.conf.chroot_mnt_path }} 48 mountPath: {{ .Values.conf.chroot_mnt_path }}
49 - name: {{ $configMapName }} 49 - name: {{ $secretName }}
50 mountPath: /tmp/{{ $daemonset }}.sh 50 mountPath: /tmp/{{ $daemonset }}.sh
51 subPath: {{ $daemonset }} 51 subPath: {{ $daemonset }}
52 readOnly: true 52 readOnly: true
@@ -56,16 +56,16 @@ spec:
56 - name: rootfs-{{ $daemonset }} 56 - name: rootfs-{{ $daemonset }}
57 hostPath: 57 hostPath:
58 path: / 58 path: /
59 - name: {{ $configMapName }} 59 - name: {{ $secretName }}
60 configMap: 60 secret:
61 name: {{ $configMapName }} 61 secretName: {{ $secretName }}
62 defaultMode: 0555 62 defaultMode: 0555
63 {{- end }} 63 {{- end }}
64{{- end }} 64{{- end }}
65{{- if .Values.manifests.daemonset_ethtool }} 65{{- if .Values.manifests.daemonset_ethtool }}
66{{- $daemonset := "ethtool" }} 66{{- $daemonset := "ethtool" }}
67{{- $configMapName := "divingbell-ethtool" }} 67{{- $secretName := "divingbell-ethtool" }}
68{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.ethtool" | toString | fromYaml }} 68{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.ethtool" | toString | fromYaml }}
69{{- $configmap_include := "divingbell.configmap.ethtool" }} 69{{- $secret_include := "divingbell.secret.ethtool" }}
70{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} 70{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
71{{- end }} 71{{- end }}
diff --git a/divingbell/templates/daemonset-limits.yaml b/divingbell/templates/daemonset-limits.yaml
index fd239d3..fa7c767 100644
--- a/divingbell/templates/daemonset-limits.yaml
+++ b/divingbell/templates/daemonset-limits.yaml
@@ -16,7 +16,7 @@
16 16
17{{- define "divingbell.daemonset.limits" }} 17{{- define "divingbell.daemonset.limits" }}
18 {{- $daemonset := index . 0 }} 18 {{- $daemonset := index . 0 }}
19 {{- $configMapName := index . 1 }} 19 {{- $secretName := index . 1 }}
20 {{- $envAll := index . 2 }} 20 {{- $envAll := index . 2 }}
21 {{- with $envAll }} 21 {{- with $envAll }}
22--- 22---
@@ -46,7 +46,7 @@ spec:
46 volumeMounts: 46 volumeMounts:
47 - name: rootfs-{{ $daemonset }} 47 - name: rootfs-{{ $daemonset }}
48 mountPath: {{ .Values.conf.chroot_mnt_path }} 48 mountPath: {{ .Values.conf.chroot_mnt_path }}
49 - name: {{ $configMapName }} 49 - name: {{ $secretName }}
50 mountPath: /tmp/{{ $daemonset }}.sh 50 mountPath: /tmp/{{ $daemonset }}.sh
51 subPath: {{ $daemonset }} 51 subPath: {{ $daemonset }}
52 readOnly: true 52 readOnly: true
@@ -56,16 +56,16 @@ spec:
56 - name: rootfs-{{ $daemonset }} 56 - name: rootfs-{{ $daemonset }}
57 hostPath: 57 hostPath:
58 path: / 58 path: /
59 - name: {{ $configMapName }} 59 - name: {{ $secretName }}
60 configMap: 60 secret:
61 name: {{ $configMapName }} 61 secretName: {{ $secretName }}
62 defaultMode: 0555 62 defaultMode: 0555
63 {{- end }} 63 {{- end }}
64{{- end }} 64{{- end }}
65{{- if .Values.manifests.daemonset_limits }} 65{{- if .Values.manifests.daemonset_limits }}
66{{- $daemonset := "limits" }} 66{{- $daemonset := "limits" }}
67{{- $configMapName := "divingbell-limits" }} 67{{- $secretName := "divingbell-limits" }}
68{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.limits" | toString | fromYaml }} 68{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.limits" | toString | fromYaml }}
69{{- $configmap_include := "divingbell.configmap.limits" }} 69{{- $secret_include := "divingbell.secret.limits" }}
70{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} 70{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
71{{- end }} 71{{- end }}
diff --git a/divingbell/templates/daemonset-mounts.yaml b/divingbell/templates/daemonset-mounts.yaml
index fb4fc19..cf7addc 100644
--- a/divingbell/templates/daemonset-mounts.yaml
+++ b/divingbell/templates/daemonset-mounts.yaml
@@ -16,7 +16,7 @@
16 16
17{{- define "divingbell.daemonset.mounts" }} 17{{- define "divingbell.daemonset.mounts" }}
18 {{- $daemonset := index . 0 }} 18 {{- $daemonset := index . 0 }}
19 {{- $configMapName := index . 1 }} 19 {{- $secretName := index . 1 }}
20 {{- $envAll := index . 2 }} 20 {{- $envAll := index . 2 }}
21 {{- with $envAll }} 21 {{- with $envAll }}
22--- 22---
@@ -46,7 +46,7 @@ spec:
46 volumeMounts: 46 volumeMounts:
47 - name: rootfs-{{ $daemonset }} 47 - name: rootfs-{{ $daemonset }}
48 mountPath: {{ .Values.conf.chroot_mnt_path }} 48 mountPath: {{ .Values.conf.chroot_mnt_path }}
49 - name: {{ $configMapName }} 49 - name: {{ $secretName }}
50 mountPath: /tmp/{{ $daemonset }}.sh 50 mountPath: /tmp/{{ $daemonset }}.sh
51 subPath: {{ $daemonset }} 51 subPath: {{ $daemonset }}
52 readOnly: true 52 readOnly: true
@@ -56,16 +56,16 @@ spec:
56 - name: rootfs-{{ $daemonset }} 56 - name: rootfs-{{ $daemonset }}
57 hostPath: 57 hostPath:
58 path: / 58 path: /
59 - name: {{ $configMapName }} 59 - name: {{ $secretName }}
60 configMap: 60 secret:
61 name: {{ $configMapName }} 61 secretName: {{ $secretName }}
62 defaultMode: 0555 62 defaultMode: 0555
63 {{- end }} 63 {{- end }}
64{{- end }} 64{{- end }}
65{{- if .Values.manifests.daemonset_mounts }} 65{{- if .Values.manifests.daemonset_mounts }}
66{{- $daemonset := "mounts" }} 66{{- $daemonset := "mounts" }}
67{{- $configMapName := "divingbell-mounts" }} 67{{- $secretName := "divingbell-mounts" }}
68{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.mounts" | toString | fromYaml }} 68{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.mounts" | toString | fromYaml }}
69{{- $configmap_include := "divingbell.configmap.mounts" }} 69{{- $secret_include := "divingbell.secret.mounts" }}
70{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} 70{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
71{{- end }} 71{{- end }}
diff --git a/divingbell/templates/daemonset-sysctl.yaml b/divingbell/templates/daemonset-sysctl.yaml
index b869935..7731302 100644
--- a/divingbell/templates/daemonset-sysctl.yaml
+++ b/divingbell/templates/daemonset-sysctl.yaml
@@ -16,7 +16,7 @@
16 16
17{{- define "divingbell.daemonset.sysctl" }} 17{{- define "divingbell.daemonset.sysctl" }}
18 {{- $daemonset := index . 0 }} 18 {{- $daemonset := index . 0 }}
19 {{- $configMapName := index . 1 }} 19 {{- $secretName := index . 1 }}
20 {{- $envAll := index . 2 }} 20 {{- $envAll := index . 2 }}
21 {{- with $envAll }} 21 {{- with $envAll }}
22--- 22---
@@ -46,7 +46,7 @@ spec:
46 volumeMounts: 46 volumeMounts:
47 - name: rootfs-{{ $daemonset }} 47 - name: rootfs-{{ $daemonset }}
48 mountPath: {{ .Values.conf.chroot_mnt_path }} 48 mountPath: {{ .Values.conf.chroot_mnt_path }}
49 - name: {{ $configMapName }} 49 - name: {{ $secretName }}
50 mountPath: /tmp/{{ $daemonset }}.sh 50 mountPath: /tmp/{{ $daemonset }}.sh
51 subPath: {{ $daemonset }} 51 subPath: {{ $daemonset }}
52 readOnly: true 52 readOnly: true
@@ -56,16 +56,16 @@ spec:
56 - name: rootfs-{{ $daemonset }} 56 - name: rootfs-{{ $daemonset }}
57 hostPath: 57 hostPath:
58 path: / 58 path: /
59 - name: {{ $configMapName }} 59 - name: {{ $secretName }}
60 configMap: 60 secret:
61 name: {{ $configMapName }} 61 secretName: {{ $secretName }}
62 defaultMode: 0555 62 defaultMode: 0555
63 {{- end }} 63 {{- end }}
64{{- end }} 64{{- end }}
65{{- if .Values.manifests.daemonset_sysctl }} 65{{- if .Values.manifests.daemonset_sysctl }}
66{{- $daemonset := "sysctl" }} 66{{- $daemonset := "sysctl" }}
67{{- $configMapName := "divingbell-sysctl" }} 67{{- $secretName := "divingbell-sysctl" }}
68{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.sysctl" | toString | fromYaml }} 68{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.sysctl" | toString | fromYaml }}
69{{- $configmap_include := "divingbell.configmap.sysctl" }} 69{{- $secret_include := "divingbell.secret.sysctl" }}
70{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} 70{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
71{{- end }} 71{{- end }}
diff --git a/divingbell/templates/daemonset-uamlite.yaml b/divingbell/templates/daemonset-uamlite.yaml
index 460cd10..b298973 100644
--- a/divingbell/templates/daemonset-uamlite.yaml
+++ b/divingbell/templates/daemonset-uamlite.yaml
@@ -16,7 +16,7 @@
16 16
17{{- define "divingbell.daemonset.uamlite" }} 17{{- define "divingbell.daemonset.uamlite" }}
18 {{- $daemonset := index . 0 }} 18 {{- $daemonset := index . 0 }}
19 {{- $configMapName := index . 1 }} 19 {{- $secretName := index . 1 }}
20 {{- $envAll := index . 2 }} 20 {{- $envAll := index . 2 }}
21 {{- with $envAll }} 21 {{- with $envAll }}
22--- 22---
@@ -46,7 +46,7 @@ spec:
46 volumeMounts: 46 volumeMounts:
47 - name: rootfs-{{ $daemonset }} 47 - name: rootfs-{{ $daemonset }}
48 mountPath: {{ .Values.conf.chroot_mnt_path }} 48 mountPath: {{ .Values.conf.chroot_mnt_path }}
49 - name: {{ $configMapName }} 49 - name: {{ $secretName }}
50 mountPath: /tmp/{{ $daemonset }}.sh 50 mountPath: /tmp/{{ $daemonset }}.sh
51 subPath: {{ $daemonset }} 51 subPath: {{ $daemonset }}
52 readOnly: true 52 readOnly: true
@@ -56,16 +56,16 @@ spec:
56 - name: rootfs-{{ $daemonset }} 56 - name: rootfs-{{ $daemonset }}
57 hostPath: 57 hostPath:
58 path: / 58 path: /
59 - name: {{ $configMapName }} 59 - name: {{ $secretName }}
60 configMap: 60 secret:
61 name: {{ $configMapName }} 61 secretName: {{ $secretName }}
62 defaultMode: 0555 62 defaultMode: 0555
63 {{- end }} 63 {{- end }}
64{{- end }} 64{{- end }}
65{{- if .Values.manifests.daemonset_uamlite }} 65{{- if .Values.manifests.daemonset_uamlite }}
66{{- $daemonset := "uamlite" }} 66{{- $daemonset := "uamlite" }}
67{{- $configMapName := "divingbell-uamlite" }} 67{{- $secretName := "divingbell-uamlite" }}
68{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.uamlite" | toString | fromYaml }} 68{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.uamlite" | toString | fromYaml }}
69{{- $configmap_include := "divingbell.configmap.uamlite" }} 69{{- $secret_include := "divingbell.secret.uamlite" }}
70{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} 70{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
71{{- end }} 71{{- end }}
diff --git a/divingbell/templates/configmap-ethtool.yaml b/divingbell/templates/secret-ethtool.yaml
index a6ae896..63d7d2d 100644
--- a/divingbell/templates/configmap-ethtool.yaml
+++ b/divingbell/templates/secret-ethtool.yaml
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
14limitations under the License. 14limitations under the License.
15*/}} 15*/}}
16 16
17{{- define "divingbell.configmap.ethtool" }} 17{{- define "divingbell.secret.ethtool" }}
18{{- $configMapName := index . 0 }} 18{{- $secretName := index . 0 }}
19{{- $envAll := index . 1 }} 19{{- $envAll := index . 1 }}
20{{- with $envAll }} 20{{- with $envAll }}
21--- 21---
22apiVersion: v1 22apiVersion: v1
23kind: ConfigMap 23kind: Secret
24metadata: 24metadata:
25 name: {{ $configMapName }} 25 name: {{ $secretName }}
26data: 26data:
27 ethtool: |+ 27 ethtool: |+
28{{ tuple "bin/_ethtool.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} 28{{ tuple "bin/_ethtool.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 29{{- end }}
30{{- end }} 30{{- end }}
diff --git a/divingbell/templates/configmap-limits.yaml b/divingbell/templates/secret-limits.yaml
index d79c59f..7d98e89 100644
--- a/divingbell/templates/configmap-limits.yaml
+++ b/divingbell/templates/secret-limits.yaml
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
14limitations under the License. 14limitations under the License.
15*/}} 15*/}}
16 16
17{{- define "divingbell.configmap.limits" }} 17{{- define "divingbell.secret.limits" }}
18{{- $configMapName := index . 0 }} 18{{- $secretName := index . 0 }}
19{{- $envAll := index . 1 }} 19{{- $envAll := index . 1 }}
20{{- with $envAll }} 20{{- with $envAll }}
21--- 21---
22apiVersion: v1 22apiVersion: v1
23kind: ConfigMap 23kind: Secret
24metadata: 24metadata:
25 name: {{ $configMapName }} 25 name: {{ $secretName }}
26data: 26data:
27 limits: |+ 27 limits: |+
28{{ tuple "bin/_limits.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} 28{{ tuple "bin/_limits.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 29{{- end }}
30{{- end }} 30{{- end }}
diff --git a/divingbell/templates/configmap-mounts.yaml b/divingbell/templates/secret-mounts.yaml
index de5541c..fbcad72 100644
--- a/divingbell/templates/configmap-mounts.yaml
+++ b/divingbell/templates/secret-mounts.yaml
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
14limitations under the License. 14limitations under the License.
15*/}} 15*/}}
16 16
17{{- define "divingbell.configmap.mounts" }} 17{{- define "divingbell.secret.mounts" }}
18{{- $configMapName := index . 0 }} 18{{- $secretName := index . 0 }}
19{{- $envAll := index . 1 }} 19{{- $envAll := index . 1 }}
20{{- with $envAll }} 20{{- with $envAll }}
21--- 21---
22apiVersion: v1 22apiVersion: v1
23kind: ConfigMap 23kind: Secret
24metadata: 24metadata:
25 name: {{ $configMapName }} 25 name: {{ $secretName }}
26data: 26data:
27 mounts: |+ 27 mounts: |+
28{{ tuple "bin/_mounts.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} 28{{ tuple "bin/_mounts.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 29{{- end }}
30{{- end }} 30{{- end }}
diff --git a/divingbell/templates/configmap-sysctl.yaml b/divingbell/templates/secret-sysctl.yaml
index 939b192..f504739 100644
--- a/divingbell/templates/configmap-sysctl.yaml
+++ b/divingbell/templates/secret-sysctl.yaml
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
14limitations under the License. 14limitations under the License.
15*/}} 15*/}}
16 16
17{{- define "divingbell.configmap.sysctl" }} 17{{- define "divingbell.secret.sysctl" }}
18{{- $configMapName := index . 0 }} 18{{- $secretName := index . 0 }}
19{{- $envAll := index . 1 }} 19{{- $envAll := index . 1 }}
20{{- with $envAll }} 20{{- with $envAll }}
21--- 21---
22apiVersion: v1 22apiVersion: v1
23kind: ConfigMap 23kind: Secret
24metadata: 24metadata:
25 name: {{ $configMapName }} 25 name: {{ $secretName }}
26data: 26data:
27 sysctl: |+ 27 sysctl: |+
28{{ tuple "bin/_sysctl.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} 28{{ tuple "bin/_sysctl.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 29{{- end }}
30{{- end }} 30{{- end }}
diff --git a/divingbell/templates/configmap-uamlite.yaml b/divingbell/templates/secret-uamlite.yaml
index 3302c48..46c19a1 100644
--- a/divingbell/templates/configmap-uamlite.yaml
+++ b/divingbell/templates/secret-uamlite.yaml
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
14limitations under the License. 14limitations under the License.
15*/}} 15*/}}
16 16
17{{- define "divingbell.configmap.uamlite" }} 17{{- define "divingbell.secret.uamlite" }}
18{{- $configMapName := index . 0 }} 18{{- $secretName := index . 0 }}
19{{- $envAll := index . 1 }} 19{{- $envAll := index . 1 }}
20{{- with $envAll }} 20{{- with $envAll }}
21--- 21---
22apiVersion: v1 22apiVersion: v1
23kind: ConfigMap 23kind: Secret
24metadata: 24metadata:
25 name: {{ $configMapName }} 25 name: {{ $secretName }}
26data: 26data:
27 uamlite: |+ 27 uamlite: |+
28{{ tuple "bin/_uamlite.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} 28{{ tuple "bin/_uamlite.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 29{{- end }}
30{{- end }} 30{{- end }}