patch nginx-ingress chart: disable CM generation

scality · Jan 9, 2025 · b0e842d · b0e842d
1 parent 8f96f50
commit b0e842d
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 2 deletions.
diff --git a/catalog-source/catalog/nginx-operator/bundles/v4.11.3.yaml b/catalog-source/catalog/nginx-operator/bundles/v4.11.3.yaml
diff --git a/nginx-operator/BUMPING.md b/nginx-operator/BUMPING.md
@@ -10,8 +10,16 @@ rm -rf helm-charts/ingress-nginx
 helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
 helm repo update
 helm fetch -d helm-charts --untar https://kubernetes.github.io/ingress-nginx/ingress-nginx --version $VERSION
+git apply remove_configmap.patch
 sed -i "s/^VERSION.*/VERSION ?= $VERSION/" Makefile
 make bundle
 ```
 
 also change `NGINX_OPERATOR_VERSION` in `buildchain/buildchain/versions.py`.
+
+### About the patch
+
+The ConfigMaps are managed by salt. Previously, they were automatically deleted from the manifest
+after generating the chart.
+If we keep them, they interfere with the salt-generated configmap.
+We don't have a way to disable the configmap generation, so we patch it in the chart.
diff --git a/nginx-operator/bundle/manifests/nginx-operator.clusterserviceversion.yaml b/nginx-operator/bundle/manifests/nginx-operator.clusterserviceversion.yaml
@@ -506,7 +506,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2025-01-07T17:56:14Z"
+    createdAt: "2025-01-09T10:08:53Z"
     operators.operatorframework.io/builder: operator-sdk-v1.38.0
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
   name: nginx-operator.v4.11.3

diff --git a/nginx-operator/helm-charts/ingress-nginx/templates/controller-configmap.yaml b/nginx-operator/helm-charts/ingress-nginx/templates/controller-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.controller.generateConfigMap -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -26,3 +27,4 @@ data:
 {{- range $key, $value := .Values.controller.config }}
   {{- $key | nindent 2 }}: {{ tpl (toString $value) $ | quote }}
 {{- end }}
+{{- end }}
diff --git a/nginx-operator/helm-charts/ingress-nginx/values.yaml b/nginx-operator/helm-charts/ingress-nginx/values.yaml
@@ -48,6 +48,8 @@ controller:
   # -- Global configuration passed to the ConfigMap consumed by the controller. Values may contain Helm templates.
   # Ref.: https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/
   config: {}
+  # -- whether to generate the configmap object or not
+  generateConfigMap: false
   # -- Annotations to be added to the controller config configuration configmap.
   configAnnotations: {}
   # -- Will add custom headers before sending traffic to backends according to https://github.com/kubernetes/ingress-nginx/tree/main/docs/examples/customization/custom-headers

diff --git a/nginx-operator/remove_configmap.patch b/nginx-operator/remove_configmap.patch
@@ -0,0 +1,27 @@
+diff --git a/nginx-operator/helm-charts/ingress-nginx/templates/controller-configmap.yaml b/nginx-operator/helm-charts/ingress-nginx/templates/controller-configmap.yaml
+index 22080d115..e24a96742 100644
+--- a/nginx-operator/helm-charts/ingress-nginx/templates/controller-configmap.yaml
++++ b/nginx-operator/helm-charts/ingress-nginx/templates/controller-configmap.yaml
+@@ -1,3 +1,4 @@
++{{- if .Values.controller.generateConfigMap -}}
+ apiVersion: v1
+ kind: ConfigMap
+ metadata:
+@@ -26,3 +27,4 @@ data:
+ {{- range $key, $value := .Values.controller.config }}
+   {{- $key | nindent 2 }}: {{ tpl (toString $value) $ | quote }}
+ {{- end }}
++{{- end }}
+diff --git a/nginx-operator/helm-charts/ingress-nginx/values.yaml b/nginx-operator/helm-charts/ingress-nginx/values.yaml
+index f42a6821d..6c44a3a92 100644
+--- a/nginx-operator/helm-charts/ingress-nginx/values.yaml
++++ b/nginx-operator/helm-charts/ingress-nginx/values.yaml
+@@ -48,6 +48,8 @@ controller:
+   # -- Global configuration passed to the ConfigMap consumed by the controller. Values may contain Helm templates.
+   # Ref.: https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/
+   config: {}
++  # -- whether to generate the configmap object or not
++  generateConfigMap: false
+   # -- Annotations to be added to the controller config configuration configmap.
+   configAnnotations: {}
+   # -- Will add custom headers before sending traffic to backends according to https://github.com/kubernetes/ingress-nginx/tree/main/docs/examples/customization/custom-headers