Update NGINX Ingress Controller to 3.1.1

Dockerfile

@@ -6,8 +6,3 @@ COPY helm-charts  ${HOME}/helm-charts
 WORKDIR ${HOME}
 
 COPY LICENSE /licenses/
-
-# hack to update packages with CVEs
-USER root
-RUN microdnf --nodocs upgrade -y libxml2 libksba
-USER 1001

Makefile

@@ -147,7 +147,7 @@ ifeq (,$(shell which helm-operator 2>/dev/null))
 	@{ \
 	set -e ;\
 	mkdir -p $(dir $(HELM_OPERATOR)) ;\
-	curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.28.0/helm-operator_$(OS)_$(ARCH) ;\
+	curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.28.1/helm-operator_$(OS)_$(ARCH) ;\
 	chmod +x $(HELM_OPERATOR) ;\
 	}
 else

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.28.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
 

bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml

@@ -63,7 +63,7 @@ metadata:
               "image": {
                 "pullPolicy": "IfNotPresent",
                 "repository": "nginx/nginx-ingress",
-                "tag": "3.1.0-ubi"
+                "tag": "3.1.1-ubi"
               },
               "includeYear": false,
               "ingressClass": "nginx",
@@ -177,11 +177,11 @@ metadata:
     categories: Monitoring, Networking
     certified: "true"
     containerImage: nginx/nginx-ingress-operator:1.4.0
-    createdAt: "2023-04-06T12:51:57Z"
+    createdAt: "2023-05-07T19:51:54Z"
     description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
       deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
     operatorframework.io/suggested-namespace: nginx-ingress
-    operators.operatorframework.io/builder: operator-sdk-v1.28.0
+    operators.operatorframework.io/builder: operator-sdk-v1.28.1
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
     repository: https://github.com/nginxinc/nginx-ingress-helm-operator
     support: NGINX Inc.

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.28.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.1
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
 

bundle/tests/scorecard/config.yaml

@@ -8,7 +8,7 @@ stages:
   - entrypoint:
     - scorecard-test
     - basic-check-spec
-    image: quay.io/operator-framework/scorecard-test:v1.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.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.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.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.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.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.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.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.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.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.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.1
     labels:
       suite: olm
       test: olm-status-descriptors-test

config/samples/charts_v1alpha1_nginxingress.yaml

@@ -25,7 +25,7 @@ spec:
     customPorts: []
     image:
       repository: nginx/nginx-ingress
-      tag: "3.1.0-ubi"
+      tag: "3.1.1-ubi"
       # digest: "sha256:CHANGEME"
       pullPolicy: IfNotPresent
     lifecycle: {}
@@ -41,7 +41,7 @@ spec:
     defaultTLS:
       secret: ""
     wildcardTLS:
-      secret: 
+      secret:
     # nodeSelector: {}
     terminationGracePeriodSeconds: 30
     autoscaling:

config/scorecard/patches/basic.config.yaml

@@ -4,7 +4,7 @@
     entrypoint:
     - scorecard-test
     - basic-check-spec
-    image: quay.io/operator-framework/scorecard-test:v1.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.1
     labels:
       suite: basic
       test: basic-check-spec-test

config/scorecard/patches/olm.config.yaml

@@ -4,7 +4,7 @@
     entrypoint:
     - scorecard-test
     - olm-bundle-validation
-    image: quay.io/operator-framework/scorecard-test:v1.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.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.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.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.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.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.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.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.28.0
+    image: quay.io/operator-framework/scorecard-test:v1.28.1
     labels:
       suite: olm
       test: olm-status-descriptors-test

docs/nginx-ingress-controller.md

@@ -36,7 +36,7 @@ spec:
     customPorts: []
     image:
       repository: nginx/nginx-ingress
-      tag: "3.1.0-ubi"
+      tag: "3.1.1-ubi"
       # digest: "sha256:CHANGEME"
       pullPolicy: IfNotPresent
     lifecycle: {}
@@ -52,7 +52,7 @@ spec:
     defaultTLS:
       secret: ""
     wildcardTLS:
-      secret: 
+      secret:
     # nodeSelector: {}
     terminationGracePeriodSeconds: 30
     autoscaling:
@@ -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.1.0
+`controller.image.tag` | The tag of the Ingress Controller image. | 3.1.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. | ""

examples/deployment-oss-min/nginx-ingress-controller.yaml

@@ -11,7 +11,7 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 3.1.0-ubi
+      tag: 3.1.1-ubi
     ingressClass: nginx
     kind: deployment
     nginxplus: false

examples/deployment-plus-min/nginx-ingress-controller.yaml

@@ -11,7 +11,7 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 3.1.0-ubi
+      tag: 3.1.1-ubi
     ingressClass: nginx
     kind: deployment
     nginxplus: true

helm-charts/nginx-ingress/Chart.yaml

@@ -1,14 +1,14 @@
 apiVersion: v2
 name: nginx-ingress
-version: 0.17.0
-appVersion: 3.1.0
+version: 0.17.1
+appVersion: 3.1.1
 kubeVersion: ">= 1.22.0-0"
 type: application
 description: NGINX Ingress Controller
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.1.0/deployments/helm-chart/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.1.1/deployments/helm-chart/chart-icon.png
 home: https://github.com/nginxinc/kubernetes-ingress
 sources:
-  - https://github.com/nginxinc/kubernetes-ingress/tree/v3.1.0/deployments/helm-chart
+  - https://github.com/nginxinc/kubernetes-ingress/tree/v3.1.1/deployments/helm-chart
 keywords:
   - ingress
   - nginx