diff --git a/Makefile b/Makefile index b2d78193..32b3d27c 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 3.0.0 +VERSION ?= 3.0.1 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") @@ -49,7 +49,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.38.0 +OPERATOR_SDK_VERSION ?= v1.39.1 # Image URL to use all building/pushing image targets IMG ?= $(IMAGE_TAG_BASE):$(VERSION) diff --git a/README.md b/README.md index 1ed65e28..4e877ce0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The following table shows the relation between the versions of the two projects: | NGINX Ingress Controller | NGINX Ingress Operator | | ------------------------ | ---------------------- | -| 4.0.x | 3.0.0 | +| 4.0.x | 3.0.1 | | 3.7.x | 2.4.2 | | 3.6.x | 2.3.2 | | 3.5.x | 2.2.2 | @@ -77,7 +77,7 @@ See [upgrade docs](./docs/upgrades.md) We publish NGINX Ingress Operator releases on GitHub. See our [releases page](https://github.com/nginxinc/nginx-ingress-helm-operator/releases). -The latest stable release is [3.0.0](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v3.0.0). For production use, we recommend that you choose the latest stable release. +The latest stable release is [3.0.1](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v3.0.1). For production use, we recommend that you choose the latest stable release. ## Development diff --git a/bundle.Dockerfile b/bundle.Dockerfile index b94f4240..076e423f 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.38.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.39.1 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1 diff --git a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml index bdceb0b4..66531c17 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": "4.0.0-ubi" + "tag": "4.0.1-ubi" }, "ingressClass": { "create": true, @@ -223,8 +223,8 @@ metadata: capabilities: Basic Install categories: Monitoring, Networking certified: "true" - containerImage: quay.io/nginx/nginx-ingress-operator:3.0.0 - createdAt: "2024-12-17T15:44:33Z" + containerImage: quay.io/nginx/nginx-ingress-operator:3.0.1 + createdAt: "2025-02-07T12:50:48Z" description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers features.operators.openshift.io/cnf: "false" @@ -238,7 +238,7 @@ metadata: features.operators.openshift.io/token-auth-azure: "false" features.operators.openshift.io/token-auth-gcp: "false" operatorframework.io/suggested-namespace: nginx-ingress - operators.operatorframework.io/builder: operator-sdk-v1.38.0 + operators.operatorframework.io/builder: operator-sdk-v1.39.1 operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1 repository: https://github.com/nginxinc/nginx-ingress-helm-operator support: NGINX Inc. @@ -247,7 +247,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: nginx-ingress-operator.v3.0.0 + name: nginx-ingress-operator.v3.0.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -470,7 +470,7 @@ spec: - --metrics-bind-address=127.0.0.1:8080 - --leader-elect - --leader-election-id=nginx-ingress-operator - image: quay.io/nginx/nginx-ingress-operator:3.0.0 + image: quay.io/nginx/nginx-ingress-operator:3.0.1 livenessProbe: httpGet: path: /healthz @@ -527,4 +527,4 @@ spec: minKubeVersion: 1.26.0 provider: name: NGINX Inc - version: 3.0.0 + version: 3.0.1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index d849c38e..a8a11bdb 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -6,7 +6,7 @@ annotations: operators.operatorframework.io.bundle.package.v1: nginx-ingress-operator operators.operatorframework.io.bundle.channels.v1: alpha operators.operatorframework.io.bundle.channel.default.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.38.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.39.1 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1 diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index ea6b8079..924ca624 100644 --- a/bundle/tests/scorecard/config.yaml +++ b/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-status-descriptors-test diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index bfac030a..12165aa2 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/nginx/nginx-ingress-operator - newTag: 3.0.0 + newTag: 3.0.1 diff --git a/config/manifests/bases/kustomization.yaml b/config/manifests/bases/kustomization.yaml index 3354eecf..5afdc82a 100644 --- a/config/manifests/bases/kustomization.yaml +++ b/config/manifests/bases/kustomization.yaml @@ -3,4 +3,4 @@ resources: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization commonAnnotations: - containerImage: quay.io/nginx/nginx-ingress-operator:3.0.0 + containerImage: quay.io/nginx/nginx-ingress-operator:3.0.1 diff --git a/config/samples/charts_v1alpha1_nginxingress.yaml b/config/samples/charts_v1alpha1_nginxingress.yaml index c954c542..5554f6ab 100644 --- a/config/samples/charts_v1alpha1_nginxingress.yaml +++ b/config/samples/charts_v1alpha1_nginxingress.yaml @@ -38,7 +38,7 @@ spec: customPorts: [] image: repository: nginx/nginx-ingress - tag: "4.0.0-ubi" + tag: "4.0.1-ubi" # digest: "sha256:CHANGEME" pullPolicy: IfNotPresent lifecycle: {} diff --git a/config/scorecard/patches/basic.config.yaml b/config/scorecard/patches/basic.config.yaml index 84683cf8..b9ec7c6c 100644 --- a/config/scorecard/patches/basic.config.yaml +++ b/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: basic test: basic-check-spec-test diff --git a/config/scorecard/patches/olm.config.yaml b/config/scorecard/patches/olm.config.yaml index 43f40a8b..25d83f98 100644 --- a/config/scorecard/patches/olm.config.yaml +++ b/config/scorecard/patches/olm.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-bundle-validation-test @@ -14,7 +14,7 @@ entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-crds-have-validation-test @@ -24,7 +24,7 @@ entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-crds-have-resources-test @@ -34,7 +34,7 @@ entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-spec-descriptors-test @@ -44,7 +44,7 @@ entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.38.0 + image: quay.io/operator-framework/scorecard-test:v1.39.1 labels: suite: olm test: olm-status-descriptors-test diff --git a/docs/manual-installation.md b/docs/manual-installation.md index 3973fb3a..d4fe3faa 100644 --- a/docs/manual-installation.md +++ b/docs/manual-installation.md @@ -7,14 +7,14 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace. 1. Clone the `nginx-ingress-operator` repo: ```shell - git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v3.0.0 + git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v3.0.1 cd nginx-ingress-helm-operator/ ``` 2. To deploy the Operator and associated resources to all environments, run: ```shell - make deploy IMG=nginx/nginx-ingress-operator:3.0.0 + make deploy IMG=nginx/nginx-ingress-operator:3.0.1 ``` 2. Check that the Operator is running: @@ -30,11 +30,11 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace. In order to deploy NGINX Ingress Controller instances into OpenShift environments, a new SCC is required to be created on the cluster which will be used to bind the specific required capabilities to the NGINX Ingress service account(s). To do so for NIC deployments, please run the following command (assuming you are logged in with administrator access to the cluster): -`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.0/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.1/resources/scc.yaml` Alternatively, to create an SCC for NIC daemonsets, please run this command: -`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.0/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.1/resources/scc-daemonset.yaml` You can now deploy the NGINX Ingress Controller instances. @@ -44,19 +44,19 @@ You can now deploy the NGINX Ingress Controller instances. You can use the operator (including the kube-rbac-proxy) images from your own private registry. 1. Tag the images for your private registry ```shell - docker tag quay.io/nginx/nginx-ingress-operator:3.0.0 /nginx-ingress-operator:3.0.0 + docker tag quay.io/nginx/nginx-ingress-operator:3.0.1 /nginx-ingress-operator:3.0.1 docker tag quay.io/brancz/kube-rbac-proxy:v0.18.0 /kube-rbac-proxy:v0.18.0 ``` 2. Push the image to your private registry ```shell - docker push /nginx-ingress-operator:3.0.0 + docker push /nginx-ingress-operator:3.0.1 docker push /kube-rbac-proxy:v0.18.0 ``` 3. Follow step 1 above but in step 1.2 you can run ```shell - make deploy IMG=/nginx-ingress-operator:3.0.0 KRP_IMAGE_BASE=/kube-rbac-proxy + make deploy IMG=/nginx-ingress-operator:3.0.1 KRP_IMAGE_BASE=/kube-rbac-proxy ``` **Note: If you need to use a different `kube-rbac-proxy` version than the default, use the `KRP_IMAGE_TAG` variable** diff --git a/docs/nginx-ingress-controller.md b/docs/nginx-ingress-controller.md index 111851ea..dfaa1388 100644 --- a/docs/nginx-ingress-controller.md +++ b/docs/nginx-ingress-controller.md @@ -50,7 +50,7 @@ spec: customPorts: [] image: repository: nginx/nginx-ingress - tag: "4.0.0-ubi" + tag: "4.0.1-ubi" # digest: "sha256:CHANGEME" pullPolicy: IfNotPresent lifecycle: {} diff --git a/docs/openshift-installation.md b/docs/openshift-installation.md index 0ea2c867..8fa89f62 100644 --- a/docs/openshift-installation.md +++ b/docs/openshift-installation.md @@ -23,10 +23,10 @@ Additional steps: In order to deploy NGINX Ingress Controller instances into OpenShift environments, a new SCC is required to be created on the cluster which will be used to bind the specific required capabilities to the NGINX Ingress service account(s). To do so for NIC deployments, please run the following command (assuming you are logged in with administrator access to the cluster): -`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.0/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.1/resources/scc.yaml` Alternatively, to create an SCC for NIC daemonsets, please run this command: -`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.0/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.1/resources/scc-daemonset.yaml` You can now deploy the NGINX Ingress Controller instances. diff --git a/examples/deployment-oss-min/nginx-ingress-controller.yaml b/examples/deployment-oss-min/nginx-ingress-controller.yaml index ccdb0b10..4b6a9920 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: 4.0.0-ubi + tag: 4.0.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 6faa992e..632a82fd 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: 4.0.0-ubi + tag: 4.0.1-ubi ingressClass: name: nginx kind: deployment diff --git a/helm-charts/nginx-ingress/Chart.yaml b/helm-charts/nginx-ingress/Chart.yaml index 5b24f90f..2e7fa780 100644 --- a/helm-charts/nginx-ingress/Chart.yaml +++ b/helm-charts/nginx-ingress/Chart.yaml @@ -1,17 +1,17 @@ apiVersion: v2 -appVersion: 4.0.0 +appVersion: 4.0.1 description: NGINX Ingress Controller -home: https://github.com/nginxinc/kubernetes-ingress -icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v4.0.0/charts/nginx-ingress/chart-icon.png +home: https://github.com/nginx/kubernetes-ingress +icon: https://raw.githubusercontent.com/nginx/kubernetes-ingress/v4.0.1/charts/nginx-ingress/chart-icon.png keywords: - ingress - nginx kubeVersion: '>= 1.23.0-0' maintainers: - email: kubernetes@nginx.com - name: nginxinc + name: nginx name: nginx-ingress sources: -- https://github.com/nginxinc/kubernetes-ingress/tree/v4.0.0/charts/nginx-ingress +- https://github.com/nginx/kubernetes-ingress/tree/v4.0.1/charts/nginx-ingress type: application -version: 2.0.0 +version: 2.0.1 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 fe712aac..80980a20 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.16.5 + controller-gen.kubebuilder.io/version: v0.17.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 effb94d3..3cd7c0da 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.16.5 + controller-gen.kubebuilder.io/version: v0.17.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 0a9ee987..9d033970 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.16.5 + controller-gen.kubebuilder.io/version: v0.17.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 0fcc6378..7bf119c7 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.16.5 + controller-gen.kubebuilder.io/version: v0.17.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 65e87092..01175b09 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.16.5 + controller-gen.kubebuilder.io/version: v0.17.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 c6dffbdf..96658e52 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.16.5 + controller-gen.kubebuilder.io/version: v0.17.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 49adfc3d..c6cc7cad 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.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 name: virtualservers.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/helm-charts/nginx-ingress/templates/NOTES.txt b/helm-charts/nginx-ingress/templates/NOTES.txt index c9a27397..1fcca30c 100644 --- a/helm-charts/nginx-ingress/templates/NOTES.txt +++ b/helm-charts/nginx-ingress/templates/NOTES.txt @@ -7,7 +7,7 @@ Installation and upgrade instructions: https://docs.nginx.com/nginx-ingress-cont {{ if .Release.IsUpgrade -}} If you are upgrading from a version of the chart that uses older Custom Resource Definitions (CRD) it is necessary to manually upgrade the CRDs as this is not managed by Helm. To update to the latest version of the CRDs: - $ kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{ .Chart.AppVersion }}/deploy/crds.yaml + $ kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{ .Chart.AppVersion }}/deploy/crds.yaml More details on upgrading the CRDs: https://docs.nginx.com/nginx-ingress-controller/installation/installing-nic/installation-with-helm/#upgrading-the-crds {{- end -}} diff --git a/helm-charts/nginx-ingress/templates/controller-lease.yaml b/helm-charts/nginx-ingress/templates/controller-lease.yaml index 960f61ce..6a761acb 100644 --- a/helm-charts/nginx-ingress/templates/controller-lease.yaml +++ b/helm-charts/nginx-ingress/templates/controller-lease.yaml @@ -7,7 +7,7 @@ metadata: labels: {{- include "nginx-ingress.labels" . | nindent 4 }} {{- if .Values.controller.reportIngressStatus.annotations }} - annotations + annotations: {{ toYaml .Values.controller.reportIngressStatus.annotations | indent 4 }} {{- end }} {{- end }} diff --git a/helm-charts/nginx-ingress/v1.32.0/_definitions.json b/helm-charts/nginx-ingress/v1.32.0/_definitions.json index f7addb50..eb9d93e6 100644 --- a/helm-charts/nginx-ingress/v1.32.0/_definitions.json +++ b/helm-charts/nginx-ingress/v1.32.0/_definitions.json @@ -6873,7 +6873,7 @@ "type": "string" }, "ip": { - "description": "The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0.0/16 or fe80::/10), or link-local multicast (224.0.0.0/24 or ff02::/16).", + "description": "The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0.1/16 or fe80::/10), or link-local multicast (224.0.1.0/24 or ff02::/16).", "type": "string" }, "nodeName": { diff --git a/helm-charts/nginx-ingress/v1.32.0/endpointaddress-v1.json b/helm-charts/nginx-ingress/v1.32.0/endpointaddress-v1.json index 7dbf1b05..57da8adc 100644 --- a/helm-charts/nginx-ingress/v1.32.0/endpointaddress-v1.json +++ b/helm-charts/nginx-ingress/v1.32.0/endpointaddress-v1.json @@ -9,7 +9,7 @@ ] }, "ip": { - "description": "The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0.0/16 or fe80::/10), or link-local multicast (224.0.0.0/24 or ff02::/16).", + "description": "The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0.1/16 or fe80::/10), or link-local multicast (224.0.1.0/24 or ff02::/16).", "type": [ "string", "null" diff --git a/helm-charts/nginx-ingress/v1.32.0/endpointaddress.json b/helm-charts/nginx-ingress/v1.32.0/endpointaddress.json index 7dbf1b05..57da8adc 100644 --- a/helm-charts/nginx-ingress/v1.32.0/endpointaddress.json +++ b/helm-charts/nginx-ingress/v1.32.0/endpointaddress.json @@ -9,7 +9,7 @@ ] }, "ip": { - "description": "The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0.0/16 or fe80::/10), or link-local multicast (224.0.0.0/24 or ff02::/16).", + "description": "The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0.1/16 or fe80::/10), or link-local multicast (224.0.1.0/24 or ff02::/16).", "type": [ "string", "null" diff --git a/helm-charts/nginx-ingress/values-icp.yaml b/helm-charts/nginx-ingress/values-icp.yaml index c07addff..ea0361fb 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: "4.0.0" + tag: "4.0.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 91e34937..923a661b 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: "4.0.0" + tag: "4.0.1" diff --git a/helm-charts/nginx-ingress/values.schema.json b/helm-charts/nginx-ingress/values.schema.json index eae98aa5..bb755beb 100644 --- a/helm-charts/nginx-ingress/values.schema.json +++ b/helm-charts/nginx-ingress/values.schema.json @@ -674,10 +674,10 @@ }, "tag": { "type": "string", - "default": "4.0.0", + "default": "4.0.1", "title": "The tag of the Ingress Controller image", "examples": [ - "4.0.0" + "4.0.1" ] }, "digest": { @@ -714,7 +714,7 @@ "examples": [ { "repository": "nginx/nginx-ingress", - "tag": "4.0.0", + "tag": "4.0.1", "pullPolicy": "IfNotPresent" } ] @@ -1865,7 +1865,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "4.0.0", + "tag": "4.0.1", "digest": "", "pullPolicy": "IfNotPresent" }, @@ -2479,7 +2479,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "4.0.0", + "tag": "4.0.1", "digest": "", "pullPolicy": "IfNotPresent" }, diff --git a/helm-charts/nginx-ingress/values.yaml b/helm-charts/nginx-ingress/values.yaml index 09f89f29..6cafec68 100644 --- a/helm-charts/nginx-ingress/values.yaml +++ b/helm-charts/nginx-ingress/values.yaml @@ -170,7 +170,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: "4.0.0" + # tag: "4.0.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" @@ -535,7 +535,7 @@ controller: ## The default is autogenerated. leaderElectionLockName: "" - ## The annotations of the leader election configmap. + ## The annotations of the leader election Lease. annotations: {} pod: