From f963b6ea270ccd6ba7a6c970d848e7c7c477c0b4 Mon Sep 17 00:00:00 2001 From: Hang Lyu Date: Mon, 31 May 2021 12:14:43 -0400 Subject: [PATCH 1/3] update SHA for nginx-ingress-controller --- ...ibm-ingress-nginx-operator.v1.6.0.clusterserviceversion.yaml | 2 +- deploy/operator.yaml | 2 +- helm-charts/nginx-ingress/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/olm-catalog/ibm-ingress-nginx-operator/1.6.0/ibm-ingress-nginx-operator.v1.6.0.clusterserviceversion.yaml b/deploy/olm-catalog/ibm-ingress-nginx-operator/1.6.0/ibm-ingress-nginx-operator.v1.6.0.clusterserviceversion.yaml index 68fb158..a516db8 100644 --- a/deploy/olm-catalog/ibm-ingress-nginx-operator/1.6.0/ibm-ingress-nginx-operator.v1.6.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ibm-ingress-nginx-operator/1.6.0/ibm-ingress-nginx-operator.v1.6.0.clusterserviceversion.yaml @@ -337,7 +337,7 @@ spec: - name: OPERATOR_NAME value: ibm-ingress-nginx-operator - name: INGRESS_IMAGE_DIGEST - value: quay.io/opencloudio/nginx-ingress-controller@sha256:54996a84c918eabca0c4ec7f91da203cfe7229c43615d41c1b3b2adc4c18629e + value: quay.io/opencloudio/nginx-ingress-controller@sha256:5e7503f1f278544be36c408440dd4477db5b681533f3356485c255b8df0c8680 - name: DEFAULT_BACKEND_IMAGE_DIGEST value: quay.io/opencloudio/default-http-backend@sha256:ddf76bee841ee4ba75ff096534eda6a754ee2b1c845e9b762dd670fafe321b9d - name: KUBECTL_IMAGE_DIGEST diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 6df4a70..b06c9cb 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -42,7 +42,7 @@ spec: - name: OPERATOR_NAME value: "ibm-ingress-nginx-operator" - name: INGRESS_IMAGE_DIGEST - value: "quay.io/opencloudio/nginx-ingress-controller@sha256:54996a84c918eabca0c4ec7f91da203cfe7229c43615d41c1b3b2adc4c18629e" + value: "quay.io/opencloudio/nginx-ingress-controller@sha256:5e7503f1f278544be36c408440dd4477db5b681533f3356485c255b8df0c8680" - name: DEFAULT_BACKEND_IMAGE_DIGEST value: "quay.io/opencloudio/default-http-backend@sha256:ddf76bee841ee4ba75ff096534eda6a754ee2b1c845e9b762dd670fafe321b9d" - name: KUBECTL_IMAGE_DIGEST diff --git a/helm-charts/nginx-ingress/values.yaml b/helm-charts/nginx-ingress/values.yaml index bf8d383..c438962 100644 --- a/helm-charts/nginx-ingress/values.yaml +++ b/helm-charts/nginx-ingress/values.yaml @@ -19,7 +19,7 @@ ingress: httpsPort: 7443 routeHost: "" imageRegistry: quay.io/opencloudio - imageDigest: quay.io/opencloudio/nginx-ingress-controller@sha256:54996a84c918eabca0c4ec7f91da203cfe7229c43615d41c1b3b2adc4c18629e + imageDigest: quay.io/opencloudio/nginx-ingress-controller@sha256:5e7503f1f278544be36c408440dd4477db5b681533f3356485c255b8df0c8680 image: repository: nginx-ingress-controller tag: 0.23.13 From e2396f1aaa4ce130eff6d994bfc8044b24ab793c Mon Sep 17 00:00:00 2001 From: Hang Lyu Date: Thu, 3 Jun 2021 12:16:45 -0400 Subject: [PATCH 2/3] update base image to address vascan issue --- build/Dockerfile | 2 +- build/Dockerfile-ppc64le | 2 +- build/Dockerfile-s390x | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index a281115..609bda6 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # -FROM quay.io/operator-framework/helm-operator:v1.3.0 +FROM quay.io/operator-framework/helm-operator:v1.8.0 ARG VCS_REF ARG VCS_URL diff --git a/build/Dockerfile-ppc64le b/build/Dockerfile-ppc64le index 2b20d46..5fb0d34 100644 --- a/build/Dockerfile-ppc64le +++ b/build/Dockerfile-ppc64le @@ -13,7 +13,7 @@ # limitations under the License. # -FROM quay.io/operator-framework/helm-operator-ppc64le:v1.3.0 +FROM quay.io/operator-framework/helm-operator-ppc64le:v1.4.2 ARG VCS_REF ARG VCS_URL diff --git a/build/Dockerfile-s390x b/build/Dockerfile-s390x index a95a98f..e1f8a64 100644 --- a/build/Dockerfile-s390x +++ b/build/Dockerfile-s390x @@ -13,7 +13,7 @@ # limitations under the License. # -FROM quay.io/operator-framework/helm-operator-s390x:v1.3.0 +FROM quay.io/operator-framework/helm-operator-s390x:v1.4.2 ARG VCS_REF ARG VCS_URL From 5d8f4aaa7aaf42f263a8ec2ef73b789f3ab54662 Mon Sep 17 00:00:00 2001 From: Hang Lyu Date: Thu, 3 Jun 2021 12:29:36 -0400 Subject: [PATCH 3/3] revert base image for power and z as the new base image does not solve vascan security issues --- build/Dockerfile-ppc64le | 2 +- build/Dockerfile-s390x | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile-ppc64le b/build/Dockerfile-ppc64le index 5fb0d34..2b20d46 100644 --- a/build/Dockerfile-ppc64le +++ b/build/Dockerfile-ppc64le @@ -13,7 +13,7 @@ # limitations under the License. # -FROM quay.io/operator-framework/helm-operator-ppc64le:v1.4.2 +FROM quay.io/operator-framework/helm-operator-ppc64le:v1.3.0 ARG VCS_REF ARG VCS_URL diff --git a/build/Dockerfile-s390x b/build/Dockerfile-s390x index e1f8a64..a95a98f 100644 --- a/build/Dockerfile-s390x +++ b/build/Dockerfile-s390x @@ -13,7 +13,7 @@ # limitations under the License. # -FROM quay.io/operator-framework/helm-operator-s390x:v1.4.2 +FROM quay.io/operator-framework/helm-operator-s390x:v1.3.0 ARG VCS_REF ARG VCS_URL