diff --git a/charts/pulsar/templates/autorecovery-statefulset.yaml b/charts/pulsar/templates/autorecovery-statefulset.yaml index 2aa4f138..a410d553 100644 --- 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 index d3ae809a..21ba2cca 100644 --- 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 index c5131981..d34269b3 100644 --- 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 index 18f70a67..9934fd6a 100644 --- 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 index 2335d69b..32092bde 100644 --- 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 index 67ed4ba1..b222453e 100644 --- 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 index c02d760d..9792f19a 100644 --- 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