Skip to content

cluster-config/nginx: Allow nginx-controller to run on labelled nodes

Antoine R. Dumont requested to merge mr/restrict-nginx-controller into production

This only impacts the production cluster [1]

The other operating part that is required is to actually label all cluster nodes but banco with 'run-ingress-nginx=nginx'.

[1] helm diff [only prod is impacted] 
[cluster-configuration] Comparing changes between branches production and mr/restrict-nginx-controller...
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/local-cluster.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...
[cluster-configuration] Generate config in mr/restrict-nginx-controller branch for cluster-configuration/values/admin-rke2.yaml...
[cluster-configuration] Generate config in mr/restrict-nginx-controller branch for cluster-configuration/values/archive-production-rke2.yaml...
[cluster-configuration] Generate config in mr/restrict-nginx-controller branch for cluster-configuration/values/archive-staging-rke2.yaml...
[cluster-configuration] Generate config in mr/restrict-nginx-controller branch for cluster-configuration/values/gitlab-production.yaml...
[cluster-configuration] Generate config in mr/restrict-nginx-controller branch for cluster-configuration/values/gitlab-staging.yaml...
[cluster-configuration] Generate config in mr/restrict-nginx-controller branch for cluster-configuration/values/local-cluster.yaml...
[cluster-configuration] Generate config in mr/restrict-nginx-controller branch for cluster-configuration/values/rancher.yaml...
[cluster-configuration] Generate config in mr/restrict-nginx-controller 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 -------------

--- /tmp/swh-chart.cluster-configuration.c4lxvLxy/archive-production-rke2.yaml.before   2024-11-18 14:33:40.467866949 +0100
+++ /tmp/swh-chart.cluster-configuration.c4lxvLxy/archive-production-rke2.yaml.after    2024-11-18 14:33:42.403866934 +0100
@@ -177,20 +177,23 @@
               namespaceSelector:
                 any: true
           config:

             use-forwarded-headers: true
             worker-processes: 6
           resources:
             requests:
               cpu: 75m
               memory: 200Mi
+          nodeSelector:
+            kubernetes.io/os: linux
+            run-ingress-controller: nginx
   destination:
     server: https://rancher.euwest.azure.internal.softwareheritage.org/k8s/clusters/c-m-75xcg59s
     namespace: ingress-nginx
   syncPolicy:
     automated:
       prune: true
       selfHeal: true
       allowEmpty: false
 ---
 # Source: Argocd applications commonly used in to configure a SWH cluster/templates/metallb/metallb-application.yaml


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

No differences


------------- 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/local-cluster.yaml -------------

No differences


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

No differences


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

No differences

[2] https://docs.nginx.com/nginx-ingress-controller/installation/installing-nic/installation-with-helm/#run-multiple-nginx-ingress-controllers

Refs. swh/infra/sysadm-environment#5405 (closed)

Edited by Antoine R. Dumont

Merge request reports