diff --git a/barbican/templates/configmap-bin.yaml b/barbican/templates/configmap-bin.yaml index ae9c2b4bdc..ae97b8d274 100644 --- a/barbican/templates/configmap-bin.yaml +++ b/barbican/templates/configmap-bin.yaml @@ -16,16 +16,16 @@ metadata: name: barbican-bin data: db-init.py: | -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} start.sh: | -{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ks-service.sh: | -{{- include "helm-toolkit.keystone_service" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} ks-endpoints.sh: | -{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} ks-user.sh: | -{{- include "helm-toolkit.keystone_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} ks-domain-user.sh: | -{{- include "helm-toolkit.keystone_domain_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }} diff --git a/barbican/templates/configmap-etc.yaml b/barbican/templates/configmap-etc.yaml index 49d5aeda8d..91cd192d66 100644 --- a/barbican/templates/configmap-etc.yaml +++ b/barbican/templates/configmap-etc.yaml @@ -13,23 +13,23 @@ {{- include "barbican.conf.barbican_values_skeleton" .Values.conf.barbican | trunc 0 -}} {{- if empty .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.barbican.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.barbican.default.barbican.common.config "sql_connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.barbican.default.barbican.common.config "sql_connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.barbican.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.barbican.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.barbican.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end -}} apiVersion: v1 @@ -44,7 +44,7 @@ data: {{- if .Values.conf.barbican.prefix -}} {{ .Values.conf.barbican.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_barbican.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_barbican.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.barbican.append -}} {{ .Values.conf.barbican.append | indent 4 }} @@ -56,7 +56,7 @@ data: {{- if .Values.conf.paste.prefix -}} {{ .Values.conf.paste.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_barbican-api-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_barbican-api-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.paste.append -}} {{ .Values.conf.paste.append | indent 4 }} @@ -68,7 +68,7 @@ data: {{- if .Values.conf.audit_map.prefix -}} {{ .Values.conf.audit_map.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_api_audit_map.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_api_audit_map.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.audit_map.append -}} {{ .Values.conf.audit_map.append | indent 4 }} @@ -77,7 +77,7 @@ data: {{ if .Values.conf.policy.override -}} {{ .Values.conf.policy.override | indent 4 }} {{- else -}} -{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} barbican-api.ini: |+ -{{ tuple "etc/_barbican-api.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_barbican-api.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index 366c57793e..9eea51c3e4 100644 --- a/barbican/templates/deployment-api.yaml +++ b/barbican/templates/deployment-api.yaml @@ -33,10 +33,10 @@ spec: labels: app: barbican-api annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_barbican_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_barbican_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/barbican/templates/job-db-init.yaml b/barbican/templates/job-db-init.yaml index d13c2726ef..f8b4902478 100644 --- a/barbican/templates/job-db-init.yaml +++ b/barbican/templates/job-db-init.yaml @@ -21,7 +21,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/barbican/templates/job-db-sync.yaml b/barbican/templates/job-db-sync.yaml index d211c587f6..f4cef4e1a4 100644 --- a/barbican/templates/job-db-sync.yaml +++ b/barbican/templates/job-db-sync.yaml @@ -21,7 +21,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/barbican/templates/job-ks-endpoints.yaml b/barbican/templates/job-ks-endpoints.yaml index a77be8165e..46fbb98406 100644 --- a/barbican/templates/job-ks-endpoints.yaml +++ b/barbican/templates/job-ks-endpoints.yaml @@ -22,7 +22,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -53,16 +53,16 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SVC_ENDPOINT value: {{ $osServiceEndPoint }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} - name: OS_SERVICE_ENDPOINT - value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.keystone_endpoint_uri_lookup" }} + value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} {{- end }} {{- end }} volumes: diff --git a/barbican/templates/job-ks-service.yaml b/barbican/templates/job-ks-service.yaml index f3376059fc..3a3b2ac08c 100644 --- a/barbican/templates/job-ks-service.yaml +++ b/barbican/templates/job-ks-service.yaml @@ -22,7 +22,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -52,10 +52,10 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} {{- end }} diff --git a/barbican/templates/job-ks-user.yaml b/barbican/templates/job-ks-user.yaml index 633a7a3168..9e2cb7ebb4 100644 --- a/barbican/templates/job-ks-user.yaml +++ b/barbican/templates/job-ks-user.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -52,12 +52,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "barbican" {{- with $env := dict "ksUserSecret" $ksUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.barbican_user_role | quote }} diff --git a/barbican/templates/secret-db-root.env.yaml b/barbican/templates/secret-db-root.env.yaml index aee61c3ba4..a3ff08516c 100644 --- a/barbican/templates/secret-db-root.env.yaml +++ b/barbican/templates/secret-db-root.env.yaml @@ -16,4 +16,4 @@ metadata: name: barbican-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/barbican/templates/secret-keystone-admin.env.yaml b/barbican/templates/secret-keystone-admin.env.yaml index 33d3795153..99e086ca62 100644 --- a/barbican/templates/secret-keystone-admin.env.yaml +++ b/barbican/templates/secret-keystone-admin.env.yaml @@ -17,7 +17,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.admin_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/barbican/templates/secret-keystone-user.env.yaml b/barbican/templates/secret-keystone-user.env.yaml index 3bb0539818..a642f8eed3 100644 --- a/barbican/templates/secret-keystone-user.env.yaml +++ b/barbican/templates/secret-keystone-user.env.yaml @@ -17,7 +17,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.conf.barbican.keystone_authtoken.keystonemiddleware.auth_token.region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/cinder/templates/configmap-bin.yaml b/cinder/templates/configmap-bin.yaml index 92cdb13653..d1558733c8 100644 --- a/cinder/templates/configmap-bin.yaml +++ b/cinder/templates/configmap-bin.yaml @@ -18,12 +18,12 @@ metadata: name: cinder-bin data: db-init.py: | -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ks-service.sh: |+ -{{- include "helm-toolkit.keystone_service" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} ks-endpoints.sh: |+ -{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} ks-user.sh: |+ -{{- include "helm-toolkit.keystone_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml index ffab725561..070213c6b1 100644 --- a/cinder/templates/configmap-etc.yaml +++ b/cinder/templates/configmap-etc.yaml @@ -18,14 +18,14 @@ metadata: name: cinder-etc data: cinder.conf: |+ -{{ tuple "etc/_cinder.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_cinder.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} rootwrap.conf: |+ -{{ tuple "etc/_rootwrap.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_rootwrap.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} api-paste.ini: |+ -{{ tuple "etc/_cinder-api-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_cinder-api-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} policy.json: |+ -{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ceph.conf: |+ -{{ tuple "etc/_ceph.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_ceph.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ceph.client.{{ .Values.ceph.cinder_user }}.keyring: |+ -{{ tuple "etc/_ceph-cinder.keyring.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_ceph-cinder.keyring.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index 8dcaca9a56..a214c22cfb 100644 --- a/cinder/templates/deployment-api.yaml +++ b/cinder/templates/deployment-api.yaml @@ -33,10 +33,10 @@ spec: labels: app: cinder-api annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index 37decd4f0c..f3ef49c41e 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/cinder/templates/deployment-scheduler.yaml @@ -33,10 +33,10 @@ spec: labels: app: cinder-scheduler annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index 9021de54b5..119c19640d 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -33,10 +33,10 @@ spec: labels: app: cinder-volume annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/cinder/templates/etc/_cinder.conf.tpl b/cinder/templates/etc/_cinder.conf.tpl index 97410e00ac..cca7cc6394 100644 --- a/cinder/templates/etc/_cinder.conf.tpl +++ b/cinder/templates/etc/_cinder.conf.tpl @@ -26,10 +26,10 @@ osapi_volume_listen_port = {{ .Values.network.api.port }} api_paste_config = /etc/cinder/api-paste.ini -glance_api_servers = {{ tuple "image" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }} +glance_api_servers = {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} glance_api_version = {{ .Values.glance.version }} -enabled_backends = {{ include "helm-toolkit.joinListWithComma" .Values.backends.enabled }} +enabled_backends = {{ include "helm-toolkit.utils.joinListWithComma" .Values.backends.enabled }} auth_strategy = keystone os_region_name = {{ .Values.keystone.cinder_region_name }} @@ -40,12 +40,12 @@ os_region_name = {{ .Values.keystone.cinder_region_name }} host=cinder-volume-worker [database] -connection = {{ tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" }} +connection = {{ tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" }} max_retries = -1 [keystone_authtoken] auth_version = v3 -auth_url = {{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }} +auth_url = {{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} auth_type = password region_name = {{ .Values.keystone.cinder_region_name }} project_domain_name = {{ .Values.keystone.cinder_project_domain }} diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml index 9c1b1c1b50..ca6b29e6ed 100644 --- a/cinder/templates/job-db-init.yaml +++ b/cinder/templates/job-db-init.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml index 641072bfb7..3d6a60e281 100644 --- a/cinder/templates/job-db-sync.yaml +++ b/cinder/templates/job-db-sync.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/cinder/templates/job-ks-endpoints.yaml b/cinder/templates/job-ks-endpoints.yaml index 919e0f27a7..0de91916d7 100644 --- a/cinder/templates/job-ks-endpoints.yaml +++ b/cinder/templates/job-ks-endpoints.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -55,16 +55,16 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SVC_ENDPOINT value: {{ $osServiceEndPoint }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} - name: OS_SERVICE_ENDPOINT - value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.keystone_endpoint_uri_lookup" }} + value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} {{- end }} {{- end }} volumes: diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml index 948bd85e28..f75b6f274b 100644 --- a/cinder/templates/job-ks-service.yaml +++ b/cinder/templates/job-ks-service.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,10 +54,10 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} {{- end }} diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml index c419e46d80..6fb000a76c 100644 --- a/cinder/templates/job-ks-user.yaml +++ b/cinder/templates/job-ks-user.yaml @@ -25,7 +25,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,12 +54,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "cinder" {{- with $env := dict "ksUserSecret" $ksUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.cinder_user_role | quote }} diff --git a/cinder/templates/secret-db-root.env.yaml b/cinder/templates/secret-db-root.env.yaml index 7411f1c230..1af541d40c 100644 --- a/cinder/templates/secret-db-root.env.yaml +++ b/cinder/templates/secret-db-root.env.yaml @@ -4,4 +4,4 @@ metadata: name: cinder-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/cinder/templates/secret-keystone-admin.env.yaml b/cinder/templates/secret-keystone-admin.env.yaml index 5badd3e38c..f804604ff5 100644 --- a/cinder/templates/secret-keystone-admin.env.yaml +++ b/cinder/templates/secret-keystone-admin.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.admin_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/cinder/templates/secret-keystone-user.env.yaml b/cinder/templates/secret-keystone-user.env.yaml index 610df50108..63db3d0656 100644 --- a/cinder/templates/secret-keystone-user.env.yaml +++ b/cinder/templates/secret-keystone-user.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.cinder_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/glance/templates/configmap-bin.yaml b/glance/templates/configmap-bin.yaml index e134c73afb..e9a3c4b212 100644 --- a/glance/templates/configmap-bin.yaml +++ b/glance/templates/configmap-bin.yaml @@ -18,14 +18,14 @@ metadata: name: glance-bin data: db-init.py: | -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ks-service.sh: |+ -{{- include "helm-toolkit.keystone_service" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} ks-endpoints.sh: |+ -{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} ks-user.sh: |+ -{{- include "helm-toolkit.keystone_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} bootstrap.sh: |+ -{{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml index c0a9247a97..87716f18ad 100644 --- a/glance/templates/configmap-etc.yaml +++ b/glance/templates/configmap-etc.yaml @@ -15,49 +15,49 @@ {{- include "glance.conf.glance_registry_values_skeleton" .Values.conf.glance_registry | trunc 0 -}} {{- if empty .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} {{- end -}} # FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future {{- if empty .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.glance_registry.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.glance.database.oslo.db "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.glance.database.oslo.db "connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance_registry.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.glance_registry.database.oslo.db "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.glance_registry.database.oslo.db "connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.glance.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.glance.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance_registry.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.glance_registry.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.glance_registry.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance.default.glance.api.registry_host -}} -{{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.hostname_endpoint_uri_lookup" }} +{{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" }} {{- $imageRegistryHostURI := split ":" $imageRegistry -}} {{- $imageRegistryHostURI._0 | set .Values.conf.glance.default.glance.api "registry_host" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.glance.default.glance.api.registry_port -}} -{{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.hostname_endpoint_uri_lookup" }} +{{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" }} {{- $imageRegistryHostURI := split ":" $imageRegistry -}} {{- $imageRegistryHostURI._1 | set .Values.conf.glance.default.glance.api "registry_port" | quote | trunc 0 -}} {{- end -}} @@ -74,7 +74,7 @@ data: {{- if .Values.conf.ceph.prefix -}} {{ .Values.conf.ceph.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_ceph.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_ceph.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.ceph.append -}} {{ .Values.conf.ceph.append | indent 4 }} @@ -86,7 +86,7 @@ data: {{- if .Values.conf.ceph_client.prefix -}} {{ .Values.conf.ceph_client.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_ceph.client.glance.keyring.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_ceph.client.glance.keyring.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.ceph_client.append -}} {{ .Values.conf.ceph_client.append | indent 4 }} @@ -98,7 +98,7 @@ data: {{- if .Values.conf.glance.prefix -}} {{ .Values.conf.glance.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_glance-api.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_glance-api.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.glance.append -}} {{ .Values.conf.glance.append | indent 4 }} @@ -110,7 +110,7 @@ data: {{- if .Values.conf.paste.prefix -}} {{ .Values.conf.paste.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_glance-api-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_glance-api-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.paste.append -}} {{ .Values.conf.paste.append | indent 4 }} @@ -122,7 +122,7 @@ data: {{- if .Values.conf.glance_registry.prefix -}} {{ .Values.conf.glance_registry.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_glance-registry.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_glance-registry.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.glance_registry.append -}} {{ .Values.conf.glance_registry.append | indent 4 }} @@ -134,7 +134,7 @@ data: {{- if .Values.conf.paste_registry.prefix -}} {{ .Values.conf.paste_registry.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_glance-registry-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_glance-registry-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.paste_registry.append -}} {{ .Values.conf.paste_registry.append | indent 4 }} @@ -143,5 +143,5 @@ data: {{ if .Values.conf.policy.override -}} {{ .Values.conf.policy.override | indent 4 }} {{- else -}} -{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index 8ec5c78d63..c0eeb77a56 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -35,10 +35,10 @@ spec: labels: app: glance-api annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_glance_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 88de6dd6d6..365b618e5f 100644 --- a/glance/templates/deployment-registry.yaml +++ b/glance/templates/deployment-registry.yaml @@ -27,10 +27,10 @@ spec: labels: app: glance-registry annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_glance_registry_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_glance_registry_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/glance/templates/job-bootstrap.yaml b/glance/templates/job-bootstrap.yaml index c1a40770b2..c555139169 100644 --- a/glance/templates/job-bootstrap.yaml +++ b/glance/templates/job-bootstrap.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -45,7 +45,7 @@ spec: {{- end }} env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} command: - bash diff --git a/glance/templates/job-db-init.yaml b/glance/templates/job-db-init.yaml index 4def8db5c5..9e0b82e1ff 100644 --- a/glance/templates/job-db-init.yaml +++ b/glance/templates/job-db-init.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/glance/templates/job-db-sync.yaml b/glance/templates/job-db-sync.yaml index 6d3c312c59..1040c5ccf2 100644 --- a/glance/templates/job-db-sync.yaml +++ b/glance/templates/job-db-sync.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/glance/templates/job-ks-endpoints.yaml b/glance/templates/job-ks-endpoints.yaml index a8687ffc93..2046838561 100644 --- a/glance/templates/job-ks-endpoints.yaml +++ b/glance/templates/job-ks-endpoints.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -55,16 +55,16 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SVC_ENDPOINT value: {{ $osServiceEndPoint }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} - name: OS_SERVICE_ENDPOINT - value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.keystone_endpoint_uri_lookup" }} + value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} {{- end }} {{- end }} volumes: diff --git a/glance/templates/job-ks-service.yaml b/glance/templates/job-ks-service.yaml index 03ca7c46d9..6e6a74face 100644 --- a/glance/templates/job-ks-service.yaml +++ b/glance/templates/job-ks-service.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,10 +54,10 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} {{- end }} diff --git a/glance/templates/job-ks-user.yaml b/glance/templates/job-ks-user.yaml index aa3ffd8b8d..a722f09552 100644 --- a/glance/templates/job-ks-user.yaml +++ b/glance/templates/job-ks-user.yaml @@ -25,7 +25,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,12 +54,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "glance" {{- with $env := dict "ksUserSecret" $ksUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.glance_user_role | quote }} diff --git a/glance/templates/secret-db-root.env.yaml b/glance/templates/secret-db-root.env.yaml index 188e4d7924..f01d1d90f5 100644 --- a/glance/templates/secret-db-root.env.yaml +++ b/glance/templates/secret-db-root.env.yaml @@ -4,4 +4,4 @@ metadata: name: glance-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/glance/templates/secret-keystone-admin.env.yaml b/glance/templates/secret-keystone-admin.env.yaml index 3f563c6b41..0e57ce09db 100644 --- a/glance/templates/secret-keystone-admin.env.yaml +++ b/glance/templates/secret-keystone-admin.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.admin_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/glance/templates/secret-keystone-user.env.yaml b/glance/templates/secret-keystone-user.env.yaml index 3a1c94aac0..30052ab7a0 100644 --- a/glance/templates/secret-keystone-user.env.yaml +++ b/glance/templates/secret-keystone-user.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.conf.glance.keystone_authtoken.keystonemiddleware.auth_token.region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/heat/templates/configmap-bin.yaml b/heat/templates/configmap-bin.yaml index 60fd2bde50..fcd167d3a1 100644 --- a/heat/templates/configmap-bin.yaml +++ b/heat/templates/configmap-bin.yaml @@ -18,14 +18,14 @@ metadata: name: heat-bin data: db-init.py: | -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ks-service.sh: |+ -{{- include "helm-toolkit.keystone_service" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} ks-endpoints.sh: |+ -{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} ks-user.sh: |+ -{{- include "helm-toolkit.keystone_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} ks-domain-user.sh: |+ -{{- include "helm-toolkit.keystone_domain_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }} diff --git a/heat/templates/configmap-etc.yaml b/heat/templates/configmap-etc.yaml index 1487c7ba73..80e2c53365 100644 --- a/heat/templates/configmap-etc.yaml +++ b/heat/templates/configmap-etc.yaml @@ -15,40 +15,40 @@ {{- include "heat.conf.heat_values_skeleton" .Values.conf.heat | trunc 0 -}} {{- if empty .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} {{- end -}} # FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future {{- if empty .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.heat.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.heat.database.oslo.db "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.heat.database.oslo.db "connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.heat.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.heat.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.heat.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.heat.default.heat.common.config.heat_metadata_server_url -}} -{{- tuple "cloudformation" "public" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.cloudformation.path | set .Values.conf.heat.default.heat.common.config "heat_metadata_server_url" | quote | trunc 0 -}} +{{- tuple "cloudformation" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.cloudformation.path | set .Values.conf.heat.default.heat.common.config "heat_metadata_server_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.heat.default.heat.common.config.heat_waitcondition_server_url -}} -{{- cat (tuple "cloudformation" "public" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup") "waitcondition" | replace " " "/" | set .Values.conf.heat.default.heat.common.config "heat_waitcondition_server_url" | quote | trunc 0 -}} +{{- cat (tuple "cloudformation" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup") "waitcondition" | replace " " "/" | set .Values.conf.heat.default.heat.common.config "heat_waitcondition_server_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.heat.default.heat.common.config.heat_watch_server_url -}} -{{- tuple "cloudwatch" "public" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | trimSuffix "/" | set .Values.conf.heat.default.heat.common.config "heat_watch_server_url" | quote | trunc 0 -}} +{{- tuple "cloudwatch" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix "/" | set .Values.conf.heat.default.heat.common.config "heat_watch_server_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.heat.clients_keystone.heat.common.config.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.identity.path | set .Values.conf.heat.clients_keystone.heat.common.config "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.identity.path | set .Values.conf.heat.clients_keystone.heat.common.config "auth_uri" | quote | trunc 0 -}} {{- end -}} apiVersion: v1 @@ -63,7 +63,7 @@ data: {{- if .Values.conf.heat.prefix -}} {{ .Values.conf.heat.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_heat.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_heat.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.heat.append -}} {{ .Values.conf.heat.append | indent 4 }} @@ -75,7 +75,7 @@ data: {{- if .Values.conf.paste.prefix -}} {{ .Values.conf.paste.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.paste.append -}} {{ .Values.conf.paste.append | indent 4 }} @@ -84,5 +84,5 @@ data: {{ if .Values.conf.policy.override -}} {{ .Values.conf.policy.override | indent 4 }} {{- else -}} -{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index dca07a33b1..5960d6bd41 100644 --- a/heat/templates/deployment-api.yaml +++ b/heat/templates/deployment-api.yaml @@ -35,10 +35,10 @@ spec: labels: app: heat-api annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_heat_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_heat_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index 4bc495f4f5..c904f2bacd 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/heat/templates/deployment-cfn.yaml @@ -35,10 +35,10 @@ spec: labels: app: heat-cfn annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_heat_cfn_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_heat_cfn_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index 1bd979606f..ec9c3ebf2c 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/heat/templates/deployment-cloudwatch.yaml @@ -35,10 +35,10 @@ spec: labels: app: heat-cloudwatch annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_heat_cloudwatch_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_heat_cloudwatch_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml index 77a8b4d190..e921a2cfa3 100644 --- a/heat/templates/job-db-init.yaml +++ b/heat/templates/job-db-init.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml index 001ab2345b..0458db2218 100644 --- a/heat/templates/job-db-sync.yaml +++ b/heat/templates/job-db-sync.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/heat/templates/job-ks-endpoints.yaml b/heat/templates/job-ks-endpoints.yaml index 53915c3bcb..87e94923a0 100644 --- a/heat/templates/job-ks-endpoints.yaml +++ b/heat/templates/job-ks-endpoints.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -55,16 +55,16 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SVC_ENDPOINT value: {{ $osServiceEndPoint }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} - name: OS_SERVICE_ENDPOINT - value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.keystone_endpoint_uri_lookup" }} + value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} {{- end }} {{- end }} volumes: diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml index 137dbbe9ab..b9fe40b211 100644 --- a/heat/templates/job-ks-service.yaml +++ b/heat/templates/job-ks-service.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,10 +54,10 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} {{- end }} diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml index 8b5762605f..ecaf724c01 100644 --- a/heat/templates/job-ks-user.yaml +++ b/heat/templates/job-ks-user.yaml @@ -28,7 +28,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -57,12 +57,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "heat" {{- with $env := dict "ksUserSecret" $ksUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.heat_user_role | quote }} @@ -79,12 +79,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "heat" {{- with $env := dict "ksUserSecret" $ksTrusteeUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.heat_trustee_role | quote }} @@ -101,7 +101,7 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "heat" diff --git a/heat/templates/secret-db-root.env.yaml b/heat/templates/secret-db-root.env.yaml index f8346a2eab..a4fbce8621 100644 --- a/heat/templates/secret-db-root.env.yaml +++ b/heat/templates/secret-db-root.env.yaml @@ -4,4 +4,4 @@ metadata: name: heat-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/heat/templates/secret-keystone-admin.env.yaml b/heat/templates/secret-keystone-admin.env.yaml index f8d07a4a54..f795623847 100644 --- a/heat/templates/secret-keystone-admin.env.yaml +++ b/heat/templates/secret-keystone-admin.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.admin_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/heat/templates/secret-keystone-stack-user.env.yaml b/heat/templates/secret-keystone-stack-user.env.yaml index d4ad2b1fa3..18bdf9a7ee 100644 --- a/heat/templates/secret-keystone-stack-user.env.yaml +++ b/heat/templates/secret-keystone-stack-user.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.heat_stack_region_name | b64enc | indent 4 }} OS_DOMAIN_NAME: | diff --git a/heat/templates/secret-keystone-trustee.env.yaml b/heat/templates/secret-keystone-trustee.env.yaml index 9c58a49f0b..3d92a70132 100644 --- a/heat/templates/secret-keystone-trustee.env.yaml +++ b/heat/templates/secret-keystone-trustee.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.heat_trustee_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/heat/templates/secret-keystone-user.env.yaml b/heat/templates/secret-keystone-user.env.yaml index 1871aae539..77ac3a3ca7 100644 --- a/heat/templates/secret-keystone-user.env.yaml +++ b/heat/templates/secret-keystone-user.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.conf.heat.keystone_authtoken.keystonemiddleware.auth_token.region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/heat/templates/statefulset-engine.yaml b/heat/templates/statefulset-engine.yaml index 80f7bfe275..c7a7791137 100644 --- a/heat/templates/statefulset-engine.yaml +++ b/heat/templates/statefulset-engine.yaml @@ -31,7 +31,7 @@ spec: configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_heat_engine_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_heat_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/helm-toolkit/templates/_endpoints.tpl b/helm-toolkit/templates/_endpoints.tpl deleted file mode 100644 index d6b27f25c1..0000000000 --- a/helm-toolkit/templates/_endpoints.tpl +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------- -# endpoints -#----------------------------------------- - -# this function returns the endpoint uri for a service, it takes an tuple -# input in the form: service-type, endpoint-class, port-name. eg: -# { tuple "orchestration" "public" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" } -# will return the appropriate URI. Once merged this should phase out the above. - -{{- define "helm-toolkit.keystone_endpoint_uri_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $port := index . 2 -}} -{{- $context := index . 3 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- $fqdn := $context.Release.Namespace -}} -{{- if $context.Values.endpoints.fqdn -}} -{{- $fqdn := $context.Values.endpoints.fqdn -}} -{{- end -}} -{{- with $endpointMap -}} -{{- $endpointScheme := .scheme }} -{{- $endpointHost := index .hosts $endpoint | default .hosts.default}} -{{- $endpointPort := index .port $port }} -{{- $endpointPath := .path | default "" }} -{{- printf "%s://%s.%s:%1.f%s" $endpointScheme $endpointHost $fqdn $endpointPort $endpointPath -}} -{{- end -}} -{{- end -}} - -# this function helps resolve database style endpoints, which really follow the same -# pattern as above, except they have a username and password component -# -# presuming that .Values contains an endpoint: definition for 'neutron-db' with the -# appropriate attributes, a call such as: -# -# { tuple "neutron-db" "internal" "userClass" "portName" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" } -# -# where portName is optional if a default port has been defined in .Values -# -# returns: mysql+pymysql://username:password@internal_host:3306/dbname - -{{- define "helm-toolkit.authenticated_endpoint_uri_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $userclass := index . 2 -}} -{{- $port := index . 3 -}} -{{- $context := index . 4 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- $userMap := index $endpointMap.auth $userclass }} -{{- $fqdn := $context.Release.Namespace -}} -{{- if $context.Values.endpoints.fqdn -}} -{{- $fqdn := $context.Values.endpoints.fqdn -}} -{{- end -}} -{{- with $endpointMap -}} -{{- $endpointScheme := .scheme }} -{{- $endpointUser := index $userMap "username" }} -{{- $endpointPass := index $userMap "password" }} -{{- $endpointHost := index .hosts $endpoint | default .hosts.default}} -{{- $endpointPort := index .port $port | default .port.default }} -{{- $endpointPath := .path | default "" }} -{{- printf "%s://%s:%s@%s.%s:%1.f%s" $endpointScheme $endpointUser $endpointPass $endpointHost $fqdn $endpointPort $endpointPath -}} -{{- end -}} -{{- end -}} - -# this function returns hostnames from endpoint definitions for use cases -# where the uri style return is not appropriate, and only the hostname -# portion is used or relevant in the template -# -# { tuple "memcache" "internal" "portName" . | include "helm-toolkit.hostname_endpoint_uri_lookup" } -# -# returns: internal_host:port -# -# output that requires the port aspect striped should simply split the output based on ':' - -{{- define "helm-toolkit.hostname_endpoint_uri_lookup" -}} -{{- $type := index . 0 -}} -{{- $endpoint := index . 1 -}} -{{- $port := index . 2 -}} -{{- $context := index . 3 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- $fqdn := $context.Release.Namespace -}} -{{- if $context.Values.endpoints.fqdn -}} -{{- $fqdn := $context.Values.endpoints.fqdn -}} -{{- end -}} -{{- with $endpointMap -}} -{{- $endpointScheme := .scheme }} -{{- $endpointHost := index .hosts $endpoint | default .hosts.default}} -{{- $endpointPort := index .port $port | default .port.default }} -{{- printf "%s.%s:%1.f" $endpointHost $fqdn $endpointPort -}} -{{- end -}} -{{- end -}} - -#------------------------------- -# endpoint name lookup -#------------------------------- - -# this function is used in endpoint management templates -# it returns the service type for an openstack service eg: -# { tuple orchestration . | include "ks_endpoint_type" } -# will return "heat" - -{{- define "helm-toolkit.keystone_endpoint_name_lookup" -}} -{{- $type := index . 0 -}} -{{- $context := index . 1 -}} -{{- $endpointMap := index $context.Values.endpoints $type }} -{{- $endpointName := index $endpointMap "name" }} -{{- $endpointName | quote -}} -{{- end -}} - -#------------------------------- -# kolla helpers -#------------------------------- -{{ define "helm-toolkit.keystone_auth" }}{'auth_url':'{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}', 'username':'{{ .Values.keystone.admin_user }}','password':'{{ .Values.keystone.admin_password }}','project_name':'{{ .Values.keystone.admin_project_name }}','domain_name':'default'}{{end}} diff --git a/helm-toolkit/templates/_hosts.tpl b/helm-toolkit/templates/_hosts.tpl deleted file mode 100644 index 502593ca32..0000000000 --- a/helm-toolkit/templates/_hosts.tpl +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# fqdn -{{- define "helm-toolkit.region"}}cluster{{- end}} -{{- define "helm-toolkit.tld"}}local{{- end}} - -{{- define "helm-toolkit.fqdn" -}} -{{- $fqdn := .Release.Namespace -}} -{{- if .Values.endpoints.fqdn -}} -{{- $fqdn := .Values.endpoints.fqdn -}} -{{- end -}} -{{- $fqdn -}} -{{- end -}} - -#----------------------------------------- -# hosts -#----------------------------------------- - -# infrastructure services -{{- define "helm-toolkit.rabbitmq_host"}}rabbitmq.{{.Release.Namespace}}.svc.{{ include "helm-toolkit.region" . }}.{{ include "helm-toolkit.tld" . }}{{- end}} -{{- define "helm-toolkit.mariadb_host"}}mariadb.{{.Release.Namespace}}.svc.{{ include "helm-toolkit.region" . }}.{{ include "helm-toolkit.tld" . }}{{- end}} -{{- define "helm-toolkit.postgresql_host"}}postgresql.{{.Release.Namespace}}.svc.{{ include "helm-toolkit.region" . }}.{{ include "helm-toolkit.tld" . }}{{- end}} - -# nova defaults -{{- define "helm-toolkit.nova_metadata_host"}}nova-api.{{ include "helm-toolkit.fqdn" . }}{{- end}} diff --git a/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl new file mode 100644 index 0000000000..c2928682be --- /dev/null +++ b/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl @@ -0,0 +1,44 @@ +# Copyright 2017 The Openstack-Helm Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This function helps resolve database style endpoints: +# +# Presuming that .Values contains an endpoint: definition for 'neutron-db' with the +# appropriate attributes, a call such as: +# { tuple "neutron-db" "internal" "userClass" "portName" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" } +# where portName is optional if a default port has been defined in .Values +# returns: mysql+pymysql://username:password@internal_host:3306/dbname + +{{- define "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" -}} +{{- $type := index . 0 -}} +{{- $endpoint := index . 1 -}} +{{- $userclass := index . 2 -}} +{{- $port := index . 3 -}} +{{- $context := index . 4 -}} +{{- $endpointMap := index $context.Values.endpoints $type }} +{{- $userMap := index $endpointMap.auth $userclass }} +{{- $fqdn := $context.Release.Namespace -}} +{{- if $context.Values.endpoints.fqdn -}} +{{- $fqdn := $context.Values.endpoints.fqdn -}} +{{- end -}} +{{- with $endpointMap -}} +{{- $endpointScheme := .scheme }} +{{- $endpointUser := index $userMap "username" }} +{{- $endpointPass := index $userMap "password" }} +{{- $endpointHost := index .hosts $endpoint | default .hosts.default}} +{{- $endpointPort := index .port $port | default .port.default }} +{{- $endpointPath := .path | default "" }} +{{- printf "%s://%s:%s@%s.%s:%1.f%s" $endpointScheme $endpointUser $endpointPass $endpointHost $fqdn $endpointPort $endpointPath -}} +{{- end -}} +{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_hostname_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_hostname_endpoint_uri_lookup.tpl new file mode 100644 index 0000000000..1917a371a4 --- /dev/null +++ b/helm-toolkit/templates/endpoints/_hostname_endpoint_uri_lookup.tpl @@ -0,0 +1,39 @@ +# Copyright 2017 The Openstack-Helm Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This function returns hostnames from endpoint definitions for use cases +# where the uri style return is not appropriate, and only the hostname +# portion is used or relevant in the template: +# { tuple "memcache" "internal" "portName" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" } +# returns: internal_host:port +# +# Output that requires the port aspect striped could simply split the output based on ':' + +{{- define "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" -}} +{{- $type := index . 0 -}} +{{- $endpoint := index . 1 -}} +{{- $port := index . 2 -}} +{{- $context := index . 3 -}} +{{- $endpointMap := index $context.Values.endpoints $type }} +{{- $fqdn := $context.Release.Namespace -}} +{{- if $context.Values.endpoints.fqdn -}} +{{- $fqdn := $context.Values.endpoints.fqdn -}} +{{- end -}} +{{- with $endpointMap -}} +{{- $endpointScheme := .scheme }} +{{- $endpointHost := index .hosts $endpoint | default .hosts.default}} +{{- $endpointPort := index .port $port | default .port.default }} +{{- printf "%s.%s:%1.f" $endpointHost $fqdn $endpointPort -}} +{{- end -}} +{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_keystone_endpoint_name_lookup.tpl b/helm-toolkit/templates/endpoints/_keystone_endpoint_name_lookup.tpl new file mode 100644 index 0000000000..7717ec841a --- /dev/null +++ b/helm-toolkit/templates/endpoints/_keystone_endpoint_name_lookup.tpl @@ -0,0 +1,26 @@ +# Copyright 2017 The Openstack-Helm Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This function is used in endpoint management templates +# it returns the service type for an openstack service eg: +# { tuple orchestration . | include "ks_endpoint_type" } +# will return "heat" + +{{- define "helm-toolkit.endpoints.keystone_endpoint_name_lookup" -}} +{{- $type := index . 0 -}} +{{- $context := index . 1 -}} +{{- $endpointMap := index $context.Values.endpoints $type }} +{{- $endpointName := index $endpointMap "name" }} +{{- $endpointName | quote -}} +{{- end -}} diff --git a/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl new file mode 100644 index 0000000000..401894023b --- /dev/null +++ b/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl @@ -0,0 +1,37 @@ +# Copyright 2017 The Openstack-Helm Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This function returns the endpoint uri for a service, it takes an tuple +# input in the form: service-type, endpoint-class, port-name. eg: +# { tuple "orchestration" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" } +# will return the appropriate URI. + +{{- define "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" -}} +{{- $type := index . 0 -}} +{{- $endpoint := index . 1 -}} +{{- $port := index . 2 -}} +{{- $context := index . 3 -}} +{{- $endpointMap := index $context.Values.endpoints $type }} +{{- $fqdn := $context.Release.Namespace -}} +{{- if $context.Values.endpoints.fqdn -}} +{{- $fqdn := $context.Values.endpoints.fqdn -}} +{{- end -}} +{{- with $endpointMap -}} +{{- $endpointScheme := .scheme }} +{{- $endpointHost := index .hosts $endpoint | default .hosts.default}} +{{- $endpointPort := index .port $port }} +{{- $endpointPath := .path | default "" }} +{{- printf "%s://%s.%s:%1.f%s" $endpointScheme $endpointHost $fqdn $endpointPort $endpointPath -}} +{{- end -}} +{{- end -}} diff --git a/helm-toolkit/templates/scripts/_db-init.py.tpl b/helm-toolkit/templates/scripts/_db-init.py.tpl index ca17f8b9a3..cccb62dec2 100644 --- a/helm-toolkit/templates/scripts/_db-init.py.tpl +++ b/helm-toolkit/templates/scripts/_db-init.py.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "helm-toolkit.db_init" }} +{{- define "helm-toolkit.scripts.db_init" }} #!/usr/bin/env python # Creates db and user for an OpenStack Service: diff --git a/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl b/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl index 7211fd5c52..0680f91cc6 100644 --- a/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl +++ b/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "helm-toolkit.keystone_domain_user" }} +{{- define "helm-toolkit.scripts.keystone_domain_user" }} #!/bin/bash # Copyright 2017 Pete Birley diff --git a/helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl b/helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl index 26d0e1c1ff..0c19a85eb2 100755 --- a/helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl +++ b/helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "helm-toolkit.keystone_endpoints" }} +{{- define "helm-toolkit.scripts.keystone_endpoints" }} #!/bin/bash # Copyright 2017 Pete Birley diff --git a/helm-toolkit/templates/scripts/_ks-service.sh.tpl b/helm-toolkit/templates/scripts/_ks-service.sh.tpl index f9209b2644..ea812e883d 100644 --- a/helm-toolkit/templates/scripts/_ks-service.sh.tpl +++ b/helm-toolkit/templates/scripts/_ks-service.sh.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "helm-toolkit.keystone_service" }} +{{- define "helm-toolkit.scripts.keystone_service" }} #!/bin/bash # Copyright 2017 Pete Birley diff --git a/helm-toolkit/templates/scripts/_ks-user.sh.tpl b/helm-toolkit/templates/scripts/_ks-user.sh.tpl index a2a7a35d12..41a28704b6 100644 --- a/helm-toolkit/templates/scripts/_ks-user.sh.tpl +++ b/helm-toolkit/templates/scripts/_ks-user.sh.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "helm-toolkit.keystone_user" }} +{{- define "helm-toolkit.scripts.keystone_user" }} #!/bin/bash # Copyright 2017 Pete Birley diff --git a/helm-toolkit/templates/snippets/_k8s_init_dep_check.tpl b/helm-toolkit/templates/snippets/_k8s_init_dep_check.tpl index c8b8c8a079..5644ce4681 100644 --- a/helm-toolkit/templates/snippets/_k8s_init_dep_check.tpl +++ b/helm-toolkit/templates/snippets/_k8s_init_dep_check.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "helm-toolkit.kubernetes_entrypoint_init_container" -}} +{{- define "helm-toolkit.snippets.kubernetes_entrypoint_init_container" -}} {{- $envAll := index . 0 -}} {{- $deps := index . 1 -}} {{- $mounts := index . 2 -}} @@ -49,19 +49,19 @@ }, { "name": "DEPENDENCY_SERVICE", - "value": "{{ include "helm-toolkit.joinListWithComma" $deps.service }}" + "value": "{{ include "helm-toolkit.utils.joinListWithComma" $deps.service }}" }, { "name": "DEPENDENCY_JOBS", - "value": "{{ include "helm-toolkit.joinListWithComma" $deps.jobs }}" + "value": "{{ include "helm-toolkit.utils.joinListWithComma" $deps.jobs }}" }, { "name": "DEPENDENCY_DAEMONSET", - "value": "{{ include "helm-toolkit.joinListWithComma" $deps.daemonset }}" + "value": "{{ include "helm-toolkit.utils.joinListWithComma" $deps.daemonset }}" }, { "name": "DEPENDENCY_CONTAINER", - "value": "{{ include "helm-toolkit.joinListWithComma" $deps.container }}" + "value": "{{ include "helm-toolkit.utils.joinListWithComma" $deps.container }}" }, { "name": "COMMAND", diff --git a/helm-toolkit/templates/snippets/_ks_env_openrc.tpl b/helm-toolkit/templates/snippets/_ks_env_openrc.tpl index 05311daeb6..2856501389 100644 --- a/helm-toolkit/templates/snippets/_ks_env_openrc.tpl +++ b/helm-toolkit/templates/snippets/_ks_env_openrc.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "helm-toolkit.keystone_openrc_env_vars" }} +{{- define "helm-toolkit.snippets.keystone_openrc_env_vars" }} {{- $ksUserSecret := .ksUserSecret }} - name: OS_IDENTITY_API_VERSION value: "3" diff --git a/helm-toolkit/templates/snippets/_ks_env_user_create_openrc.tpl b/helm-toolkit/templates/snippets/_ks_env_user_create_openrc.tpl index 7559ce9425..f9a73e7b05 100644 --- a/helm-toolkit/templates/snippets/_ks_env_user_create_openrc.tpl +++ b/helm-toolkit/templates/snippets/_ks_env_user_create_openrc.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "helm-toolkit.keystone_user_create_env_vars" }} +{{- define "helm-toolkit.snippets.keystone_user_create_env_vars" }} {{- $ksUserSecret := .ksUserSecret }} - name: SERVICE_OS_REGION_NAME valueFrom: diff --git a/helm-toolkit/templates/_funcs.tpl b/helm-toolkit/templates/utils/_hash.tpl similarity index 67% rename from helm-toolkit/templates/_funcs.tpl rename to helm-toolkit/templates/utils/_hash.tpl index 38c39cf1df..110990bbe6 100644 --- a/helm-toolkit/templates/_funcs.tpl +++ b/helm-toolkit/templates/utils/_hash.tpl @@ -12,19 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "helm-toolkit.joinListWithComma" -}} -{{ range $k, $v := . }}{{ if $k }},{{ end }}{{ $v }}{{ end }} -{{- end -}} - -{{- define "helm-toolkit.template" -}} -{{- $name := index . 0 -}} -{{- $context := index . 1 -}} -{{- $last := base $context.Template.Name }} -{{- $wtf := $context.Template.Name | replace $last $name -}} -{{ include $wtf $context }} -{{- end -}} - -{{- define "helm-toolkit.hash" -}} +{{- define "helm-toolkit.utils.hash" -}} {{- $name := index . 0 -}} {{- $context := index . 1 -}} {{- $last := base $context.Template.Name }} diff --git a/helm-toolkit/templates/utils/_joinListWithComma.tpl b/helm-toolkit/templates/utils/_joinListWithComma.tpl new file mode 100644 index 0000000000..2a7c691ca6 --- /dev/null +++ b/helm-toolkit/templates/utils/_joinListWithComma.tpl @@ -0,0 +1,17 @@ +# Copyright 2017 The Openstack-Helm Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{- define "helm-toolkit.utils.joinListWithComma" -}} +{{ range $k, $v := . }}{{ if $k }},{{ end }}{{ $v }}{{ end }} +{{- end -}} diff --git a/helm-toolkit/templates/utils/_template.tpl b/helm-toolkit/templates/utils/_template.tpl new file mode 100644 index 0000000000..d3f6cda32c --- /dev/null +++ b/helm-toolkit/templates/utils/_template.tpl @@ -0,0 +1,21 @@ +# Copyright 2017 The Openstack-Helm Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{- define "helm-toolkit.utils.template" -}} +{{- $name := index . 0 -}} +{{- $context := index . 1 -}} +{{- $last := base $context.Template.Name }} +{{- $wtf := $context.Template.Name | replace $last $name -}} +{{ include $wtf $context }} +{{- end -}} diff --git a/horizon/templates/configmap-bin.yaml b/horizon/templates/configmap-bin.yaml index bc500784fd..ab768ec1bf 100644 --- a/horizon/templates/configmap-bin.yaml +++ b/horizon/templates/configmap-bin.yaml @@ -18,4 +18,4 @@ metadata: name: horizon-bin data: start.sh: | -{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/horizon/templates/configmap-etc.yaml b/horizon/templates/configmap-etc.yaml index 3bf1eb0757..165502e52f 100644 --- a/horizon/templates/configmap-etc.yaml +++ b/horizon/templates/configmap-etc.yaml @@ -18,6 +18,6 @@ metadata: name: horizon-etc data: horizon.conf: | -{{ tuple "etc/_horizon.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_horizon.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} local_settings: | -{{ tuple "etc/_local_settings.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_local_settings.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index 3fa464e343..ecbd16dc02 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -35,10 +35,10 @@ spec: labels: app: horizon annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_horizon_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_horizon_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/horizon/templates/etc/_local_settings.tpl b/horizon/templates/etc/_local_settings.tpl index 0becfebbc3..f7adcc87ad 100644 --- a/horizon/templates/etc/_local_settings.tpl +++ b/horizon/templates/etc/_local_settings.tpl @@ -165,7 +165,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' # ('http://cluster2.example.com:5000/v2.0', 'cluster2'), #] -OPENSTACK_KEYSTONE_URL = "{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}" +OPENSTACK_KEYSTONE_URL = "{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}" OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_" # Enables keystone web single-sign-on if set to True. diff --git a/ingress/templates/error-deployment.yaml b/ingress/templates/error-deployment.yaml index 5b32f6f887..31e7a7f10c 100644 --- a/ingress/templates/error-deployment.yaml +++ b/ingress/templates/error-deployment.yaml @@ -29,7 +29,7 @@ spec: template: metadata: annotations: - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} labels: app: ingress-error-pages spec: diff --git a/ingress/templates/ingress-deployment.yaml b/ingress/templates/ingress-deployment.yaml index 370214d15d..ef33adab0e 100644 --- a/ingress/templates/ingress-deployment.yaml +++ b/ingress/templates/ingress-deployment.yaml @@ -31,7 +31,7 @@ spec: template: metadata: annotations: - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} labels: app: ingress-api spec: diff --git a/keystone/templates/bin/_db-sync.sh.tpl b/keystone/templates/bin/_db-sync.sh.tpl index 40ccbd8116..e0b6c7a185 100644 --- a/keystone/templates/bin/_db-sync.sh.tpl +++ b/keystone/templates/bin/_db-sync.sh.tpl @@ -22,7 +22,7 @@ keystone-manage --config-file=/etc/keystone/keystone.conf bootstrap \ --bootstrap-username {{ .Values.keystone.admin_user }} \ --bootstrap-password {{ .Values.keystone.admin_password }} \ --bootstrap-project-name {{ .Values.keystone.admin_project_name }} \ - --bootstrap-admin-url {{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }} \ - --bootstrap-public-url {{ tuple "identity" "public" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }} \ - --bootstrap-internal-url {{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }} \ + --bootstrap-admin-url {{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} \ + --bootstrap-public-url {{ tuple "identity" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} \ + --bootstrap-internal-url {{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} \ --bootstrap-region-id {{ .Values.keystone.admin_region_name }} diff --git a/keystone/templates/configmap-bin.yaml b/keystone/templates/configmap-bin.yaml index 81d0b954c3..443986c5d8 100644 --- a/keystone/templates/configmap-bin.yaml +++ b/keystone/templates/configmap-bin.yaml @@ -18,8 +18,8 @@ metadata: name: keystone-bin data: db-init.py: | -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} start.sh: | -{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/keystone/templates/configmap-etc.yaml b/keystone/templates/configmap-etc.yaml index 96f24bc925..de6c0e541b 100644 --- a/keystone/templates/configmap-etc.yaml +++ b/keystone/templates/configmap-etc.yaml @@ -15,15 +15,15 @@ {{- include "keystone.conf.keystone_values_skeleton" .Values.conf.keystone | trunc 0 -}} {{- if empty .Values.conf.keystone.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.keystone.database.oslo.db "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.keystone.database.oslo.db "connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.keystone.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.keystone.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.keystone.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.keystone.cache.oslo.cache -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.keystone.cache.oslo.cache "memcache_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.keystone.cache.oslo.cache "memcache_servers" | quote | trunc 0 -}} {{- end -}} apiVersion: v1 @@ -38,7 +38,7 @@ data: {{- if .Values.conf.keystone.prefix -}} {{ .Values.conf.keystone.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_keystone.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_keystone.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.keystone.append -}} {{ .Values.conf.keystone.append | indent 4 }} @@ -50,7 +50,7 @@ data: {{- if .Values.conf.paste.prefix -}} {{ .Values.conf.paste.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_keystone-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_keystone-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.paste.append -}} {{ .Values.conf.paste.append | indent 4 }} @@ -59,11 +59,11 @@ data: {{ if .Values.conf.policy.override -}} {{ .Values.conf.policy.override | indent 4 }} {{- else -}} -{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} mpm_event.conf: |+ -{{ tuple "etc/_mpm_event.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_mpm_event.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} wsgi-keystone.conf: |+ -{{ tuple "etc/_wsgi-keystone.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_wsgi-keystone.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} sso_callback_template.html: |+ -{{ tuple "etc/_sso_callback_template.html.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_sso_callback_template.html.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml index 38aa3dd142..8cbfd5b7a1 100644 --- a/keystone/templates/deployment.yaml +++ b/keystone/templates/deployment.yaml @@ -35,10 +35,10 @@ spec: labels: app: keystone-api annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_keystone_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_keystone_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/keystone/templates/job-db-init.yaml b/keystone/templates/job-db-init.yaml index 29a291f5e9..4c3abbdea6 100644 --- a/keystone/templates/job-db-init.yaml +++ b/keystone/templates/job-db-init.yaml @@ -26,7 +26,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_keystone_db_init_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_keystone_db_init_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml index e0dbf057c2..5296e790d3 100644 --- a/keystone/templates/job-db-sync.yaml +++ b/keystone/templates/job-db-sync.yaml @@ -25,7 +25,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_keystone_db_sync_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_keystone_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/keystone/templates/secret-db-root.env.yaml b/keystone/templates/secret-db-root.env.yaml index 62da0ff317..4623037da2 100644 --- a/keystone/templates/secret-db-root.env.yaml +++ b/keystone/templates/secret-db-root.env.yaml @@ -4,4 +4,4 @@ metadata: name: keystone-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/magnum/templates/configmap-bin.yaml b/magnum/templates/configmap-bin.yaml index 164d0b1ed0..66d42524cf 100644 --- a/magnum/templates/configmap-bin.yaml +++ b/magnum/templates/configmap-bin.yaml @@ -18,18 +18,18 @@ metadata: name: magnum-bin data: db-init.py: | -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ks-service.sh: |+ -{{- include "helm-toolkit.keystone_service" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} ks-endpoints.sh: |+ -{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} ks-user.sh: |+ -{{- include "helm-toolkit.keystone_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} ks-domain-user.sh: |+ -{{- include "helm-toolkit.keystone_domain_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }} magnum-api.sh: | -{{ tuple "bin/_magnum-api.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_magnum-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} magnum-conductor.sh: | -{{ tuple "bin/_magnum-conductor.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_magnum-conductor.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/magnum/templates/configmap-etc.yaml b/magnum/templates/configmap-etc.yaml index 9d094c9025..4e156b42f5 100644 --- a/magnum/templates/configmap-etc.yaml +++ b/magnum/templates/configmap-etc.yaml @@ -15,24 +15,24 @@ {{- include "magnum.conf.magnum_values_skeleton" .Values.conf.magnum | trunc 0 -}} {{- if empty .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} {{- end -}} # FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future {{- if empty .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.magnum.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.magnum.database.oslo.db "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.magnum.database.oslo.db "connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.magnum.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.magnum.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.magnum.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end -}} apiVersion: v1 @@ -47,7 +47,7 @@ data: {{- if .Values.conf.magnum.prefix -}} {{ .Values.conf.magnum.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_magnum.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_magnum.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.magnum.append -}} {{ .Values.conf.magnum.append | indent 4 }} @@ -59,7 +59,7 @@ data: {{- if .Values.conf.paste.prefix -}} {{ .Values.conf.paste.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.paste.append -}} {{ .Values.conf.paste.append | indent 4 }} @@ -68,5 +68,5 @@ data: {{ if .Values.conf.policy.override -}} {{ .Values.conf.policy.override | indent 4 }} {{- else -}} -{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index f87ca04655..dd86002b39 100644 --- a/magnum/templates/deployment-api.yaml +++ b/magnum/templates/deployment-api.yaml @@ -35,10 +35,10 @@ spec: labels: app: magnum-api annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_magnum_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_magnum_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/magnum/templates/job-db-init.yaml b/magnum/templates/job-db-init.yaml index c45b631d91..7806d08ec1 100644 --- a/magnum/templates/job-db-init.yaml +++ b/magnum/templates/job-db-init.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/magnum/templates/job-db-sync.yaml b/magnum/templates/job-db-sync.yaml index 0289fb0d15..d38322ebba 100644 --- a/magnum/templates/job-db-sync.yaml +++ b/magnum/templates/job-db-sync.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/magnum/templates/job-ks-endpoints.yaml b/magnum/templates/job-ks-endpoints.yaml index 5725c8287a..9510864f56 100644 --- a/magnum/templates/job-ks-endpoints.yaml +++ b/magnum/templates/job-ks-endpoints.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -55,16 +55,16 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SVC_ENDPOINT value: {{ $osServiceEndPoint }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} - name: OS_SERVICE_ENDPOINT - value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.keystone_endpoint_uri_lookup" }} + value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} {{- end }} {{- end }} volumes: diff --git a/magnum/templates/job-ks-service.yaml b/magnum/templates/job-ks-service.yaml index 36b078b26b..1ab14f3e45 100644 --- a/magnum/templates/job-ks-service.yaml +++ b/magnum/templates/job-ks-service.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,10 +54,10 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} {{- end }} diff --git a/magnum/templates/job-ks-user.yaml b/magnum/templates/job-ks-user.yaml index 07d9a37c89..e45dbc6486 100644 --- a/magnum/templates/job-ks-user.yaml +++ b/magnum/templates/job-ks-user.yaml @@ -25,7 +25,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,12 +54,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "magnum" {{- with $env := dict "ksUserSecret" $ksUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.magnum_user_role | quote }} diff --git a/magnum/templates/secret-db-root.env.yaml b/magnum/templates/secret-db-root.env.yaml index 36321112df..b7a2a35331 100644 --- a/magnum/templates/secret-db-root.env.yaml +++ b/magnum/templates/secret-db-root.env.yaml @@ -4,4 +4,4 @@ metadata: name: magnum-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/magnum/templates/secret-keystone-admin.env.yaml b/magnum/templates/secret-keystone-admin.env.yaml index f8d07a4a54..f795623847 100644 --- a/magnum/templates/secret-keystone-admin.env.yaml +++ b/magnum/templates/secret-keystone-admin.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.admin_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/magnum/templates/secret-keystone-user.env.yaml b/magnum/templates/secret-keystone-user.env.yaml index e719b4b095..ef461171d4 100644 --- a/magnum/templates/secret-keystone-user.env.yaml +++ b/magnum/templates/secret-keystone-user.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.conf.magnum.keystone_authtoken.keystonemiddleware.auth_token.region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml index a053ebc31e..da4d9991b3 100644 --- a/magnum/templates/statefulset-conductor.yaml +++ b/magnum/templates/statefulset-conductor.yaml @@ -31,7 +31,7 @@ spec: configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_magnum_conductor_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_magnum_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/mariadb/templates/configmap-bin.yaml b/mariadb/templates/configmap-bin.yaml index c476ada207..5a04afcff0 100644 --- a/mariadb/templates/configmap-bin.yaml +++ b/mariadb/templates/configmap-bin.yaml @@ -18,6 +18,6 @@ metadata: name: mariadb-bin data: readiness.sh: | -{{ tuple "bin/_readiness.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_readiness.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} start.sh: | -{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/mariadb/templates/configmap-etc.yaml b/mariadb/templates/configmap-etc.yaml index f0e5f6b878..b42ce327bd 100644 --- a/mariadb/templates/configmap-etc.yaml +++ b/mariadb/templates/configmap-etc.yaml @@ -18,10 +18,10 @@ metadata: name: mariadb-etc data: my.cnf: | -{{ tuple "etc/_my.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_my.cnf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} 00-base.cnf: | -{{ tuple "etc/_00-base.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_00-base.cnf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} 20-override.cnf: | -{{ tuple "etc/_20-override.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_20-override.cnf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} 99-force.cnf: | -{{ tuple "etc/_99-force.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_99-force.cnf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/mistral/templates/configmap-bin.yaml b/mistral/templates/configmap-bin.yaml index ebb5d6c004..30e5b8e887 100644 --- a/mistral/templates/configmap-bin.yaml +++ b/mistral/templates/configmap-bin.yaml @@ -18,15 +18,15 @@ metadata: name: mistral-bin data: db-init.py: |+ -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: |+ -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ks-service.sh: |+ -{{- include "helm-toolkit.keystone_service" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} ks-endpoints.sh: |+ -{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} ks-user.sh: |+ -{{- include "helm-toolkit.keystone_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} ks-domain-user.sh: |+ -{{- include "helm-toolkit.keystone_domain_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }} diff --git a/mistral/templates/configmap-etc.yaml b/mistral/templates/configmap-etc.yaml index 7b2d0941fa..4d9848ac05 100644 --- a/mistral/templates/configmap-etc.yaml +++ b/mistral/templates/configmap-etc.yaml @@ -15,23 +15,23 @@ {{- include "mistral.conf.mistral_values_skeleton" .Values.conf.mistral | trunc 0 -}} {{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.mistral.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.mistral.database.oslo.db "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.mistral.database.oslo.db "connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.mistral.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.mistral.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.mistral.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end -}} apiVersion: v1 @@ -46,7 +46,7 @@ data: {{- if .Values.conf.mistral.prefix -}} {{ .Values.conf.mistral.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_mistral.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_mistral.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.mistral.append -}} {{ .Values.conf.mistral.append | indent 4 }} @@ -58,7 +58,7 @@ data: {{- if .Values.conf.policy.prefix -}} {{ .Values.conf.policy.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.policy.append -}} {{ .Values.conf.policy.append | indent 4 }} diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index 1ee88a5706..ea6ef90930 100644 --- a/mistral/templates/deployment-api.yaml +++ b/mistral/templates/deployment-api.yaml @@ -35,10 +35,10 @@ spec: labels: app: mistral-api annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_mistral_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_mistral_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index c2c51356ad..af4fdae8e2 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/mistral/templates/deployment-executor.yaml @@ -35,10 +35,10 @@ spec: labels: app: mistral-executor annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_mistral_executor_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_mistral_executor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/mistral/templates/job-db-init.yaml b/mistral/templates/job-db-init.yaml index 08431c5a56..d5732b5f24 100644 --- a/mistral/templates/job-db-init.yaml +++ b/mistral/templates/job-db-init.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/mistral/templates/job-db-sync.yaml b/mistral/templates/job-db-sync.yaml index cd11967547..08206afcc9 100644 --- a/mistral/templates/job-db-sync.yaml +++ b/mistral/templates/job-db-sync.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/mistral/templates/job-ks-endpoints.yaml b/mistral/templates/job-ks-endpoints.yaml index 094b6869fb..2258286184 100644 --- a/mistral/templates/job-ks-endpoints.yaml +++ b/mistral/templates/job-ks-endpoints.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -55,16 +55,16 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SVC_ENDPOINT value: {{ $osServiceEndPoint }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} - name: OS_SERVICE_ENDPOINT - value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.keystone_endpoint_uri_lookup" }} + value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} {{- end }} {{- end }} volumes: diff --git a/mistral/templates/job-ks-service.yaml b/mistral/templates/job-ks-service.yaml index 8d62704d6c..a1280424ab 100644 --- a/mistral/templates/job-ks-service.yaml +++ b/mistral/templates/job-ks-service.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,10 +54,10 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} {{- end }} diff --git a/mistral/templates/job-ks-user.yaml b/mistral/templates/job-ks-user.yaml index 7491b553a3..ad52d8c3fc 100644 --- a/mistral/templates/job-ks-user.yaml +++ b/mistral/templates/job-ks-user.yaml @@ -25,7 +25,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,12 +54,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "mistral" {{- with $env := dict "ksUserSecret" $ksUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.mistral_user_role | quote }} diff --git a/mistral/templates/secret-db-root.env.yaml b/mistral/templates/secret-db-root.env.yaml index 61799c277a..d9a3e8734a 100644 --- a/mistral/templates/secret-db-root.env.yaml +++ b/mistral/templates/secret-db-root.env.yaml @@ -18,4 +18,4 @@ metadata: name: mistral-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/mistral/templates/secret-keystone-admin.env.yaml b/mistral/templates/secret-keystone-admin.env.yaml index 988b66e5b5..b53c5817a6 100644 --- a/mistral/templates/secret-keystone-admin.env.yaml +++ b/mistral/templates/secret-keystone-admin.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.admin_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/mistral/templates/secret-keystone-user.env.yaml b/mistral/templates/secret-keystone-user.env.yaml index 228649fcbd..47f6103b5f 100644 --- a/mistral/templates/secret-keystone-user.env.yaml +++ b/mistral/templates/secret-keystone-user.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index d94ab92bfa..e796f3405b 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/mistral/templates/statefulset-engine.yaml @@ -31,7 +31,7 @@ spec: configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_mistral_engine_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_mistral_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index 0bfbed8b6c..4410b549bc 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/mistral/templates/statefulset-event-engine.yaml @@ -31,7 +31,7 @@ spec: configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_mistral_event_engine_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_mistral_event_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/neutron/templates/configmap-bin.yaml b/neutron/templates/configmap-bin.yaml index 4e151dfc16..88c6657267 100644 --- a/neutron/templates/configmap-bin.yaml +++ b/neutron/templates/configmap-bin.yaml @@ -18,28 +18,28 @@ metadata: name: neutron-bin data: db-init.py: |+ -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: |+ -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ks-service.sh: |+ -{{- include "helm-toolkit.keystone_service" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} ks-endpoints.sh: |+ -{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} ks-user.sh: |+ -{{- include "helm-toolkit.keystone_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} neutron-dhcp-agent.sh: |+ -{{ tuple "bin/_neutron-dhcp-agent.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_neutron-dhcp-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} neutron-l3-agent.sh: |+ -{{ tuple "bin/_neutron-l3-agent.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_neutron-l3-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} neutron-metadata-agent.sh: |+ -{{ tuple "bin/_neutron-metadata-agent.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_neutron-metadata-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} neutron-openvswitch-agent.sh: |+ -{{ tuple "bin/_neutron-openvswitch-agent.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_neutron-openvswitch-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} neutron-server.sh: |+ -{{ tuple "bin/_neutron-server.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_neutron-server.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} openvswitch-db-server.sh: |+ -{{ tuple "bin/_openvswitch-db-server.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_openvswitch-db-server.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} openvswitch-ensure-configured.sh: |+ -{{ tuple "bin/_openvswitch-ensure-configured.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_openvswitch-ensure-configured.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} openvswitch-vswitchd.sh: |+ -{{ tuple "bin/_openvswitch-vswitchd.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_openvswitch-vswitchd.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml index b905caff1f..562e104f59 100644 --- a/neutron/templates/configmap-etc.yaml +++ b/neutron/templates/configmap-etc.yaml @@ -26,27 +26,27 @@ {{- include "neutron.conf.sriov_agent_values_skeleton" .Values.conf.sriov_agent | trunc 0 -}} {{- if empty .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} {{- end }} {{- if empty .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end }} {{- if empty .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- end }} {{- if empty .Values.conf.neutron.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.neutron.database.oslo.db "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.neutron.database.oslo.db "connection" | quote | trunc 0 -}} {{- end }} {{- if empty .Values.conf.neutron.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.neutron.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.neutron.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end }} {{- if empty .Values.conf.neutron.nova.nova.auth.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.neutron.nova.nova.auth "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.neutron.nova.nova.auth "auth_url" | quote | trunc 0 -}} {{- end }} apiVersion: v1 @@ -61,7 +61,7 @@ data: {{- if .Values.conf.paste.prefix -}} {{ .Values.conf.paste.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.paste.append -}} {{ .Values.conf.paste.append | indent 4 }} @@ -73,7 +73,7 @@ data: {{- if .Values.conf.policy.prefix -}} {{ .Values.conf.policy.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.policy.append -}} {{ .Values.conf.policy.append | indent 4 }} @@ -85,7 +85,7 @@ data: {{- if .Values.conf.dhcp_agent.prefix -}} {{ .Values.conf.dhcp_agent.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_dhcp_agent.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_dhcp_agent.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.dhcp_agent.append -}} {{ .Values.conf.dhcp_agent.append | indent 4 }} @@ -97,7 +97,7 @@ data: {{- if .Values.conf.l3_agent.prefix -}} {{ .Values.conf.l3_agent.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_l3_agent.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_l3_agent.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.l3_agent.append -}} {{ .Values.conf.l3_agent.append | indent 4 }} @@ -109,7 +109,7 @@ data: {{- if .Values.conf.metadata_agent.prefix -}} {{ .Values.conf.metadata_agent.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_metadata_agent.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_metadata_agent.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.metadata_agent.append -}} {{ .Values.conf.metadata_agent.append | indent 4 }} @@ -121,7 +121,7 @@ data: {{- if .Values.conf.metering_agent.prefix -}} {{ .Values.conf.metering_agent.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_metering_agent.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_metering_agent.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.metering_agent.append -}} {{ .Values.conf.metering_agent.append | indent 4 }} @@ -133,7 +133,7 @@ data: {{- if .Values.conf.neutron.prefix -}} {{ .Values.conf.neutron.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_neutron.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_neutron.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.neutron.append -}} {{ .Values.conf.neutron.append | indent 4 }} @@ -145,7 +145,7 @@ data: {{- if .Values.conf.ml2_conf.prefix -}} {{ .Values.conf.ml2_conf.prefix | indent 4 }} {{- end }} -{{ tuple "etc/plugins/_ml2_conf.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/plugins/_ml2_conf.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.ml2_conf.append -}} {{ .Values.conf.ml2_conf.append | indent 4 }} @@ -157,7 +157,7 @@ data: {{- if .Values.conf.ml2_conf_sriov.prefix -}} {{ .Values.conf.ml2_conf_sriov.prefix | indent 4 }} {{- end }} -{{ tuple "etc/plugins/_ml2_conf_sriov.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/plugins/_ml2_conf_sriov.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.ml2_conf_sriov.append -}} {{ .Values.conf.ml2_conf_sriov.append | indent 4 }} @@ -169,7 +169,7 @@ data: {{- if .Values.conf.macvtap_agent.prefix -}} {{ .Values.conf.macvtap_agent.prefix | indent 4 }} {{- end }} -{{ tuple "etc/plugins/_macvtap_agent.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/plugins/_macvtap_agent.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.macvtap_agent.append -}} {{ .Values.conf.macvtap_agent.append | indent 4 }} @@ -181,7 +181,7 @@ data: {{- if .Values.conf.linuxbridge_agent.prefix -}} {{ .Values.conf.linuxbridge_agent.prefix | indent 4 }} {{- end }} -{{ tuple "etc/plugins/_linuxbridge_agent.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/plugins/_linuxbridge_agent.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.linuxbridge_agent.append -}} {{ .Values.conf.linuxbridge_agent.append | indent 4 }} @@ -193,7 +193,7 @@ data: {{- if .Values.conf.openvswitch_agent.prefix -}} {{ .Values.conf.openvswitch_agent.prefix | indent 4 }} {{- end }} -{{ tuple "etc/plugins/_openvswitch_agent.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/plugins/_openvswitch_agent.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.openvswitch_agent.append -}} {{ .Values.conf.openvswitch_agent.append | indent 4 }} @@ -205,11 +205,11 @@ data: {{- if .Values.conf.sriov_agent.prefix -}} {{ .Values.conf.sriov_agent.prefix | indent 4 }} {{- end }} -{{ tuple "etc/plugins/_sriov_agent.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/plugins/_sriov_agent.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.sriov_agent.append -}} {{ .Values.conf.sriov_agent.append | indent 4 }} {{- end }} resolv.conf: |+ -{{ tuple "etc/_resolv.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_resolv.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} dnsmasq.conf: "" diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index 7dbe52cc47..4a1fc76fc4 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/neutron/templates/daemonset-dhcp-agent.yaml @@ -26,10 +26,10 @@ spec: labels: app: neutron-dhcp-agent annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_neutron_dhcp_agent_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_neutron_dhcp_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index 70847db184..7c0ab707a3 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/neutron/templates/daemonset-l3-agent.yaml @@ -26,10 +26,10 @@ spec: labels: app: neutron-l3-agent annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_neutron_l3_agent_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_neutron_l3_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index 7f4c7b6c44..de2b466262 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/neutron/templates/daemonset-metadata-agent.yaml @@ -26,10 +26,10 @@ spec: labels: app: neutron-metadata-agent annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_neutron_metadata_agent_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_neutron_metadata_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index 30525546f8..42886ac4ed 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/neutron/templates/daemonset-ovs-agent.yaml @@ -26,10 +26,10 @@ spec: labels: app: ovs-agent annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_neutron_ovs_agent_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_neutron_ovs_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/neutron/templates/daemonset-ovs-db.yaml b/neutron/templates/daemonset-ovs-db.yaml index 1bf11f27ea..f67e41d9a2 100644 --- a/neutron/templates/daemonset-ovs-db.yaml +++ b/neutron/templates/daemonset-ovs-db.yaml @@ -22,8 +22,8 @@ spec: labels: app: ovs-db annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} spec: nodeSelector: {{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }} diff --git a/neutron/templates/daemonset-ovs-vswitchd.yaml b/neutron/templates/daemonset-ovs-vswitchd.yaml index 07730573e3..e3127a5561 100644 --- a/neutron/templates/daemonset-ovs-vswitchd.yaml +++ b/neutron/templates/daemonset-ovs-vswitchd.yaml @@ -22,8 +22,8 @@ spec: labels: app: ovs-vswitchd annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} spec: nodeSelector: {{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }} diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index b7d428d3ab..9d0926bcd7 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -35,10 +35,10 @@ spec: labels: app: neutron-server annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_neutron_server_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_neutron_server_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/neutron/templates/job-db-init.yaml b/neutron/templates/job-db-init.yaml index 59256a4d39..9ac29bfb60 100644 --- a/neutron/templates/job-db-init.yaml +++ b/neutron/templates/job-db-init.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml index 8ea7ddf4dd..560dbce97b 100644 --- a/neutron/templates/job-db-sync.yaml +++ b/neutron/templates/job-db-sync.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/neutron/templates/job-ks-endpoints.yaml b/neutron/templates/job-ks-endpoints.yaml index 0b258f6b17..5b7f51d3ca 100644 --- a/neutron/templates/job-ks-endpoints.yaml +++ b/neutron/templates/job-ks-endpoints.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -55,16 +55,16 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SVC_ENDPOINT value: {{ $osServiceEndPoint }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} - name: OS_SERVICE_ENDPOINT - value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.keystone_endpoint_uri_lookup" }} + value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} {{- end }} {{- end }} volumes: diff --git a/neutron/templates/job-ks-service.yaml b/neutron/templates/job-ks-service.yaml index 6df01ee71c..498ec688ff 100644 --- a/neutron/templates/job-ks-service.yaml +++ b/neutron/templates/job-ks-service.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,10 +54,10 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} {{- end }} diff --git a/neutron/templates/job-ks-user.yaml b/neutron/templates/job-ks-user.yaml index 4fe7396b94..6409ac71b9 100644 --- a/neutron/templates/job-ks-user.yaml +++ b/neutron/templates/job-ks-user.yaml @@ -25,7 +25,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,12 +54,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "neutron" {{- with $env := dict "ksUserSecret" $ksUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.neutron_user_role | quote }} diff --git a/neutron/templates/secret-db-root.env.yaml b/neutron/templates/secret-db-root.env.yaml index 5d81dd0be6..ccdccb7d85 100644 --- a/neutron/templates/secret-db-root.env.yaml +++ b/neutron/templates/secret-db-root.env.yaml @@ -4,4 +4,4 @@ metadata: name: neutron-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/neutron/templates/secret-keystone-admin.env.yaml b/neutron/templates/secret-keystone-admin.env.yaml index 4cee2c8767..3d1bb0b48d 100644 --- a/neutron/templates/secret-keystone-admin.env.yaml +++ b/neutron/templates/secret-keystone-admin.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.admin_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/neutron/templates/secret-keystone-user.env.yaml b/neutron/templates/secret-keystone-user.env.yaml index 3faafe1089..111ebdb45e 100644 --- a/neutron/templates/secret-keystone-user.env.yaml +++ b/neutron/templates/secret-keystone-user.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.neutron_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/nova/templates/configmap-bin.yaml b/nova/templates/configmap-bin.yaml index 181d29ff6c..e4fe90a05c 100644 --- a/nova/templates/configmap-bin.yaml +++ b/nova/templates/configmap-bin.yaml @@ -18,28 +18,28 @@ metadata: name: nova-bin data: db-init.py: |+ -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: |+ -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ks-service.sh: |+ -{{- include "helm-toolkit.keystone_service" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} ks-endpoints.sh: |+ -{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} ks-user.sh: |+ -{{- include "helm-toolkit.keystone_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} libvirt.sh: | -{{ tuple "bin/_libvirt.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_libvirt.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} bootstrap.sh: | -{{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} nova-api.sh: | -{{ tuple "bin/_nova-api.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_nova-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} nova-api-metadata.sh: | -{{ tuple "bin/_nova-api-metadata.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_nova-api-metadata.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} nova-compute.sh: | -{{ tuple "bin/_nova-compute.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_nova-compute.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} nova-conductor.sh: | -{{ tuple "bin/_nova-conductor.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_nova-conductor.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} nova-consoleauth.sh: | -{{ tuple "bin/_nova-consoleauth.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_nova-consoleauth.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} nova-scheduler.sh: | -{{ tuple "bin/_nova-scheduler.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_nova-scheduler.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml index 1bc13fade8..283b0ec709 100644 --- a/nova/templates/configmap-etc.yaml +++ b/nova/templates/configmap-etc.yaml @@ -15,44 +15,44 @@ {{- include "nova.conf.nova_values_skeleton" .Values.conf.nova | trunc 0 -}} {{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} {{- end -}} # FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future {{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.nova.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.nova.database.oslo.db "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.nova.database.oslo.db "connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.nova.api_database.nova.conf.connection -}} -{{- tuple "oslo_db_api" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.nova.api_database.nova.conf "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db_api" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.nova.api_database.nova.conf "connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.nova.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.nova.glance.nova.conf.api_servers -}} -{{- tuple "image" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.nova.glance.nova.conf "api_servers" | quote | trunc 0 -}} +{{- tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.glance.nova.conf "api_servers" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.nova.conf.url -}} -{{- tuple "network" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron.nova.conf "url" | quote | trunc 0 -}} +{{- tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron.nova.conf "url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.nova.conf.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron.nova.conf "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron.nova.conf "auth_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.nova.cache.nova.conf.memcache_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.nova.cache.nova.conf "memcache_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.nova.cache.nova.conf "memcache_servers" | quote | trunc 0 -}} {{- end -}} apiVersion: v1 @@ -67,7 +67,7 @@ data: {{- if .Values.conf.nova.prefix -}} {{ .Values.conf.nova.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_nova.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_nova.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.nova.append -}} {{ .Values.conf.nova.append | indent 4 }} @@ -79,7 +79,7 @@ data: {{- if .Values.conf.paste.prefix -}} {{ .Values.conf.paste.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.paste.append -}} {{ .Values.conf.paste.append | indent 4 }} @@ -88,13 +88,13 @@ data: {{ if .Values.conf.policy.override -}} {{ .Values.conf.policy.override | indent 4 }} {{- else -}} -{{ tuple "etc/_policy.yaml.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.yaml.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} ceph.client.cinder.keyring.yaml: |+ -{{ tuple "etc/_ceph.client.cinder.keyring.yaml.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_ceph.client.cinder.keyring.yaml.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} resolv.conf: |+ -{{ tuple "etc/_resolv.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_resolv.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} libvirtd.conf: |+ -{{ tuple "etc/_libvirtd.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_libvirtd.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} qemu.conf: |+ -{{ tuple "etc/_qemu.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_qemu.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index 07b768744f..7488fc3304 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -27,10 +27,10 @@ spec: labels: app: nova-compute annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_nova_compute_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_nova_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/nova/templates/daemonset-libvirt.yaml b/nova/templates/daemonset-libvirt.yaml index 198783ae65..5b66b06cd9 100644 --- a/nova/templates/daemonset-libvirt.yaml +++ b/nova/templates/daemonset-libvirt.yaml @@ -26,10 +26,10 @@ spec: labels: app: nova-libvirt annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_nova_libvirt_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_nova_libvirt_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml index 5897129b34..49e00eee5e 100644 --- a/nova/templates/deployment-api-metadata.yaml +++ b/nova/templates/deployment-api-metadata.yaml @@ -35,10 +35,10 @@ spec: labels: app: nova-api-metadata annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_nova_api_metadata_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_nova_api_metadata_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml index 811af55984..7d393ada3b 100644 --- a/nova/templates/deployment-api-osapi.yaml +++ b/nova/templates/deployment-api-osapi.yaml @@ -35,10 +35,10 @@ spec: labels: app: nova-api-osapi annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_nova_api_osapi_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_nova_api_osapi_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml index 20375fcb1b..691137f11b 100644 --- a/nova/templates/deployment-conductor.yaml +++ b/nova/templates/deployment-conductor.yaml @@ -35,10 +35,10 @@ spec: labels: app: nova-conductor annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_nova_conductor_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_nova_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml index 90801708f4..9842113373 100644 --- a/nova/templates/deployment-consoleauth.yaml +++ b/nova/templates/deployment-consoleauth.yaml @@ -36,10 +36,10 @@ spec: labels: app: nova-consoleauth annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_nova_consoleauth_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_nova_consoleauth_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml index 8a86a088c1..4fb66de6c3 100644 --- a/nova/templates/deployment-scheduler.yaml +++ b/nova/templates/deployment-scheduler.yaml @@ -36,10 +36,10 @@ spec: labels: app: nova-scheduler annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_nova_scheduler_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_nova_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/nova/templates/job-bootstrap.yaml b/nova/templates/job-bootstrap.yaml index 0adff4c26e..90c2d881ef 100644 --- a/nova/templates/job-bootstrap.yaml +++ b/nova/templates/job-bootstrap.yaml @@ -26,7 +26,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_nova_bootstrap_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_nova_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -50,7 +50,7 @@ spec: - /tmp/bootstrap.sh env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} volumeMounts: - name: nova-bin diff --git a/nova/templates/job-db-init.yaml b/nova/templates/job-db-init.yaml index c4f21af1f1..902c37c5a1 100644 --- a/nova/templates/job-db-init.yaml +++ b/nova/templates/job-db-init.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml index 2056cf21a5..6fc8f63ac7 100644 --- a/nova/templates/job-db-sync.yaml +++ b/nova/templates/job-db-sync.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/nova/templates/job-ks-endpoints.yaml b/nova/templates/job-ks-endpoints.yaml index fc91f13ee8..a2dc46ec04 100644 --- a/nova/templates/job-ks-endpoints.yaml +++ b/nova/templates/job-ks-endpoints.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -55,16 +55,16 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SVC_ENDPOINT value: {{ $osServiceEndPoint }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} - name: OS_SERVICE_ENDPOINT - value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.keystone_endpoint_uri_lookup" }} + value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} {{- end }} {{- end }} volumes: diff --git a/nova/templates/job-ks-service.yaml b/nova/templates/job-ks-service.yaml index cf40ce37e2..92bd8b15d9 100644 --- a/nova/templates/job-ks-service.yaml +++ b/nova/templates/job-ks-service.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,10 +54,10 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} {{- end }} diff --git a/nova/templates/job-ks-user.yaml b/nova/templates/job-ks-user.yaml index efea99fa5c..7c948bd2b5 100644 --- a/nova/templates/job-ks-user.yaml +++ b/nova/templates/job-ks-user.yaml @@ -25,7 +25,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,12 +54,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "nova" {{- with $env := dict "ksUserSecret" $ksUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.nova_user_role | quote }} diff --git a/nova/templates/secret-db-root.env.yaml b/nova/templates/secret-db-root.env.yaml index c8b2355ed6..e5cfa657c8 100644 --- a/nova/templates/secret-db-root.env.yaml +++ b/nova/templates/secret-db-root.env.yaml @@ -4,4 +4,4 @@ metadata: name: nova-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/nova/templates/secret-keystone-admin.env.yaml b/nova/templates/secret-keystone-admin.env.yaml index fc978bc7a0..126f7e01f8 100644 --- a/nova/templates/secret-keystone-admin.env.yaml +++ b/nova/templates/secret-keystone-admin.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.admin_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/nova/templates/secret-keystone-user.env.yaml b/nova/templates/secret-keystone-user.env.yaml index e917879b9a..26afb55a50 100644 --- a/nova/templates/secret-keystone-user.env.yaml +++ b/nova/templates/secret-keystone-user.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/rabbitmq/templates/configmap-bin.yaml b/rabbitmq/templates/configmap-bin.yaml index 26814ccb94..23b30d9b50 100644 --- a/rabbitmq/templates/configmap-bin.yaml +++ b/rabbitmq/templates/configmap-bin.yaml @@ -22,10 +22,10 @@ metadata: component: messaging data: rabbitmq-liveness.sh: | -{{ tuple "bin/_rabbitmq-liveness.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_rabbitmq-liveness.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} rabbitmq-readiness.sh: | -{{ tuple "bin/_rabbitmq-readiness.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_rabbitmq-readiness.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} rabbitmq-check-helpers.sh: | -{{ tuple "bin/_rabbitmq-check-helpers.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_rabbitmq-check-helpers.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} start.sh: | -{{ tuple "bin/_rabbitmq-start.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_rabbitmq-start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/rabbitmq/templates/configmap-etc.yaml b/rabbitmq/templates/configmap-etc.yaml index 19abad3c84..b08cf3e6cb 100644 --- a/rabbitmq/templates/configmap-etc.yaml +++ b/rabbitmq/templates/configmap-etc.yaml @@ -22,11 +22,11 @@ metadata: component: messaging data: enabled_plugins: | -{{ tuple "etc/_enabled_plugins.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_enabled_plugins.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} erlang.cookie: | -{{ tuple "etc/_erlang.cookie.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_erlang.cookie.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} rabbitmq-env.conf: | -{{ tuple "etc/_rabbitmq-env.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_rabbitmq-env.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} rabbitmq.config: | -{{ tuple "etc/_rabbitmq.config.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_rabbitmq.config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/rabbitmq/templates/deployment.yaml b/rabbitmq/templates/deployment.yaml index 07f4aef759..d792ad0d94 100644 --- a/rabbitmq/templates/deployment.yaml +++ b/rabbitmq/templates/deployment.yaml @@ -33,10 +33,10 @@ spec: labels: app: rabbitmq annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' # TODO: this needs to be moved to common. scheduler.alpha.kubernetes.io/affinity: > diff --git a/rabbitmq/templates/etc/_enabled_plugins.tpl b/rabbitmq/templates/etc/_enabled_plugins.tpl index dec7a41101..a7ba95131f 100644 --- a/rabbitmq/templates/etc/_enabled_plugins.tpl +++ b/rabbitmq/templates/etc/_enabled_plugins.tpl @@ -12,4 +12,4 @@ % See the License for the specific language governing permissions and % limitations under the License. -[{{ include "helm-toolkit.joinListWithComma" .Values.enabled_plugins }}]. +[{{ include "helm-toolkit.utils.joinListWithComma" .Values.enabled_plugins }}]. diff --git a/senlin/templates/configmap-bin.yaml b/senlin/templates/configmap-bin.yaml index 1e542140cd..0f49d113be 100644 --- a/senlin/templates/configmap-bin.yaml +++ b/senlin/templates/configmap-bin.yaml @@ -18,18 +18,18 @@ metadata: name: senlin-bin data: db-init.py: | -{{- include "helm-toolkit.db_init" . | indent 4 }} +{{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | -{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} ks-service.sh: |+ -{{- include "helm-toolkit.keystone_service" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} ks-endpoints.sh: |+ -{{- include "helm-toolkit.keystone_endpoints" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} ks-user.sh: |+ -{{- include "helm-toolkit.keystone_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} ks-domain-user.sh: |+ -{{- include "helm-toolkit.keystone_domain_user" . | indent 4 }} +{{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }} senlin-api.sh: | -{{ tuple "bin/_senlin-api.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_senlin-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} senlin-engine.sh: | -{{ tuple "bin/_senlin-engine.sh.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "bin/_senlin-engine.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/senlin/templates/configmap-etc.yaml b/senlin/templates/configmap-etc.yaml index 44e62b0c62..aed6ffca9f 100644 --- a/senlin/templates/configmap-etc.yaml +++ b/senlin/templates/configmap-etc.yaml @@ -15,24 +15,24 @@ {{- include "senlin.conf.senlin_values_skeleton" .Values.conf.senlin | trunc 0 -}} {{- if empty .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}} {{- end -}} # FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future {{- if empty .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} +{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} +{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.hostname_endpoint_uri_lookup" | set .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.senlin.database.oslo.db.connection -}} -{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.senlin.database.oslo.db "connection" | quote | trunc 0 -}} +{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.senlin.database.oslo.db "connection" | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.senlin.default.oslo.messaging.transport_url -}} -{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.senlin.default.oslo.messaging "transport_url" | quote | trunc 0 -}} +{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.senlin.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- end -}} apiVersion: v1 @@ -47,7 +47,7 @@ data: {{- if .Values.conf.senlin.prefix -}} {{ .Values.conf.senlin.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_senlin.conf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_senlin.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.senlin.append -}} {{ .Values.conf.senlin.append | indent 4 }} @@ -59,7 +59,7 @@ data: {{- if .Values.conf.paste.prefix -}} {{ .Values.conf.paste.prefix | indent 4 }} {{- end }} -{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_api-paste.ini.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- if .Values.conf.paste.append -}} {{ .Values.conf.paste.append | indent 4 }} @@ -68,5 +68,5 @@ data: {{ if .Values.conf.policy.override -}} {{ .Values.conf.policy.override | indent 4 }} {{- else -}} -{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml index 23d77d6dd9..9dc83243b2 100644 --- a/senlin/templates/deployment-api.yaml +++ b/senlin/templates/deployment-api.yaml @@ -35,10 +35,10 @@ spec: labels: app: senlin-api annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_senlin_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_senlin_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: diff --git a/senlin/templates/job-db-init.yaml b/senlin/templates/job-db-init.yaml index ef5afed7b6..b308b7d88b 100644 --- a/senlin/templates/job-db-init.yaml +++ b/senlin/templates/job-db-init.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/senlin/templates/job-db-sync.yaml b/senlin/templates/job-db-sync.yaml index a2b1af3078..9a76832f81 100644 --- a/senlin/templates/job-db-sync.yaml +++ b/senlin/templates/job-db-sync.yaml @@ -23,7 +23,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure diff --git a/senlin/templates/job-ks-endpoints.yaml b/senlin/templates/job-ks-endpoints.yaml index df66ba1af9..db06ef8860 100644 --- a/senlin/templates/job-ks-endpoints.yaml +++ b/senlin/templates/job-ks-endpoints.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -55,16 +55,16 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SVC_ENDPOINT value: {{ $osServiceEndPoint }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} - name: OS_SERVICE_ENDPOINT - value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.keystone_endpoint_uri_lookup" }} + value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} {{- end }} {{- end }} volumes: diff --git a/senlin/templates/job-ks-service.yaml b/senlin/templates/job-ks-service.yaml index 7b3102b7d6..f31ffb71c9 100644 --- a/senlin/templates/job-ks-service.yaml +++ b/senlin/templates/job-ks-service.yaml @@ -24,7 +24,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,10 +54,10 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: OS_SERVICE_NAME - value: {{ tuple $osServiceType $envAll | include "helm-toolkit.keystone_endpoint_name_lookup" }} + value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }} - name: OS_SERVICE_TYPE value: {{ $osServiceType }} {{- end }} diff --git a/senlin/templates/job-ks-user.yaml b/senlin/templates/job-ks-user.yaml index 89f6353825..c700114a75 100644 --- a/senlin/templates/job-ks-user.yaml +++ b/senlin/templates/job-ks-user.yaml @@ -25,7 +25,7 @@ spec: metadata: annotations: pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: restartPolicy: OnFailure @@ -54,12 +54,12 @@ spec: readOnly: true env: {{- with $env := dict "ksUserSecret" $ksAdminSecret }} -{{- include "helm-toolkit.keystone_openrc_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_SERVICE_NAME value: "senlin" {{- with $env := dict "ksUserSecret" $ksUserSecret }} -{{- include "helm-toolkit.keystone_user_create_env_vars" $env | indent 12 }} +{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }} {{- end }} - name: SERVICE_OS_ROLE value: {{ .Values.keystone.senlin_user_role | quote }} diff --git a/senlin/templates/secret-db-root.env.yaml b/senlin/templates/secret-db-root.env.yaml index 05257084df..020007c025 100644 --- a/senlin/templates/secret-db-root.env.yaml +++ b/senlin/templates/secret-db-root.env.yaml @@ -4,4 +4,4 @@ metadata: name: senlin-db-root type: Opaque data: - DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | b64enc }} + DB_CONNECTION: {{ tuple "oslo_db" "internal" "admin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/senlin/templates/secret-keystone-admin.env.yaml b/senlin/templates/secret-keystone-admin.env.yaml index f8d07a4a54..f795623847 100644 --- a/senlin/templates/secret-keystone-admin.env.yaml +++ b/senlin/templates/secret-keystone-admin.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.keystone.admin_region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/senlin/templates/secret-keystone-user.env.yaml b/senlin/templates/secret-keystone-user.env.yaml index d6f133d1d6..a11f50c37d 100644 --- a/senlin/templates/secret-keystone-user.env.yaml +++ b/senlin/templates/secret-keystone-user.env.yaml @@ -19,7 +19,7 @@ metadata: type: Opaque data: OS_AUTH_URL: | -{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} +{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc | indent 4 }} OS_REGION_NAME: | {{ .Values.conf.senlin.keystone_authtoken.keystonemiddleware.auth_token.region_name | b64enc | indent 4 }} OS_PROJECT_DOMAIN_NAME: | diff --git a/senlin/templates/statefulset-engine.yaml b/senlin/templates/statefulset-engine.yaml index 1a41a5548a..c5a59dafec 100644 --- a/senlin/templates/statefulset-engine.yaml +++ b/senlin/templates/statefulset-engine.yaml @@ -31,7 +31,7 @@ spec: configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }} pod.beta.kubernetes.io/init-containers: '[ -{{ tuple $envAll $dependencies $mounts_senlin_engine_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }} +{{ tuple $envAll $dependencies $mounts_senlin_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }} ]' spec: nodeSelector: