From 825b200705eebef50ff0c0c9b794c09745d0648d Mon Sep 17 00:00:00 2001 From: nginx-bot Date: Fri, 18 Aug 2023 19:05:57 +0000 Subject: [PATCH] Update NGINX Ingress Controller to 3.2.1 --- .../nginx-ingress-operator.clusterserviceversion.yaml | 2 +- .../nginx-ingress-operator.clusterserviceversion.yaml | 2 +- config/samples/charts_v1alpha1_nginxingress.yaml | 2 +- docs/nginx-ingress-controller.md | 4 ++-- .../deployment-oss-min/nginx-ingress-controller.yaml | 2 +- .../deployment-plus-min/nginx-ingress-controller.yaml | 2 +- helm-charts/nginx-ingress/Chart.yaml | 8 ++++---- helm-charts/nginx-ingress/README.md | 10 +++++----- .../appprotectdos.f5.com_dosprotectedresources.yaml | 2 +- .../crds/externaldns.nginx.org_dnsendpoints.yaml | 2 +- .../crds/k8s.nginx.org_globalconfigurations.yaml | 2 +- .../nginx-ingress/crds/k8s.nginx.org_policies.yaml | 2 +- .../crds/k8s.nginx.org_transportservers.yaml | 2 +- .../crds/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.yaml | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml index cc2f9fec..48d562e6 100644 --- a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml +++ b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml @@ -63,7 +63,7 @@ metadata: "image": { "pullPolicy": "IfNotPresent", "repository": "nginx/nginx-ingress", - "tag": "3.2.0-ubi" + "tag": "3.2.1-ubi" }, "includeYear": false, "ingressClass": "nginx", diff --git a/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml b/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml index 646ec07b..6d6f6ee9 100644 --- a/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml @@ -33,7 +33,7 @@ metadata: "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "3.2.0-ubi", + "tag": "3.2.1-ubi", "pullPolicy": "IfNotPresent" }, "lifecycle": {}, diff --git a/config/samples/charts_v1alpha1_nginxingress.yaml b/config/samples/charts_v1alpha1_nginxingress.yaml index 46f1167c..8335c2b3 100644 --- a/config/samples/charts_v1alpha1_nginxingress.yaml +++ b/config/samples/charts_v1alpha1_nginxingress.yaml @@ -25,7 +25,7 @@ spec: customPorts: [] image: repository: nginx/nginx-ingress - tag: "3.2.0-ubi" + tag: "3.2.1-ubi" # digest: "sha256:CHANGEME" pullPolicy: IfNotPresent lifecycle: {} diff --git a/docs/nginx-ingress-controller.md b/docs/nginx-ingress-controller.md index 509ed4fb..10931a9c 100644 --- a/docs/nginx-ingress-controller.md +++ b/docs/nginx-ingress-controller.md @@ -36,7 +36,7 @@ spec: customPorts: [] image: repository: nginx/nginx-ingress - tag: "3.2.0-ubi" + tag: "3.2.1-ubi" # digest: "sha256:CHANGEME" pullPolicy: IfNotPresent lifecycle: {} @@ -220,7 +220,7 @@ Parameter | Description | Default `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.2.0 +`controller.image.tag` | The tag of the Ingress Controller image. | 3.2.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. | "" diff --git a/examples/deployment-oss-min/nginx-ingress-controller.yaml b/examples/deployment-oss-min/nginx-ingress-controller.yaml index 015c1345..a378935e 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.2.0-ubi + tag: 3.2.1-ubi ingressClass: nginx kind: deployment nginxplus: false diff --git a/examples/deployment-plus-min/nginx-ingress-controller.yaml b/examples/deployment-plus-min/nginx-ingress-controller.yaml index 54ab20ee..f2b9937e 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.2.0-ubi + tag: 3.2.1-ubi ingressClass: nginx kind: deployment nginxplus: true diff --git a/helm-charts/nginx-ingress/Chart.yaml b/helm-charts/nginx-ingress/Chart.yaml index 3bc1275e..c0e08387 100644 --- a/helm-charts/nginx-ingress/Chart.yaml +++ b/helm-charts/nginx-ingress/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 3.2.0 +appVersion: 3.2.1 description: NGINX Ingress Controller home: https://github.com/nginxinc/kubernetes-ingress -icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.2.0/deployments/helm-chart/chart-icon.png +icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.2.1/deployments/helm-chart/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.2.0/deployments/helm-chart +- https://github.com/nginxinc/kubernetes-ingress/tree/v3.2.1/deployments/helm-chart type: application -version: 0.18.0 +version: 0.18.1 diff --git a/helm-charts/nginx-ingress/README.md b/helm-charts/nginx-ingress/README.md index 998c8cb8..cf9ba9d6 100644 --- a/helm-charts/nginx-ingress/README.md +++ b/helm-charts/nginx-ingress/README.md @@ -56,13 +56,13 @@ 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 0.18.0 +helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.18.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 0.18.0 --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 0.18.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 use Docker Hub, you can replace `ghcr.io/nginxinc/charts/nginx-ingress` with `registry-1.docker.io/nginxcharts/nginx-ingress`. @@ -74,7 +74,7 @@ Helm does not upgrade the CRDs during a release upgrade. Before you upgrade a re To upgrade the release `my-release`: ```console -helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.18.0 +helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.18.1 ``` ### Uninstalling the Chart @@ -111,7 +111,7 @@ This step is required if you're installing the chart using its sources. Addition 1. Pull the chart sources: ```console - helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 0.18.0 + helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 0.18.1 ``` 2. Change your working directory to nginx-ingress: @@ -183,7 +183,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.2.0 | +|`controller.image.tag` | The tag of the Ingress Controller image. | 3.2.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. | "" | 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 029e8dca..0e64a1cd 100644 --- a/helm-charts/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml +++ b/helm-charts/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.12.1 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 50aab56c..1e07fa1a 100644 --- a/helm-charts/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml +++ b/helm-charts/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.12.1 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 37b852cf..65d5c048 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.12.1 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 12321e0d..b93bc600 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_policies.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_policies.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.12.1 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 0b994ea4..7c3a05a8 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.12.1 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 679df933..75ac6461 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.12.1 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 e15e8042..78afe011 100644 --- a/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml +++ b/helm-charts/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.12.1 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 1b68d432..06a1fe8d 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.2.0" + tag: "3.2.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 210ee505..7852aa3b 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.2.0" + tag: "3.2.1" diff --git a/helm-charts/nginx-ingress/values.yaml b/helm-charts/nginx-ingress/values.yaml index 32ace3bf..4595802e 100644 --- a/helm-charts/nginx-ingress/values.yaml +++ b/helm-charts/nginx-ingress/values.yaml @@ -54,7 +54,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.2.0" + # tag: "3.2.1" ## The digest of the Ingress Controller image. ## If digest is specified it has precedence over tag and will be used instead