Fix wrongly committed Helm Chart improvement (strimzi#5106)

* Revert "Feature/lables exclude in value (strimzi#5083)"

This reverts commit 936f847.

Signed-off-by: Jakub Scholz <[email protected]>

* Move Helm Chart changes to the right place

Signed-off-by: Jakub Scholz <[email protected]>

Author: scholzj

helm-charts/helm3/strimzi-kafka-operator/README.md

@@ -169,7 +169,6 @@ the documentation for more details.
 | `readinessProbe.periodSeconds`       | Readiness probe period in seconds         | 30                                                   |
 | `imageRegistryOverride`              | Override all image registry config        | `nil`                                                |
 | `imageRepositoryOverride`            | Override all image repository config      | `nil`                                                |
-| `labelsExclusionPattern`             | Override the exclude pattern for exclude some labels             | `""`  
 | `imageTagOverride`                   | Override all image tag config             | `nil`                                                |
 | `createGlobalResources`              | Allow creation of cluster-scoped resources| `true`                                               |
 | `tolerations`                        | Add tolerations to Operator Pod           | `[]`                                                 |

helm-charts/helm3/strimzi-kafka-operator/templates/060-Deployment-strimzi-cluster-operator.yaml

@@ -107,10 +107,6 @@ spec:
               value: {{ .Values.kubernetesServiceDnsDomain | quote }}{{ end }}
             - name: STRIMZI_FEATURE_GATES
               value: {{ .Values.featureGates | quote }}
-            {{- if .Values.labelsExclusionPattern }}
-            - name: STRIMZI_LABELS_EXCLUSION_PATTERN
-              value: {{ .Values.labelsExclusionPattern | quote }}
-            {{- end }}
           livenessProbe:
             httpGet:
               path: /healthy

helm-charts/helm3/strimzi-kafka-operator/values.yaml

@@ -144,5 +144,3 @@ imageRepositoryOverride: ""
 # Override the docker image tag used by all Strimzi images
 imageTagOverride: ""
 createGlobalResources: true
-# Override the exclude pattern for exclude some labels
-labelsExclusionPattern: ""

packaging/helm-charts/helm3/strimzi-kafka-operator/README.md

@@ -177,6 +177,7 @@ the documentation for more details.
 | `labels`                             | Add labels to Operator Pod                | `{}`                                                 |
 | `nodeSelector`                       | Add a node selector to Operator Pod       | `{}`                                                 |
 | `featureGates`                       | Feature Gates configuration               | ``                                                   |
+| `labelsExclusionPattern`             | Override the exclude pattern for exclude some labels             | `""`  
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

packaging/helm-charts/helm3/strimzi-kafka-operator/templates/060-Deployment-strimzi-cluster-operator.yaml

@@ -107,6 +107,10 @@ spec:
               value: {{ .Values.kubernetesServiceDnsDomain | quote }}{{ end }}
             - name: STRIMZI_FEATURE_GATES
               value: {{ .Values.featureGates | quote }}
+            {{- if .Values.labelsExclusionPattern }}
+            - name: STRIMZI_LABELS_EXCLUSION_PATTERN
+              value: {{ .Values.labelsExclusionPattern | quote }}
+            {{- end }}
           livenessProbe:
             httpGet:
               path: /healthy

packaging/helm-charts/helm3/strimzi-kafka-operator/values.yaml

@@ -144,3 +144,5 @@ imageRepositoryOverride: ""
 # Override the docker image tag used by all Strimzi images
 imageTagOverride: ""
 createGlobalResources: true
+# Override the exclude pattern for exclude some labels
+labelsExclusionPattern: ""