From df8cc06c839b6ea86ba421770e4eeddda1532948 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 15:18:00 +0000 Subject: [PATCH 1/3] Bump operator-framework/helm-operator from v1.30.0 to v1.31.0 Bumps operator-framework/helm-operator from v1.30.0 to v1.31.0. --- updated-dependencies: - dependency-name: operator-framework/helm-operator dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8110a9d5..6b308182 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/operator-framework/helm-operator:v1.30.0 +FROM quay.io/operator-framework/helm-operator:v1.31.0 ENV HOME=/opt/helm COPY watches.yaml ${HOME}/watches.yaml From 278cb51394c52611e37aacd10df9527eecf17bba Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Tue, 1 Aug 2023 17:34:31 -0700 Subject: [PATCH 2/3] Update rest of the files to v1.31.0 --- Makefile | 2 +- bundle.Dockerfile | 2 +- ...nginx-ingress-operator.clusterserviceversion.yaml | 2 +- bundle/metadata/annotations.yaml | 2 +- bundle/tests/scorecard/config.yaml | 12 ++++++------ config/scorecard/patches/basic.config.yaml | 2 +- config/scorecard/patches/olm.config.yaml | 10 +++++----- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index f07f1e60..0716a5c0 100644 --- a/Makefile +++ b/Makefile @@ -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.30.0 +OPERATOR_SDK_VERSION ?= v1.31.0 # Image URL to use all building/pushing image targets IMG ?= $(IMAGE_TAG_BASE):$(VERSION) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 524cfd3a..25e00d67 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.30.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0 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 3f819672..cc2f9fec 100644 --- a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml +++ b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml @@ -181,7 +181,7 @@ metadata: 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.30.0 + operators.operatorframework.io/builder: operator-sdk-v1.31.0 operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1 repository: https://github.com/nginxinc/nginx-ingress-helm-operator support: NGINX Inc. diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 9744fabd..0cf101ef 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.30.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0 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 104883e2..0c0690cc 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/config/scorecard/patches/basic.config.yaml b/config/scorecard/patches/basic.config.yaml index c95b4ec1..04b59f3a 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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 f6607c2d..8f1c9521 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test From 10629c25d2d7942714d95255fa0e2ea3ac368e68 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Tue, 1 Aug 2023 17:38:31 -0700 Subject: [PATCH 3/3] Update opm --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0716a5c0..80154251 100644 --- a/Makefile +++ b/Makefile @@ -200,7 +200,7 @@ ifeq (,$(shell which opm 2>/dev/null)) @{ \ set -e ;\ mkdir -p $(dir $(OPM)) ;\ - curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.26.2/$(OS)-$(ARCH)-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.28.0/$(OS)-$(ARCH)-opm ;\ chmod +x $(OPM) ;\ } else