grouped init containers (#441)

apache · Jan 26, 2024 · 4daf6d8 · 4daf6d8
1 parent 8d2d567
commit 4daf6d8
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 28 deletions.
diff --git a/charts/pulsar/templates/autorecovery-statefulset.yaml b/charts/pulsar/templates/autorecovery-statefulset.yaml
@@ -111,7 +111,7 @@ spec:
       - name: pulsar-bookkeeper-verify-clusterid
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.images.autorecovery "root" .) }}"
         imagePullPolicy: {{ .Values.images.autorecovery.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.verify_cluster_id | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
         - >

diff --git a/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml b/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml
@@ -48,7 +48,7 @@ spec:
       - name: wait-zookeeper-ready
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.images.bookie "root" .) }}"
         imagePullPolicy: {{ .Values.images.bookie.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.zookeeper_ready | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
           - >-

diff --git a/charts/pulsar/templates/bookkeeper-statefulset.yaml b/charts/pulsar/templates/bookkeeper-statefulset.yaml
@@ -112,7 +112,7 @@ spec:
       - name: pulsar-bookkeeper-verify-clusterid
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.images.bookie "root" .) }}"
         imagePullPolicy: {{ .Values.images.bookie.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.verify_cluster_id | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
         # only reformat bookie if bookkeeper is running without persistence

diff --git a/charts/pulsar/templates/broker-statefulset.yaml b/charts/pulsar/templates/broker-statefulset.yaml
@@ -110,7 +110,7 @@ spec:
       - name: wait-zookeeper-ready
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.images.broker "root" .) }}"
         imagePullPolicy: {{ .Values.images.broker.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.zookeeper_ready | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
           - >-
@@ -135,7 +135,7 @@ spec:
       - name: wait-bookkeeper-ready
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.images.broker "root" .) }}"
         imagePullPolicy: {{ .Values.images.broker.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.bookkeeper_ready | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
           - >

diff --git a/charts/pulsar/templates/proxy-statefulset.yaml b/charts/pulsar/templates/proxy-statefulset.yaml
@@ -110,7 +110,7 @@ spec:
       - name: wait-zookeeper-ready
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.images.proxy "root" .) }}"
         imagePullPolicy: {{ .Values.images.proxy.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.zookeeper_ready | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
           - >-
@@ -129,7 +129,7 @@ spec:
       - name: wait-broker-ready
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.images.proxy "root" .) }}"
         imagePullPolicy: {{ .Values.images.proxy.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.broker_ready | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
           - >-

diff --git a/charts/pulsar/templates/pulsar-cluster-initialize.yaml b/charts/pulsar/templates/pulsar-cluster-initialize.yaml
@@ -45,7 +45,7 @@ spec:
       - name: wait-cs-ready
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.pulsar_metadata.image "root" .) }}"
         imagePullPolicy: {{ .Values.pulsar_metadata.image.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.cs_ready | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
           - >-
@@ -56,7 +56,7 @@ spec:
       - name: wait-zookeeper-ready
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.pulsar_metadata.image "root" .) }}"
         imagePullPolicy: {{ .Values.pulsar_metadata.image.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.zookeeper_ready | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
           - >-
@@ -75,7 +75,7 @@ spec:
       - name: pulsar-bookkeeper-verify-clusterid
         image: "{{ template "pulsar.imageFullName" (dict "image" .Values.pulsar_metadata.image "root" .) }}"
         imagePullPolicy: {{ .Values.pulsar_metadata.image.pullPolicy }}
-        resources: {{ toYaml .Values.initContainer_resources.verify_cluster_id | nindent 10 }}
+        resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
         command: ["sh", "-c"]
         args:
         - >

diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
@@ -1342,24 +1342,8 @@ job:
 
 # This section is intended for cluster providers where all containers, including init containers,
 # need to provide the number of resources they are going to use.
-initContainer_resources:
-  zookeeper_ready:
-    requests:
-      memory: 256Mi
-      cpu: 0.1
-  cs_ready:
-    requests:
-      memory: 256Mi
-      cpu: 0.1
-  verify_cluster_id:
-    requests:
-      memory: 256Mi
-      cpu: 0.1
-  broker_ready:
-    requests:
-      memory: 256Mi
-      cpu: 0.1
-  bookkeeper_ready:
+initContainer:
+  resources:
     requests:
       memory: 256Mi
       cpu: 0.1