[designate] Use kubernetes-entrypoint in initContainer

degricar · Oct 4, 2024 · 9d2f064 · 9d2f064
1 parent f83269e
commit 9d2f064
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 94 deletions.
diff --git a/openstack/designate/Chart.yaml b/openstack/designate/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes to deploy Openstack Designate  (DNSaaS)
 name: designate
-version: 0.3.2
+version: 0.3.3
 appVersion: "xena"
 dependencies:
   - condition: percona_cluster.enabled

diff --git a/openstack/designate/templates/_helpers.tpl b/openstack/designate/templates/_helpers.tpl
@@ -61,3 +61,24 @@ qualname={{$item}}
   {{- $hash := empty .Values.proxysql.mode | ternary $bin $all | sha256sum }}
   {{- .Release.Name }}-migration-{{ substr 0 4 $hash }}-{{ required ".Values.image_version_designate is missing" .Values.image_version_designate }}
 {{- end }}
+
+
+{{- define "designate.rabbitmq_dependencies" }}
+  {{- if .Values.rabbitmq_cluster.enabled }}
+    {{- .Release.Name }}-rabbitmq-cluster
+  {{- else }}
+    {{- .Release.Name }}-rabbitmq
+  {{- end }}
+{{- end }}
+
+{{- define "designate.db_dependencies" }}
+  {{- if .Values.percona_cluster.enabled }}
+    {{- .Release.Name }}-percona-pxc
+  {{- else }}
+    {{- .Release.Name }}-mariadb
+  {{- end }}
+{{- end }}
+
+{{- define "designate.service_dependencies" }}
+  {{- template "designate.db_dependencies" . }},{{ template "designate.rabbitmq_dependencies" . }}
+{{- end }}
diff --git a/openstack/designate/templates/api-deployment.yaml b/openstack/designate/templates/api-deployment.yaml
@@ -46,26 +46,7 @@ spec:
 {{ tuple . "designate" "api" | include "kubernetes_pod_anti_affinity" | indent 6 }}
       {{- include "utils.proxysql.pod_settings" . | indent 6 }}
       initContainers:
-      - name: kubernetes-entrypoint
-        image: {{ required ".Values.global.registry is missing" .Values.global.registry }}/loci-designate:{{ required ".Values.image_version_designate is missing" .Values.image_version_designate }}
-        imagePullPolicy: IfNotPresent
-        command:
-          - kubernetes-entrypoint
-        env:
-            - name: NAMESPACE
-              value: {{ .Release.Namespace }}
-            - name: DEPENDENCY_JOBS
-              value: {{ include "migration_job_name" . }}
-            - name: DEPENDENCY_SERVICE
-{{- if .Values.percona_cluster.enabled }}
-              value: "{{ .Release.Name }}-percona-pxc,{{ .Release.Name }}-rabbitmq,{{ .Release.Name }}-memcached"
-{{- else if .Values.rabbitmq_cluster.enabled }}
-              value: "{{ .Release.Name }}-mariadb,{{ .Release.Name }}-rabbitmq-cluster,{{ .Release.Name }}-memcached"
-{{- else }}
-              value: "{{ .Release.Name }}-mariadb,{{ .Release.Name }}-rabbitmq,{{ .Release.Name }}-memcached"
-{{- end }}
-            - name: COMMAND
-              value: "true"
+      {{- tuple . (dict "service" (include "designate.service_dependencies" . ) "jobs" (include "migration_job_name" . )) | include "utils.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: designate-api
           image: {{ required ".Values.global.registry is missing" .Values.global.registry }}/loci-designate:{{ required ".Values.image_version_designate is missing" .Values.image_version_designate }}

diff --git a/openstack/designate/templates/central-deployment.yaml b/openstack/designate/templates/central-deployment.yaml
@@ -45,29 +45,17 @@ spec:
 {{- end }}
 {{ tuple . "designate" "central" | include "kubernetes_pod_anti_affinity" | indent 6 }}
       {{- include "utils.proxysql.pod_settings" . | indent 6 }}
+      initContainers:
+      {{- tuple . (dict "service" (include "designate.service_dependencies" . ) "jobs" (include "migration_job_name" . )) | include "utils.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: designate-central
           image: {{ required ".Values.global.registry is missing" .Values.global.registry }}/loci-designate:{{ required ".Values.global.image_version_designate is missing" .Values.image_version_designate }}
           imagePullPolicy: IfNotPresent
           command:
-            - kubernetes-entrypoint
+            - /container.init/designate-central-start
           resources:
 {{ toYaml .Values.resources.central | indent 12 }}
           env:
-            - name: COMMAND
-              value: "/container.init/designate-central-start"
-            - name: NAMESPACE
-              value: {{ .Release.Namespace }}
-            - name: DEPENDENCY_JOBS
-              value: {{ include "migration_job_name" . }}
-            - name: DEPENDENCY_SERVICE
-{{- if .Values.percona_cluster.enabled }}
-              value: "{{ .Release.Name }}-percona-pxc,{{ .Release.Name }}-rabbitmq"
-{{- else if .Values.rabbitmq_cluster.enabled }}
-              value: "{{ .Release.Name }}-mariadb,{{ .Release.Name }}-rabbitmq-cluster"
-{{- else }}
-              value: "{{ .Release.Name }}-mariadb,{{ .Release.Name }}-rabbitmq"
-{{- end }}
             - name: DEBUG_CONTAINER
               value: "false"
             - name: NODE_NAME

diff --git a/openstack/designate/templates/mdns-deployment.yaml b/openstack/designate/templates/mdns-deployment.yaml
@@ -48,29 +48,17 @@ spec:
           preferredDuringSchedulingIgnoredDuringExecution:
 {{- include "kubernetes_maintenance_affinity" . }}
       {{- include "utils.proxysql.pod_settings" . | indent 6 }}
+      initContainers:
+      {{- tuple . (dict "service" (include "designate.service_dependencies" . ) "jobs" (include "migration_job_name" . )) | include "utils.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: designate-mdns
           image: {{ required ".Values.global.registry is missing" .Values.global.registry }}/loci-designate:{{ required ".Values.image_version_designate is missing" .Values.image_version_designate }}
           imagePullPolicy: IfNotPresent
           command:
-            - kubernetes-entrypoint
+            - /container.init/designate-mdns-start
           resources:
 {{ toYaml .Values.resources.mdns | indent 12 }}
           env:
-            - name: COMMAND
-              value: "/container.init/designate-mdns-start"
-            - name: NAMESPACE
-              value: {{ .Release.Namespace }}
-            - name: DEPENDENCY_JOBS
-              value: {{ include "migration_job_name" . }}
-            - name: DEPENDENCY_SERVICE
-{{- if .Values.percona_cluster.enabled }}
-              value: "{{ .Release.Name }}-percona-pxc,{{ .Release.Name }}-rabbitmq"
-{{- else if .Values.rabbitmq_cluster.enabled }}
-              value: "{{ .Release.Name }}-mariadb,{{ .Release.Name }}-rabbitmq-cluster"
-{{- else }}
-              value: "{{ .Release.Name }}-mariadb,{{ .Release.Name }}-rabbitmq"
-{{- end }}
             - name: DEBUG_CONTAINER
               value: "false"
             - name: NODE_NAME

diff --git a/openstack/designate/templates/migration-job.yaml b/openstack/designate/templates/migration-job.yaml
@@ -17,23 +17,15 @@ spec:
       {{- if $proxysql}}
       {{- include "utils.proxysql.job_pod_settings" . | indent 6 }}
       {{- end }}
+      initContainers:
+      {{- tuple . (dict "service" (include "designate.db_dependencies" . )) | include "utils.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: designate-migration
           image: {{ required ".Values.global.registry is missing" .Values.global.registry }}/loci-designate:{{ required ".Values.image_version_designate is missing" .Values.image_version_designate }}
           imagePullPolicy: IfNotPresent
           command:
-            - kubernetes-entrypoint
+            - /container.init/db-migrate
           env:
-            - name: COMMAND
-              value: "/container.init/db-migrate"
-            - name: NAMESPACE
-              value: {{ .Release.Namespace }}
-            - name: DEPENDENCY_SERVICE
-{{- if .Values.percona_cluster.enabled }}
-              value: {{ .Release.Name }}-percona-pxc
-{{- else }}
-              value: {{ .Release.Name }}-mariadb
-{{- end }}
           volumeMounts:
             - mountPath: /etc/designate
               name: designate-etc

diff --git a/openstack/designate/templates/producer-deployment.yaml b/openstack/designate/templates/producer-deployment.yaml
@@ -44,12 +44,14 @@ spec:
       serviceAccountName: {{ .Release.Name }}
 {{- end }}
       {{- include "utils.proxysql.pod_settings" . | indent 6 }}
+      initContainers:
+      {{- tuple . (dict "service" (include "designate.service_dependencies" . )) | include "utils.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: designate-producer
           image: {{ required ".Values.global.registry is missing" .Values.global.registry }}/loci-designate:{{ required ".Values.global.image_version_designate is missing" .Values.image_version_designate }}
           imagePullPolicy: IfNotPresent
           command:
-            - kubernetes-entrypoint
+            - /container.init/designate-producer-start
           resources:
              requests:
                memory: "128Mi"
@@ -58,18 +60,6 @@ spec:
                memory: "512Mi"
                cpu: "500m"
           env:
-            - name: COMMAND
-              value: "/container.init/designate-producer-start"
-            - name: NAMESPACE
-              value: {{ .Release.Namespace }}
-            - name: DEPENDENCY_SERVICE
-{{- if .Values.percona_cluster.enabled }}
-              value: "{{ .Release.Name }}-percona-pxc,{{ .Release.Name }}-rabbitmq"
-{{- else if .Values.rabbitmq_cluster.enabled }}
-              value: "{{ .Release.Name }}-mariadb,{{ .Release.Name }}-rabbitmq-cluster"
-{{- else }}
-              value: "{{ .Release.Name }}-mariadb,{{ .Release.Name }}-rabbitmq"
-{{- end }}
             - name: DEBUG_CONTAINER
               value: "false"
             {{- if .Values.sentry.enabled }}

diff --git a/openstack/designate/templates/sink-deployment.yaml b/openstack/designate/templates/sink-deployment.yaml
@@ -51,18 +51,13 @@ spec:
                 values:
                 - designate-sink
             topologyKey: "kubernetes.io/hostname"
-      {{- include "utils.proxysql.pod_settings" . | indent 6 }}
       containers:
         - name: designate-sink
           image: {{ required ".Values.global.registry is missing" .Values.global.registry }}/loci-designate:{{ required ".Values.global.image_version_designate is missing" .Values.image_version_designate }}
           imagePullPolicy: IfNotPresent
           command:
-            - kubernetes-entrypoint
+            - /container.init/designate-sink-start
           env:
-            - name: COMMAND
-              value: "/container.init/designate-sink-start"
-            - name: NAMESPACE
-              value: {{ .Release.Namespace }}
             - name: DEBUG_CONTAINER
               value: "false"
             {{- if .Values.sentry.enabled }}
@@ -77,7 +72,6 @@ spec:
               name: designate-etc
             - mountPath: /container.init
               name: container-init
-            {{- include "utils.proxysql.volume_mount" . | indent 12 }}
             {{- include "utils.trust_bundle.volume_mount" . | indent 12 }}
         {{- include "utils.proxysql.container" . | indent 8 }}
       volumes:
@@ -88,6 +82,5 @@ spec:
           configMap:
             name: designate-bin
             defaultMode: 0755
-        {{- include "utils.proxysql.volumes" . | indent 8 }}
         {{- include "utils.trust_bundle.volumes" . | indent 8 }}
 {{- end }}
diff --git a/openstack/designate/templates/worker-deployment.yaml b/openstack/designate/templates/worker-deployment.yaml
@@ -46,27 +46,19 @@ spec:
 {{- end }}
 {{ tuple . "designate" "worker" | include "kubernetes_pod_anti_affinity" | indent 6 }}
       {{- include "utils.proxysql.pod_settings" . | indent 6 }}
+      initContainers:
+      {{- tuple . (dict "service" (include "designate.rabbitmq_dependencies" . )) | include "utils.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: designate-worker
           image: {{ required ".Values.global.registry is missing" .Values.global.registry }}/loci-designate:{{ required ".Values.global.image_version_designate is missing" .Values.image_version_designate }}
           imagePullPolicy: IfNotPresent
           command:
-            - kubernetes-entrypoint
+            - /container.init/designate-worker-start
           resources:
 {{ toYaml .Values.resources.worker | indent 12 }}
           env:
-            - name: COMMAND
-              value: "/container.init/designate-worker-start"
-            - name: NAMESPACE
-              value: {{ .Release.Namespace }}
             - name: DEBUG_CONTAINER
               value: "false"
-            - name: DEPENDENCY_SERVICE
-{{- if .Values.rabbitmq_cluster.enabled }}
-              value: "{{ .Release.Name }}-rabbitmq-cluster"
-{{- else }}
-              value: "{{ .Release.Name }}-rabbitmq"
-{{- end }}
             - name: NODE_NAME
               valueFrom:
                 fieldRef: