From a8a0f153b04e099d14984fa0fd429abb53c9aad8 Mon Sep 17 00:00:00 2001 From: nginx-bot <68849795+nginx-bot@users.noreply.github.com> Date: Thu, 9 May 2024 01:55:10 -0700 Subject: [PATCH] Update NGINX Ingress Controller to 3.5.1 (#292) --- ...ngress-operator.clusterserviceversion.yaml | 2 +- .../samples/charts_v1alpha1_nginxingress.yaml | 2 +- docs/nginx-ingress-controller.md | 2 +- .../nginx-ingress-controller.yaml | 2 +- .../nginx-ingress-controller.yaml | 2 +- helm-charts/nginx-ingress/Chart.yaml | 8 +++---- helm-charts/nginx-ingress/README.md | 24 +++++++++---------- ...otectdos.f5.com_dosprotectedresources.yaml | 2 +- .../externaldns.nginx.org_dnsendpoints.yaml | 2 +- .../k8s.nginx.org_globalconfigurations.yaml | 2 +- .../crds/k8s.nginx.org_policies.yaml | 2 +- .../crds/k8s.nginx.org_transportservers.yaml | 2 +- .../k8s.nginx.org_virtualserverroutes.yaml | 2 +- .../crds/k8s.nginx.org_virtualservers.yaml | 2 +- helm-charts/nginx-ingress/values-icp.yaml | 2 +- helm-charts/nginx-ingress/values-plus.yaml | 2 +- helm-charts/nginx-ingress/values.schema.json | 10 ++++---- helm-charts/nginx-ingress/values.yaml | 2 +- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml index 14de97e7..d1a3fdbe 100644 --- a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml +++ b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml @@ -77,7 +77,7 @@ metadata: "image": { "pullPolicy": "IfNotPresent", "repository": "nginx/nginx-ingress", - "tag": "3.5.0-ubi" + "tag": "3.5.1-ubi" }, "includeYear": false, "ingressClass": { diff --git a/config/samples/charts_v1alpha1_nginxingress.yaml b/config/samples/charts_v1alpha1_nginxingress.yaml index 97fdc533..d7421051 100644 --- a/config/samples/charts_v1alpha1_nginxingress.yaml +++ b/config/samples/charts_v1alpha1_nginxingress.yaml @@ -35,7 +35,7 @@ spec: customPorts: [] image: repository: nginx/nginx-ingress - tag: "3.5.0-ubi" + tag: "3.5.1-ubi" # digest: "sha256:CHANGEME" pullPolicy: IfNotPresent lifecycle: {} diff --git a/docs/nginx-ingress-controller.md b/docs/nginx-ingress-controller.md index 019f0c60..aada2388 100644 --- a/docs/nginx-ingress-controller.md +++ b/docs/nginx-ingress-controller.md @@ -47,7 +47,7 @@ spec: customPorts: [] image: repository: nginx/nginx-ingress - tag: "3.5.0-ubi" + tag: "3.5.1-ubi" # digest: "sha256:CHANGEME" pullPolicy: IfNotPresent lifecycle: {} diff --git a/examples/deployment-oss-min/nginx-ingress-controller.yaml b/examples/deployment-oss-min/nginx-ingress-controller.yaml index 54f3b937..e02bc9bc 100644 --- a/examples/deployment-oss-min/nginx-ingress-controller.yaml +++ b/examples/deployment-oss-min/nginx-ingress-controller.yaml @@ -11,7 +11,7 @@ spec: image: pullPolicy: IfNotPresent repository: nginx/nginx-ingress - tag: 3.5.0-ubi + tag: 3.5.1-ubi ingressClass: name: nginx kind: deployment diff --git a/examples/deployment-plus-min/nginx-ingress-controller.yaml b/examples/deployment-plus-min/nginx-ingress-controller.yaml index d96d495d..0cbdfea4 100644 --- a/examples/deployment-plus-min/nginx-ingress-controller.yaml +++ b/examples/deployment-plus-min/nginx-ingress-controller.yaml @@ -11,7 +11,7 @@ spec: image: pullPolicy: IfNotPresent repository: nginx/nginx-ingress - tag: 3.5.0-ubi + tag: 3.5.1-ubi ingressClass: name: nginx kind: deployment diff --git a/helm-charts/nginx-ingress/Chart.yaml b/helm-charts/nginx-ingress/Chart.yaml index cd7047b4..050aa5ce 100644 --- a/helm-charts/nginx-ingress/Chart.yaml +++ b/helm-charts/nginx-ingress/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 3.5.0 +appVersion: 3.5.1 description: NGINX Ingress Controller home: https://github.com/nginxinc/kubernetes-ingress -icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.5.0/charts/nginx-ingress/chart-icon.png +icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.5.1/charts/nginx-ingress/chart-icon.png keywords: - ingress - nginx @@ -12,6 +12,6 @@ maintainers: name: nginxinc name: nginx-ingress sources: -- https://github.com/nginxinc/kubernetes-ingress/tree/v3.5.0/charts/nginx-ingress +- https://github.com/nginxinc/kubernetes-ingress/tree/v3.5.1/charts/nginx-ingress type: application -version: 1.2.0 +version: 1.2.1 diff --git a/helm-charts/nginx-ingress/README.md b/helm-charts/nginx-ingress/README.md index 15328274..9187dec5 100644 --- a/helm-charts/nginx-ingress/README.md +++ b/helm-charts/nginx-ingress/README.md @@ -2,7 +2,7 @@ ## Introduction -This chart deploys NGINX Ingress Controller in your Kubernetes cluster. +This chart deploys the NGINX Ingress Controller in your Kubernetes cluster. ## Prerequisites @@ -51,10 +51,10 @@ kubectl apply -f crds/ Alternatively, CRDs can be upgraded without pulling the chart by running: ```console -kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.5.0/deploy/crds.yaml +kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.5.1/deploy/crds.yaml ``` -In the above command, `v3.5.0` represents the version of NGINX Ingress Controller release rather than the Helm chart version. +In the above command, `v3.5.1` represents the version of NGINX Ingress Controller release rather than the Helm chart version. > **Note** > @@ -87,14 +87,14 @@ To install the chart with the release name my-release (my-release is the name th For NGINX: ```console -helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.1.3 +helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.2.1 ``` For NGINX Plus: (assuming you have pushed the Ingress Controller image `nginx-plus-ingress` to your private registry `myregistry.example.com`) ```console -helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.1.3 --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true +helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.2.1 --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true ``` This will install the latest `edge` version of the Ingress Controller from GitHub Container Registry. If you prefer to @@ -109,7 +109,7 @@ CRDs](#upgrading-the-crds). To upgrade the release `my-release`: ```console -helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.1.3 +helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.2.1 ``` ### Uninstalling the Chart @@ -150,7 +150,7 @@ upgrading/deleting the CRDs. 1. Pull the chart sources: ```console - helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 1.1.3 + helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 1.2.1 ``` 2. Change your working directory to nginx-ingress: @@ -236,7 +236,7 @@ The steps you should follow depend on the Helm release name: Selector: app=nginx-ingress-nginx-ingress ``` -2. Checkout the latest available tag using `git checkout v3.5.0` +2. Checkout the latest available tag using `git checkout v3.5.1` 3. Navigate to `/kubernates-ingress/charts/nginx-ingress` @@ -288,7 +288,7 @@ reviewing its events: Selector: app=-nginx-ingress ``` -2. Checkout the latest available tag using `git checkout v3.5.0` +2. Checkout the latest available tag using `git checkout v3.5.1` 3. Navigate to `/kubernates-ingress/charts/nginx-ingress` @@ -355,7 +355,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont |`controller.logLevel` | The log level of the Ingress Controller. | 1 | |`controller.image.digest` | The image digest of the Ingress Controller. | None | |`controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress | -|`controller.image.tag` | The tag of the Ingress Controller image. | 3.5.0 | +|`controller.image.tag` | The tag of the Ingress Controller image. | 3.5.1 | |`controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent | |`controller.lifecycle` | The lifecycle of the Ingress Controller pods. | {} | |`controller.customConfigMap` | The name of the custom ConfigMap used by the Ingress Controller. If set, then the default config is ignored. | "" | @@ -386,7 +386,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont |`controller.initContainerResources` | The resources of the init container which is used when `readOnlyRootFilesystem` is enabled by either setting `controller.securityContext.readOnlyRootFilesystem` or `controller.readOnlyRootFilesystem`to `true`. | requests: cpu=100m,memory=128Mi | |`controller.replicaCount` | The number of replicas of the Ingress Controller deployment. | 1 | |`controller.ingressClass.name` | A class of the Ingress Controller. An IngressClass resource with the name equal to the class must be deployed. Otherwise, the Ingress Controller will fail to start. The Ingress Controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. The Ingress Controller processes all the VirtualServer/VirtualServerRoute/TransportServer resources that do not have the "ingressClassName" field for all versions of Kubernetes. | nginx | -|`controller.ingressClass.create` | Creates a new IngressClass object with the name `controller.ingressClass.name`. Set to `false` to use an existing ingressClass created using `kubectl` with the same name. If you use `helm upgrade`, do not change the values from the previous release as helm will delete IngressClass objects managed by helm. If you are upgrading from a release earlier than 3.5.0, do not set the value to false. | true | +|`controller.ingressClass.create` | Creates a new IngressClass object with the name `controller.ingressClass.name`. Set to `false` to use an existing ingressClass created using `kubectl` with the same name. If you use `helm upgrade`, do not change the values from the previous release as helm will delete IngressClass objects managed by helm. If you are upgrading from a release earlier than 3.5.1, do not set the value to false. | true | |`controller.ingressClass.setAsDefaultIngress` | New Ingresses without an `"ingressClassName"` field specified will be assigned the class specified in `controller.ingressClass.name`. Requires `controller.ingressClass.create`. | false | |`controller.watchNamespace` | Comma separated list of namespaces the Ingress Controller should watch for resources. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespaceLabel`. Please note that if configuring multiple namespaces using the Helm cli `--set` option, the string needs to wrapped in double quotes and the commas escaped using a backslash - e.g. `--set controller.watchNamespace="default\,nginx-ingress"`. | "" | |`controller.watchNamespaceLabel` | Configures the Ingress Controller to watch only those namespaces with label foo=bar. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespace`. | "" | @@ -471,7 +471,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont |`controller.readOnlyRootFilesystem` | Configure root filesystem as read-only and add volumes for temporary data. Three major releases after 3.5.x this argument will be moved permanently to the `controller.securityContext` section. | false | |`controller.enableSSLDynamicReload` | Enable lazy loading for SSL Certificates. | true | |`controller.telemetryReporting.enable` | Enable telemetry reporting. | true | -|`controller.enableDynamicWeightChangesReload` | Enable weight changes without reloading the NGINX configuration. May require increasing map_hash_bucket_size, map_hash_max_size, variable_hash_bucket_size, and variable_hash_max_size in the [ConfigMap](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/) if there are many two-way splits. Requires `controller.nginxplus` | false | +|`controller.enableWeightChangesDynamicReload` | Enable weight changes without reloading the NGINX configuration. May require increasing `map_hash_bucket_size`, `map_hash_max_size`, `variable_hash_bucket_size`, and `variable_hash_max_size` in the [ConfigMap](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/) if there are many two-way splits. Requires `controller.nginxplus` | false | |`rbac.create` | Configures RBAC. | true | |`prometheus.create` | Expose NGINX or NGINX Plus metrics in the Prometheus format. | true | |`prometheus.port` | Configures the port to scrape the metrics. | 9113 | diff --git a/helm-charts/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml b/helm-charts/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml index c95fe765..b7019df4 100644 --- a/helm-charts/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml +++ b/helm-charts/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: dosprotectedresources.appprotectdos.f5.com spec: group: appprotectdos.f5.com diff --git a/helm-charts/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml b/helm-charts/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml index 33d91c91..0275738a 100644 --- a/helm-charts/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml +++ b/helm-charts/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: dnsendpoints.externaldns.nginx.org spec: group: externaldns.nginx.org diff --git a/helm-charts/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml b/helm-charts/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml index 63d9195c..51fce137 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: globalconfigurations.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/helm-charts/nginx-ingress/crds/k8s.nginx.org_policies.yaml b/helm-charts/nginx-ingress/crds/k8s.nginx.org_policies.yaml index e31e43c6..de6bef32 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_policies.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_policies.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: policies.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/helm-charts/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml b/helm-charts/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml index 1f272a2e..64ac70e9 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: transportservers.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml b/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml index b51167a7..7fde72e8 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: virtualserverroutes.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml b/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml index 74e76245..1c28ddec 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: virtualservers.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/helm-charts/nginx-ingress/values-icp.yaml b/helm-charts/nginx-ingress/values-icp.yaml index 6c76ae95..a89e0e55 100644 --- a/helm-charts/nginx-ingress/values-icp.yaml +++ b/helm-charts/nginx-ingress/values-icp.yaml @@ -4,7 +4,7 @@ controller: nginxplus: true image: repository: mycluster.icp:8500/kube-system/nginx-plus-ingress - tag: "3.5.0" + tag: "3.5.1" nodeSelector: beta.kubernetes.io/arch: "amd64" proxy: true diff --git a/helm-charts/nginx-ingress/values-plus.yaml b/helm-charts/nginx-ingress/values-plus.yaml index b3304bb9..5bb25e01 100644 --- a/helm-charts/nginx-ingress/values-plus.yaml +++ b/helm-charts/nginx-ingress/values-plus.yaml @@ -3,4 +3,4 @@ controller: nginxplus: true image: repository: nginx-plus-ingress - tag: "3.5.0" + tag: "3.5.1" diff --git a/helm-charts/nginx-ingress/values.schema.json b/helm-charts/nginx-ingress/values.schema.json index 1f25a6b8..ce342afe 100644 --- a/helm-charts/nginx-ingress/values.schema.json +++ b/helm-charts/nginx-ingress/values.schema.json @@ -336,10 +336,10 @@ }, "tag": { "type": "string", - "default": "3.5.0", + "default": "3.5.1", "title": "The tag of the Ingress Controller image", "examples": [ - "3.5.0" + "3.5.1" ] }, "digest": { @@ -376,7 +376,7 @@ "examples": [ { "repository": "nginx/nginx-ingress", - "tag": "3.5.0", + "tag": "3.5.1", "pullPolicy": "IfNotPresent" } ] @@ -1466,7 +1466,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "3.5.0", + "tag": "3.5.1", "digest": "", "pullPolicy": "IfNotPresent" }, @@ -2007,7 +2007,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "3.5.0", + "tag": "3.5.1", "digest": "", "pullPolicy": "IfNotPresent" }, diff --git a/helm-charts/nginx-ingress/values.yaml b/helm-charts/nginx-ingress/values.yaml index bbe95d2c..dbc289d3 100644 --- a/helm-charts/nginx-ingress/values.yaml +++ b/helm-charts/nginx-ingress/values.yaml @@ -78,7 +78,7 @@ controller: repository: nginx/nginx-ingress ## The tag of the Ingress Controller image. If not specified the appVersion from Chart.yaml is used as a tag. - # tag: "3.5.0" + # tag: "3.5.1" ## The digest of the Ingress Controller image. ## If digest is specified it has precedence over tag and will be used instead # digest: "sha256:CHANGEME"