Skip to content

Allow ingress-nginx snippet annotations

Guillaume Samson requested to merge update_ccf_ingress_template into production

Related to swh/infra/sysadm-environment#5165 (closed)

The first commit update the ingress-nginx template to reflect the values modification (humm no comment on my previous day merge request).
If allowSnippetAnnotations is defined to true, it will be deployed.
The second commit define allowSnippetAnnotations to true in staging values.

Helm diff 
./helm-diff.sh cluster-configuration
[cluster-configuration] Comparing changes between branches production and update_ccf_ingress_template...
Your branch is up to date with 'origin/production'.
[cluster-configuration] Generate config in production branch for cluster-configuration/values/admin-rke2.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/archive-production-rke2.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/archive-staging-rke2.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/gitlab-production.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/gitlab-staging.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/rancher.yaml...
[cluster-configuration] Generate config in production branch for cluster-configuration/values/test-staging-rke2.yaml...
Your branch is up to date with 'origin/update_ccf_ingress_template'.
[cluster-configuration] Generate config in update_ccf_ingress_template branch for cluster-configuration/values/admin-rke2.yaml...
[cluster-configuration] Generate config in update_ccf_ingress_template branch for cluster-configuration/values/archive-production-rke2.yaml...
[cluster-configuration] Generate config in update_ccf_ingress_template branch for cluster-configuration/values/archive-staging-rke2.yaml...
[cluster-configuration] Generate config in update_ccf_ingress_template branch for cluster-configuration/values/gitlab-production.yaml...
[cluster-configuration] Generate config in update_ccf_ingress_template branch for cluster-configuration/values/gitlab-staging.yaml...
[cluster-configuration] Generate config in update_ccf_ingress_template branch for cluster-configuration/values/rancher.yaml...
[cluster-configuration] Generate config in update_ccf_ingress_template branch for cluster-configuration/values/test-staging-rke2.yaml...


------------- diff for cluster-configuration/values/admin-rke2.yaml -------------

No differences


------------- diff for cluster-configuration/values/archive-production-rke2.yaml -------------

No differences


------------- diff for cluster-configuration/values/archive-staging-rke2.yaml -------------

--- /tmp/swh-chart.cluster-configuration.ciEkq7nA/archive-staging-rke2.yaml.before	2023-12-07 15:37:48.095038778 +0100
+++ /tmp/swh-chart.cluster-configuration.ciEkq7nA/archive-staging-rke2.yaml.after	2023-12-07 15:37:48.347043391 +0100
@@ -155,20 +155,21 @@
     targetRevision: 4.4.0
     helm:
       # must match the application name (https://github.com/argoproj/argo-cd/issues/2871)
       # if not, some selectors like for the ServiceMonitor will not found the services
       releaseName: archive-staging-rke2-ingress-nginx
       values: |
         revisionHistoryLimit: 3
         controller:
           replicaCount: 2
           watchIngressWithoutClass: true
+          allowSnippetAnnotations: true
           service:
             externalTrafficPolicy: Local
             annotations:
               metallb.universe.tf/allow-shared-ip: clusterIP
           ingressClassResource:
             name: "nginx"
             default: true
           metrics:
             enabled: true
             serviceMonitor:


------------- diff for cluster-configuration/values/gitlab-production.yaml -------------

No differences


------------- diff for cluster-configuration/values/gitlab-staging.yaml -------------

No differences


------------- diff for cluster-configuration/values/rancher.yaml -------------

No differences


------------- diff for cluster-configuration/values/test-staging-rke2.yaml -------------

--- /tmp/swh-chart.cluster-configuration.ciEkq7nA/test-staging-rke2.yaml.before	2023-12-07 15:37:48.231041268 +0100
+++ /tmp/swh-chart.cluster-configuration.ciEkq7nA/test-staging-rke2.yaml.after	2023-12-07 15:37:48.495046101 +0100
@@ -151,20 +151,21 @@
     targetRevision: 4.4.0
     helm:
       # must match the application name (https://github.com/argoproj/argo-cd/issues/2871)
       # if not, some selectors like for the ServiceMonitor will not found the services
       releaseName: test-staging-rke2-ingress-nginx
       values: |
         revisionHistoryLimit: 3
         controller:
           replicaCount: 2
           watchIngressWithoutClass: true
+          allowSnippetAnnotations: true
           service:
             externalTrafficPolicy: Local
             annotations:
               metallb.universe.tf/allow-shared-ip: clusterIP
           ingressClassResource:
             name: "nginx"
             default: true
           metrics:
             enabled: true
             serviceMonitor:

Merge request reports