From dad3e83dc7dabf0a7bea4eb5d4b52ea0911e8943 Mon Sep 17 00:00:00 2001 From: Thierry Wasylczenko Date: Tue, 21 Dec 2021 16:30:42 +0100 Subject: [PATCH] Upgrade OPM version used (#5099) * Upgrade OPM version used Signed-off-by: Thierry Wasylczenko * Upgrade OPM version to v1.18 and update 00-template.yaml Signed-off-by: Thierry Wasylczenko * Use correct OPM version with 3 parts Signed-off-by: Thierry Wasylczenko * Dedicated fragment for release notes Signed-off-by: Thierry Wasylczenko * [upgrade-opm-version] Using OPM 1.19.1 Signed-off-by: Thierry Wasylczenko --- changelog/fragments/01-upgrade-opm-version.yaml | 8 ++++++++ internal/plugins/manifests/v2/init.go | 2 +- testdata/ansible/memcached-operator/Makefile | 2 +- testdata/go/v2/memcached-operator/Makefile | 2 +- testdata/go/v3/memcached-operator/Makefile | 2 +- testdata/helm/memcached-operator/Makefile | 2 +- website/content/en/docs/upgrading-sdk-version/v1.6.0.md | 2 +- website/content/en/docs/upgrading-sdk-version/v1.6.1.md | 2 +- 8 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 changelog/fragments/01-upgrade-opm-version.yaml diff --git a/changelog/fragments/01-upgrade-opm-version.yaml b/changelog/fragments/01-upgrade-opm-version.yaml new file mode 100644 index 00000000000..20ce80f2fe6 --- /dev/null +++ b/changelog/fragments/01-upgrade-opm-version.yaml @@ -0,0 +1,8 @@ +entries: + - description: > + Upgrade OPM version that is used by default to 1.19.1 in the generated Makefile so `make catalog-build` also works on OSX. + + kind: "change" + + # Is this a breaking change? + breaking: false diff --git a/internal/plugins/manifests/v2/init.go b/internal/plugins/manifests/v2/init.go index 9b2451baa3d..7b6164ae8a1 100644 --- a/internal/plugins/manifests/v2/init.go +++ b/internal/plugins/manifests/v2/init.go @@ -32,7 +32,7 @@ import ( // Version of `opm` to download and use for building index images. // This version's release artifacts *must* contain a binary for multiple arches; certain releases do not. -const opmVersion = "v1.15.1" +const opmVersion = "v1.19.1" const filePath = "Makefile" diff --git a/testdata/ansible/memcached-operator/Makefile b/testdata/ansible/memcached-operator/Makefile index 15f37736e40..70a8d891939 100644 --- a/testdata/ansible/memcached-operator/Makefile +++ b/testdata/ansible/memcached-operator/Makefile @@ -149,7 +149,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.15.1/$(OS)-$(ARCH)-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$(OS)-$(ARCH)-opm ;\ chmod +x $(OPM) ;\ } else diff --git a/testdata/go/v2/memcached-operator/Makefile b/testdata/go/v2/memcached-operator/Makefile index ed295eb7193..a8539c89c43 100644 --- a/testdata/go/v2/memcached-operator/Makefile +++ b/testdata/go/v2/memcached-operator/Makefile @@ -190,7 +190,7 @@ ifeq (,$(shell which opm 2>/dev/null)) set -e ;\ mkdir -p $(dir $(OPM)) ;\ OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ - curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$${OS}-$${ARCH}-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$${OS}-$${ARCH}-opm ;\ chmod +x $(OPM) ;\ } else diff --git a/testdata/go/v3/memcached-operator/Makefile b/testdata/go/v3/memcached-operator/Makefile index 679ff9f184b..06992701dbb 100644 --- a/testdata/go/v3/memcached-operator/Makefile +++ b/testdata/go/v3/memcached-operator/Makefile @@ -189,7 +189,7 @@ ifeq (,$(shell which opm 2>/dev/null)) set -e ;\ mkdir -p $(dir $(OPM)) ;\ OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ - curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$${OS}-$${ARCH}-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$${OS}-$${ARCH}-opm ;\ chmod +x $(OPM) ;\ } else diff --git a/testdata/helm/memcached-operator/Makefile b/testdata/helm/memcached-operator/Makefile index 7966e8e0085..5891452d95a 100644 --- a/testdata/helm/memcached-operator/Makefile +++ b/testdata/helm/memcached-operator/Makefile @@ -149,7 +149,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.15.1/$(OS)-$(ARCH)-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$(OS)-$(ARCH)-opm ;\ chmod +x $(OPM) ;\ } else diff --git a/website/content/en/docs/upgrading-sdk-version/v1.6.0.md b/website/content/en/docs/upgrading-sdk-version/v1.6.0.md index b6613e9ad8b..c599ece0765 100644 --- a/website/content/en/docs/upgrading-sdk-version/v1.6.0.md +++ b/website/content/en/docs/upgrading-sdk-version/v1.6.0.md @@ -178,7 +178,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.15.1/$(OS)-$(ARCH)-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$(OS)-$(ARCH)-opm ;\ chmod +x $(OPM) ;\ } else diff --git a/website/content/en/docs/upgrading-sdk-version/v1.6.1.md b/website/content/en/docs/upgrading-sdk-version/v1.6.1.md index 26b405fa3cd..96498fd64a0 100644 --- a/website/content/en/docs/upgrading-sdk-version/v1.6.1.md +++ b/website/content/en/docs/upgrading-sdk-version/v1.6.1.md @@ -178,7 +178,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.15.1/$(OS)-$(ARCH)-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$(OS)-$(ARCH)-opm ;\ chmod +x $(OPM) ;\ } else