From 4e62c083311d1c0130c85580b770ae3eaeec581c Mon Sep 17 00:00:00 2001 From: Eric Stroczynski Date: Thu, 5 Nov 2020 18:23:56 -0800 Subject: [PATCH] Makefile: bump IMAGE_VERSION to v1.2.0 testdata: regenerate with v1.2.0 tag --- Makefile | 2 +- testdata/ansible/memcached-operator/Dockerfile | 2 +- testdata/ansible/memcached-operator/Makefile | 4 ++-- .../bundle/tests/scorecard/config.yaml | 12 ++++++------ .../config/scorecard/patches/basic.config.yaml | 2 +- .../config/scorecard/patches/olm.config.yaml | 10 +++++----- .../bundle/tests/scorecard/config.yaml | 12 ++++++------ .../config/scorecard/patches/basic.config.yaml | 2 +- .../config/scorecard/patches/olm.config.yaml | 10 +++++----- testdata/helm/memcached-operator/Dockerfile | 2 +- testdata/helm/memcached-operator/Makefile | 4 ++-- .../bundle/tests/scorecard/config.yaml | 12 ++++++------ .../config/scorecard/patches/basic.config.yaml | 2 +- .../config/scorecard/patches/olm.config.yaml | 10 +++++----- 14 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index 4acf67b0a76..aaeaadc2e10 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL = /bin/bash # This value must be updated to the release tag of the most recent release, a change that must # occur in the release commit. IMAGE_VERSION will be removed once each subproject that uses this # version is moved to a separate repo and release process. -export IMAGE_VERSION = v1.1.0 +export IMAGE_VERSION = v1.2.0 # Build-time variables to inject into binaries export SIMPLE_VERSION = $(shell (test "$(shell git describe)" = "$(shell git describe --abbrev=0)" && echo $(shell git describe)) || echo $(shell git describe --abbrev=0)+git) export GIT_VERSION = $(shell git describe --dirty --tags --always) diff --git a/testdata/ansible/memcached-operator/Dockerfile b/testdata/ansible/memcached-operator/Dockerfile index d054420c002..04e5216dcbe 100644 --- a/testdata/ansible/memcached-operator/Dockerfile +++ b/testdata/ansible/memcached-operator/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/operator-framework/ansible-operator:v1.1.0 +FROM quay.io/operator-framework/ansible-operator:v1.2.0 COPY requirements.yml ${HOME}/requirements.yml RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \ diff --git a/testdata/ansible/memcached-operator/Makefile b/testdata/ansible/memcached-operator/Makefile index b7a6e4c6585..eed3911bc98 100644 --- a/testdata/ansible/memcached-operator/Makefile +++ b/testdata/ansible/memcached-operator/Makefile @@ -69,8 +69,8 @@ ifeq (, $(shell which ansible-operator 2>/dev/null)) @{ \ set -e ;\ mkdir -p bin ;\ - curl -LO https://github.com/operator-framework/operator-sdk/releases/download/v1.1.0/ansible-operator-v1.1.0-$(ARCHOPER)-$(OSOPER) ;\ - mv ansible-operator-v1.1.0-$(ARCHOPER)-$(OSOPER) ./bin/ansible-operator ;\ + curl -LO https://github.com/operator-framework/operator-sdk/releases/download/v1.2.0/ansible-operator-v1.2.0-$(ARCHOPER)-$(OSOPER) ;\ + mv ansible-operator-v1.2.0-$(ARCHOPER)-$(OSOPER) ./bin/ansible-operator ;\ chmod +x ./bin/ansible-operator ;\ } ANSIBLE_OPERATOR=$(realpath ./bin/ansible-operator) diff --git a/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml index 83bc60f0570..e39a5d88b57 100644 --- a/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,42 +8,42 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: basic test: basic-check-spec-test - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-bundle-validation-test - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-crds-have-validation-test - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-crds-have-resources-test - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-spec-descriptors-test - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml index 39576a573b2..f80c746f9e7 100644 --- a/testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml index 8102e4db2da..ef6834b1e3d 100644 --- a/testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/go/memcached-operator/bundle/tests/scorecard/config.yaml index 83bc60f0570..e39a5d88b57 100644 --- a/testdata/go/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/go/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,42 +8,42 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: basic test: basic-check-spec-test - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-bundle-validation-test - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-crds-have-validation-test - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-crds-have-resources-test - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-spec-descriptors-test - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/go/memcached-operator/config/scorecard/patches/basic.config.yaml index 39576a573b2..f80c746f9e7 100644 --- a/testdata/go/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/go/memcached-operator/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/go/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/go/memcached-operator/config/scorecard/patches/olm.config.yaml index 8102e4db2da..ef6834b1e3d 100644 --- a/testdata/go/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/go/memcached-operator/config/scorecard/patches/olm.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/helm/memcached-operator/Dockerfile b/testdata/helm/memcached-operator/Dockerfile index 19096a3f00d..594ad0c9f84 100644 --- a/testdata/helm/memcached-operator/Dockerfile +++ b/testdata/helm/memcached-operator/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM quay.io/operator-framework/helm-operator:v1.1.0 +FROM quay.io/operator-framework/helm-operator:v1.2.0 ENV HOME=/opt/helm COPY watches.yaml ${HOME}/watches.yaml diff --git a/testdata/helm/memcached-operator/Makefile b/testdata/helm/memcached-operator/Makefile index 63dacab47b7..6e63eef6a39 100644 --- a/testdata/helm/memcached-operator/Makefile +++ b/testdata/helm/memcached-operator/Makefile @@ -69,8 +69,8 @@ ifeq (, $(shell which helm-operator 2>/dev/null)) @{ \ set -e ;\ mkdir -p bin ;\ - curl -LO https://github.com/operator-framework/operator-sdk/releases/download/v1.1.0/helm-operator-v1.1.0-$(ARCHOPER)-$(OSOPER) ;\ - mv helm-operator-v1.1.0-$(ARCHOPER)-$(OSOPER) ./bin/helm-operator ;\ + curl -LO https://github.com/operator-framework/operator-sdk/releases/download/v1.2.0/helm-operator-v1.2.0-$(ARCHOPER)-$(OSOPER) ;\ + mv helm-operator-v1.2.0-$(ARCHOPER)-$(OSOPER) ./bin/helm-operator ;\ chmod +x ./bin/helm-operator ;\ } HELM_OPERATOR=$(realpath ./bin/helm-operator) diff --git a/testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml index 83bc60f0570..e39a5d88b57 100644 --- a/testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,42 +8,42 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: basic test: basic-check-spec-test - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-bundle-validation-test - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-crds-have-validation-test - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-crds-have-resources-test - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-spec-descriptors-test - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/helm/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/helm/memcached-operator/config/scorecard/patches/basic.config.yaml index 39576a573b2..f80c746f9e7 100644 --- a/testdata/helm/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/helm/memcached-operator/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/helm/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/helm/memcached-operator/config/scorecard/patches/olm.config.yaml index 8102e4db2da..ef6834b1e3d 100644 --- a/testdata/helm/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/helm/memcached-operator/config/scorecard/patches/olm.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.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.1.0 + image: quay.io/operator-framework/scorecard-test:v1.2.0 labels: suite: olm test: olm-status-descriptors-test