Bump ingress-nginx to 3.13.0

CHANGELOG.md

@@ -30,6 +30,8 @@
   - prometheus-operator from v0.38.1 to v0.43.2
   (PR [#2948](https://github.com/scality/metalk8s/pull/2948))
 
+- Bump `ingress-nginx` chart to 3.13.0 (PR[#2961](https://github.com/scality/metalk8s/pull/2961))
+
 ### Bug fixes
 
 - [#2908](https://github.com/scality/metalk8s/issues/2908) - Make upgrade script

buildchain/buildchain/constants.py

@@ -23,7 +23,7 @@
 DOCKER_REPOSITORY               : str = 'docker.io/library'
 GOOGLE_REPOSITORY               : str = 'k8s.gcr.io'
 GRAFANA_REPOSITORY              : str = 'docker.io/grafana'
-INGRESS_REPOSITORY              : str = 'quay.io/kubernetes-ingress-controller'
+INGRESS_REPOSITORY              : str = 'k8s.gcr.io/ingress-nginx'
 JIMMIDYSON_REPOSITORY           : str = 'docker.io/jimmidyson'
 KIWIGRID_REPOSITORY             : str = 'docker.io/kiwigrid'
 PROMETHEUS_ADAPTER_REPOSITORY   : str = 'docker.io/directxman12'

buildchain/buildchain/image.py

@@ -211,6 +211,7 @@ def _operator_image(name: str, **kwargs: Any) -> targets.OperatorImage:
 REMOTE_NAMES : Dict[str, str] = {
     'calico-node': 'node',
     'calico-kube-controllers': 'kube-controllers',
+    'nginx-ingress-controller': 'controller',
     'nginx-ingress-defaultbackend-amd64': 'defaultbackend-amd64',
 }
 

buildchain/buildchain/salt_tree.py

@@ -433,6 +433,7 @@ def _get_parts(self) -> Iterator[str]:
     Path('salt/metalk8s/addons/nginx-ingress/deployed/chart.sls'),
     Path('salt/metalk8s/addons/nginx-ingress/deployed/namespace.sls'),
     Path('salt/metalk8s/addons/nginx-ingress/deployed/tls-secret.sls'),
+    Path('salt/metalk8s/addons/nginx-ingress/post-upgrade-downgrade.sls'),
 
     Path('salt/metalk8s/addons/nginx-ingress-control-plane/certs/init.sls'),
     Path('salt/metalk8s/addons/nginx-ingress-control-plane/certs/server.sls'),
@@ -442,6 +443,8 @@ def _get_parts(self) -> Iterator[str]:
          'tls-secret.sls'),
     Path('salt/metalk8s/addons/nginx-ingress-control-plane/',
          'control-plane-ip.sls'),
+    Path('salt/metalk8s/addons/nginx-ingress-control-plane/',
+         'post-upgrade-downgrade.sls'),
 
     Path('salt/metalk8s/container-engine/containerd/configured.sls'),
     Path('salt/metalk8s/container-engine/containerd/files/50-metalk8s.conf.j2'),

buildchain/buildchain/versions.py

@@ -151,8 +151,8 @@ def _version_prefix(version: str, prefix: str = 'v') -> str:
     ),
     Image(
         name='nginx-ingress-controller',
-        version='0.30.0',
-        digest='sha256:b312c91d0de688a21075078982b5e3a48b13b46eda4df743317d3059fc3ca0d9',
+        version='v0.41.2',
+        digest='sha256:1f4f402b9c14f3ae92b11ada1dfe9893a88f0faeb0b2f4b903e2c67a0c3bf0de',
     ),
     Image(
         name='nginx-ingress-defaultbackend-amd64',

charts/nginx-ingress-control-plane.yaml → charts/ingress-nginx-control-plane.yaml

@@ -1,5 +1,6 @@
 controller:
   image:
+    digest: null
     repository: '{%- endraw -%}{{ build_image_name(\"nginx-ingress-controller\", False) }}{%- raw -%}'
 
   defaultBackendService: 'metalk8s-ingress/nginx-ingress-default-backend'
@@ -8,6 +9,9 @@ controller:
 
   ingressClass: nginx-control-plane
 
+  admissionWebhooks:
+    enabled: false
+
   kind: DaemonSet
 
   updateStrategy:

charts/nginx-ingress.yaml → charts/ingress-nginx.yaml

@@ -1,9 +1,13 @@
 controller:
   image:
+    digest: null
     repository: '{%- endraw -%}{{ build_image_name(\"nginx-ingress-controller\", False) }}{%- raw -%}'
 
-  daemonset:
-    useHostPort: true
+  hostPort:
+    enabled: true
+
+  admissionWebhooks:
+    enabled: false
 
   kind: DaemonSet
 
@@ -22,6 +26,8 @@ controller:
     default-ssl-certificate: "metalk8s-ingress/ingress-workload-plane-default-certificate"
 
 defaultBackend:
+  enabled: true
+
   image:
     repository: '{%- endraw -%}{{ build_image_name(\"nginx-ingress-defaultbackend-amd64\", False) }}{%- raw -%}'
 

charts/nginx-ingress/.helmignore → charts/ingress-nginx/.helmignore

@@ -19,3 +19,4 @@
 .project
 .idea/
 *.tmproj
+.vscode/

charts/ingress-nginx/CHANGELOG.md

@@ -0,0 +1,150 @@
+# Changelog
+
+This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
+
+### Unreleased
+
+### 3.13.0
+
+- [X] [#6544](https://github.com/kubernetes/ingress-nginx/pull/6544) Fix default backend HPA name variable
+
+### 3.12.0
+
+- [X] [#6514](https://github.com/kubernetes/ingress-nginx/pull/6514) Remove helm2 support and update docs
+
+### 3.11.1
+
+- [X] [#6505](https://github.com/kubernetes/ingress-nginx/pull/6505) Reorder HPA resource list to work with GitOps tooling
+
+### 3.11.0
+
+- Support Keda Autoscaling
+
+### 3.10.1
+
+- Fix regression introduced in 0.41.0 with external authentication
+
+### 3.10.0
+
+- Fix routing regression introduced in 0.41.0 with PathType Exact
+
+### 3.9.0
+
+- [X] [#6423](https://github.com/kubernetes/ingress-nginx/pull/6423) Add Default backend HPA autoscaling
+
+### 3.8.0
+
+- [X] [#6395](https://github.com/kubernetes/ingress-nginx/pull/6395) Update jettech/kube-webhook-certgen image
+- [X] [#6377](https://github.com/kubernetes/ingress-nginx/pull/6377) Added loadBalancerSourceRanges for internal lbs
+- [X] [#6356](https://github.com/kubernetes/ingress-nginx/pull/6356) Add securitycontext settings on defaultbackend
+- [X] [#6401](https://github.com/kubernetes/ingress-nginx/pull/6401) Fix controller service annotations
+- [X] [#6403](https://github.com/kubernetes/ingress-nginx/pull/6403) Initial helm chart changelog
+
+### 3.7.1
+
+- [X] [#6326](https://github.com/kubernetes/ingress-nginx/pull/6326) Fix liveness and readiness probe path in daemonset chart
+
+### 3.7.0
+
+- [X] [#6316](https://github.com/kubernetes/ingress-nginx/pull/6316) Numerals in podAnnotations in quotes [#6315](https://github.com/kubernetes/ingress-nginx/issues/6315)
+
+### 3.6.0
+
+- [X] [#6305](https://github.com/kubernetes/ingress-nginx/pull/6305) Add default linux nodeSelector
+
+### 3.5.1
+
+- [X] [#6299](https://github.com/kubernetes/ingress-nginx/pull/6299) Fix helm chart release
+
+### 3.5.0
+
+- [X] [#6260](https://github.com/kubernetes/ingress-nginx/pull/6260) Allow Helm Chart to customize admission webhook's annotations, timeoutSeconds, namespaceSelector, objectSelector and cert files locations
+
+### 3.4.0
+
+- [X] [#6268](https://github.com/kubernetes/ingress-nginx/pull/6268) Update to 0.40.2 in helm chart #6288
+
+### 3.3.1
+
+- [X] [#6259](https://github.com/kubernetes/ingress-nginx/pull/6259) Release helm chart
+- [X] [#6258](https://github.com/kubernetes/ingress-nginx/pull/6258) Fix chart markdown link
+- [X] [#6253](https://github.com/kubernetes/ingress-nginx/pull/6253) Release v0.40.0
+
+### 3.3.1
+
+- [X] [#6233](https://github.com/kubernetes/ingress-nginx/pull/6233) Add admission controller e2e test
+
+### 3.3.0
+
+- [X] [#6203](https://github.com/kubernetes/ingress-nginx/pull/6203) Refactor parsing of key values
+- [X] [#6162](https://github.com/kubernetes/ingress-nginx/pull/6162) Add helm chart options to expose metrics service as NodePort
+- [X] [#6180](https://github.com/kubernetes/ingress-nginx/pull/6180) Fix helm chart admissionReviewVersions regression
+- [X] [#6169](https://github.com/kubernetes/ingress-nginx/pull/6169) Fix Typo in example prometheus rules
+
+### 3.0.0
+
+- [X] [#6167](https://github.com/kubernetes/ingress-nginx/pull/6167) Update chart requirements
+
+### 2.16.0
+
+- [X] [#6154](https://github.com/kubernetes/ingress-nginx/pull/6154) add `topologySpreadConstraint` to controller
+
+### 2.15.0
+
+- [X] [#6087](https://github.com/kubernetes/ingress-nginx/pull/6087) Adding parameter for externalTrafficPolicy in internal controller service spec
+
+### 2.14.0
+
+- [X] [#6104](https://github.com/kubernetes/ingress-nginx/pull/6104) Misc fixes for nginx-ingress chart for better keel and prometheus-operator integration
+
+### 2.13.0
+
+- [X] [#6093](https://github.com/kubernetes/ingress-nginx/pull/6093) Release v0.35.0
+
+### 2.13.0
+
+- [X] [#6093](https://github.com/kubernetes/ingress-nginx/pull/6093) Release v0.35.0
+- [X] [#6080](https://github.com/kubernetes/ingress-nginx/pull/6080) Switch images to k8s.gcr.io after Vanity Domain Flip
+
+### 2.12.1
+
+- [X] [#6075](https://github.com/kubernetes/ingress-nginx/pull/6075) Sync helm chart affinity examples
+
+### 2.12.0
+
+- [X] [#6039](https://github.com/kubernetes/ingress-nginx/pull/6039) Add configurable serviceMonitor metricRelabelling and targetLabels
+- [X] [#6044](https://github.com/kubernetes/ingress-nginx/pull/6044) Fix YAML linting
+
+### 2.11.3
+
+- [X] [#6038](https://github.com/kubernetes/ingress-nginx/pull/6038) Bump chart version PATCH
+
+### 2.11.2
+
+- [X] [#5951](https://github.com/kubernetes/ingress-nginx/pull/5951) Bump chart patch version
+
+### 2.11.1
+
+- [X] [#5900](https://github.com/kubernetes/ingress-nginx/pull/5900) Release helm chart for v0.34.1
+
+### 2.11.0
+
+- [X] [#5879](https://github.com/kubernetes/ingress-nginx/pull/5879) Update helm chart for v0.34.0
+- [X] [#5671](https://github.com/kubernetes/ingress-nginx/pull/5671) Make liveness probe more fault tolerant than readiness probe
+
+### 2.10.0
+
+- [X] [#5843](https://github.com/kubernetes/ingress-nginx/pull/5843) Update jettech/kube-webhook-certgen image
+
+### 2.9.1
+
+- [X] [#5823](https://github.com/kubernetes/ingress-nginx/pull/5823) Add quoting to sysctls because numeric values need to be presented as strings (#5823)
+
+### 2.9.0
+
+- [X] [#5795](https://github.com/kubernetes/ingress-nginx/pull/5795) Use fully qualified images to avoid cri-o issues
+
+
+### TODO
+
+Keep building the changelog using *git log charts* checking the tag

charts/ingress-nginx/Chart.yaml

@@ -0,0 +1,19 @@
+annotations:
+  artifacthub.io/changes: |
+    - Fix default backend HPA name variable
+apiVersion: v2
+appVersion: 0.41.2
+description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
+home: https://github.com/kubernetes/ingress-nginx
+icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
+keywords:
+- ingress
+- nginx
+kubeVersion: '>=1.16.0-0'
+maintainers:
+- name: ChiefAlexander
+name: ingress-nginx
+sources:
+- https://github.com/kubernetes/ingress-nginx
+type: application
+version: 3.13.0

charts/ingress-nginx/OWNERS

@@ -0,0 +1,5 @@
+approvers:
+  - ChiefAlexander
+
+reviewers:
+  - ChiefAlexander