Change all ConfigMap to Secret

Change configmaps to secrets to maintain compatibility with [0].

[0] https://review.openstack.org/#/c/617039

Change-Id: Ie95aee1a4104008ca93c23ac9d19245a87fade20
This commit is contained in:
Anderson, Craig (ca846m) 2018-11-12 12:31:29 -08:00 committed by Vladyslav Drok
parent 7ed8c29f99
commit 461f4e93d5
10 changed files with 70 additions and 70 deletions

View File

@ -16,7 +16,7 @@
{{- define "divingbell.daemonset.ethtool" }}
{{- $daemonset := index . 0 }}
{{- $configMapName := index . 1 }}
{{- $secretName := index . 1 }}
{{- $envAll := index . 2 }}
{{- with $envAll }}
---
@ -46,7 +46,7 @@ spec:
volumeMounts:
- name: rootfs-{{ $daemonset }}
mountPath: {{ .Values.conf.chroot_mnt_path }}
- name: {{ $configMapName }}
- name: {{ $secretName }}
mountPath: /tmp/{{ $daemonset }}.sh
subPath: {{ $daemonset }}
readOnly: true
@ -56,16 +56,16 @@ spec:
- name: rootfs-{{ $daemonset }}
hostPath:
path: /
- name: {{ $configMapName }}
configMap:
name: {{ $configMapName }}
- name: {{ $secretName }}
secret:
secretName: {{ $secretName }}
defaultMode: 0555
{{- end }}
{{- end }}
{{- if .Values.manifests.daemonset_ethtool }}
{{- $daemonset := "ethtool" }}
{{- $configMapName := "divingbell-ethtool" }}
{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.ethtool" | toString | fromYaml }}
{{- $configmap_include := "divingbell.configmap.ethtool" }}
{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- $secretName := "divingbell-ethtool" }}
{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.ethtool" | toString | fromYaml }}
{{- $secret_include := "divingbell.secret.ethtool" }}
{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- end }}

View File

@ -16,7 +16,7 @@
{{- define "divingbell.daemonset.limits" }}
{{- $daemonset := index . 0 }}
{{- $configMapName := index . 1 }}
{{- $secretName := index . 1 }}
{{- $envAll := index . 2 }}
{{- with $envAll }}
---
@ -46,7 +46,7 @@ spec:
volumeMounts:
- name: rootfs-{{ $daemonset }}
mountPath: {{ .Values.conf.chroot_mnt_path }}
- name: {{ $configMapName }}
- name: {{ $secretName }}
mountPath: /tmp/{{ $daemonset }}.sh
subPath: {{ $daemonset }}
readOnly: true
@ -56,16 +56,16 @@ spec:
- name: rootfs-{{ $daemonset }}
hostPath:
path: /
- name: {{ $configMapName }}
configMap:
name: {{ $configMapName }}
- name: {{ $secretName }}
secret:
secretName: {{ $secretName }}
defaultMode: 0555
{{- end }}
{{- end }}
{{- if .Values.manifests.daemonset_limits }}
{{- $daemonset := "limits" }}
{{- $configMapName := "divingbell-limits" }}
{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.limits" | toString | fromYaml }}
{{- $configmap_include := "divingbell.configmap.limits" }}
{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- $secretName := "divingbell-limits" }}
{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.limits" | toString | fromYaml }}
{{- $secret_include := "divingbell.secret.limits" }}
{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- end }}

View File

@ -16,7 +16,7 @@
{{- define "divingbell.daemonset.mounts" }}
{{- $daemonset := index . 0 }}
{{- $configMapName := index . 1 }}
{{- $secretName := index . 1 }}
{{- $envAll := index . 2 }}
{{- with $envAll }}
---
@ -46,7 +46,7 @@ spec:
volumeMounts:
- name: rootfs-{{ $daemonset }}
mountPath: {{ .Values.conf.chroot_mnt_path }}
- name: {{ $configMapName }}
- name: {{ $secretName }}
mountPath: /tmp/{{ $daemonset }}.sh
subPath: {{ $daemonset }}
readOnly: true
@ -56,16 +56,16 @@ spec:
- name: rootfs-{{ $daemonset }}
hostPath:
path: /
- name: {{ $configMapName }}
configMap:
name: {{ $configMapName }}
- name: {{ $secretName }}
secret:
secretName: {{ $secretName }}
defaultMode: 0555
{{- end }}
{{- end }}
{{- if .Values.manifests.daemonset_mounts }}
{{- $daemonset := "mounts" }}
{{- $configMapName := "divingbell-mounts" }}
{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.mounts" | toString | fromYaml }}
{{- $configmap_include := "divingbell.configmap.mounts" }}
{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- $secretName := "divingbell-mounts" }}
{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.mounts" | toString | fromYaml }}
{{- $secret_include := "divingbell.secret.mounts" }}
{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- end }}

View File

@ -16,7 +16,7 @@
{{- define "divingbell.daemonset.sysctl" }}
{{- $daemonset := index . 0 }}
{{- $configMapName := index . 1 }}
{{- $secretName := index . 1 }}
{{- $envAll := index . 2 }}
{{- with $envAll }}
---
@ -46,7 +46,7 @@ spec:
volumeMounts:
- name: rootfs-{{ $daemonset }}
mountPath: {{ .Values.conf.chroot_mnt_path }}
- name: {{ $configMapName }}
- name: {{ $secretName }}
mountPath: /tmp/{{ $daemonset }}.sh
subPath: {{ $daemonset }}
readOnly: true
@ -56,16 +56,16 @@ spec:
- name: rootfs-{{ $daemonset }}
hostPath:
path: /
- name: {{ $configMapName }}
configMap:
name: {{ $configMapName }}
- name: {{ $secretName }}
secret:
secretName: {{ $secretName }}
defaultMode: 0555
{{- end }}
{{- end }}
{{- if .Values.manifests.daemonset_sysctl }}
{{- $daemonset := "sysctl" }}
{{- $configMapName := "divingbell-sysctl" }}
{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.sysctl" | toString | fromYaml }}
{{- $configmap_include := "divingbell.configmap.sysctl" }}
{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- $secretName := "divingbell-sysctl" }}
{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.sysctl" | toString | fromYaml }}
{{- $secret_include := "divingbell.secret.sysctl" }}
{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- end }}

View File

@ -16,7 +16,7 @@
{{- define "divingbell.daemonset.uamlite" }}
{{- $daemonset := index . 0 }}
{{- $configMapName := index . 1 }}
{{- $secretName := index . 1 }}
{{- $envAll := index . 2 }}
{{- with $envAll }}
---
@ -46,7 +46,7 @@ spec:
volumeMounts:
- name: rootfs-{{ $daemonset }}
mountPath: {{ .Values.conf.chroot_mnt_path }}
- name: {{ $configMapName }}
- name: {{ $secretName }}
mountPath: /tmp/{{ $daemonset }}.sh
subPath: {{ $daemonset }}
readOnly: true
@ -56,16 +56,16 @@ spec:
- name: rootfs-{{ $daemonset }}
hostPath:
path: /
- name: {{ $configMapName }}
configMap:
name: {{ $configMapName }}
- name: {{ $secretName }}
secret:
secretName: {{ $secretName }}
defaultMode: 0555
{{- end }}
{{- end }}
{{- if .Values.manifests.daemonset_uamlite }}
{{- $daemonset := "uamlite" }}
{{- $configMapName := "divingbell-uamlite" }}
{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.uamlite" | toString | fromYaml }}
{{- $configmap_include := "divingbell.configmap.uamlite" }}
{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- $secretName := "divingbell-uamlite" }}
{{- $daemonset_yaml := list $daemonset $secretName . | include "divingbell.daemonset.uamlite" | toString | fromYaml }}
{{- $secret_include := "divingbell.secret.uamlite" }}
{{- list $daemonset $daemonset_yaml $secret_include $secretName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- end }}

View File

@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- define "divingbell.configmap.ethtool" }}
{{- $configMapName := index . 0 }}
{{- define "divingbell.secret.ethtool" }}
{{- $secretName := index . 0 }}
{{- $envAll := index . 1 }}
{{- with $envAll }}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: {{ $configMapName }}
name: {{ $secretName }}
data:
ethtool: |+
{{ tuple "bin/_ethtool.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{ tuple "bin/_ethtool.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
{{- end }}
{{- end }}

View File

@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- define "divingbell.configmap.limits" }}
{{- $configMapName := index . 0 }}
{{- define "divingbell.secret.limits" }}
{{- $secretName := index . 0 }}
{{- $envAll := index . 1 }}
{{- with $envAll }}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: {{ $configMapName }}
name: {{ $secretName }}
data:
limits: |+
{{ tuple "bin/_limits.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{ tuple "bin/_limits.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
{{- end }}
{{- end }}

View File

@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- define "divingbell.configmap.mounts" }}
{{- $configMapName := index . 0 }}
{{- define "divingbell.secret.mounts" }}
{{- $secretName := index . 0 }}
{{- $envAll := index . 1 }}
{{- with $envAll }}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: {{ $configMapName }}
name: {{ $secretName }}
data:
mounts: |+
{{ tuple "bin/_mounts.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{ tuple "bin/_mounts.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
{{- end }}
{{- end }}

View File

@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- define "divingbell.configmap.sysctl" }}
{{- $configMapName := index . 0 }}
{{- define "divingbell.secret.sysctl" }}
{{- $secretName := index . 0 }}
{{- $envAll := index . 1 }}
{{- with $envAll }}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: {{ $configMapName }}
name: {{ $secretName }}
data:
sysctl: |+
{{ tuple "bin/_sysctl.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{ tuple "bin/_sysctl.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
{{- end }}
{{- end }}

View File

@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- define "divingbell.configmap.uamlite" }}
{{- $configMapName := index . 0 }}
{{- define "divingbell.secret.uamlite" }}
{{- $secretName := index . 0 }}
{{- $envAll := index . 1 }}
{{- with $envAll }}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: {{ $configMapName }}
name: {{ $secretName }}
data:
uamlite: |+
{{ tuple "bin/_uamlite.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{ tuple "bin/_uamlite.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
{{- end }}
{{- end }}