Upgrade OPM version used (#5099)

twasyl · web-flow · commit dad3e83dc7da · 2021-12-21T10:30:42.000-05:00
* Upgrade OPM version used

Signed-off-by: Thierry Wasylczenko &lt;thierry.wasylczenko@gmail.com&gt;

* Upgrade OPM version to v1.18 and update 00-template.yaml

Signed-off-by: Thierry Wasylczenko &lt;thierry.wasylczenko@gmail.com&gt;

* Use correct OPM version with 3 parts

Signed-off-by: Thierry Wasylczenko &lt;thierry.wasylczenko@gmail.com&gt;

* Dedicated fragment for release notes

Signed-off-by: Thierry Wasylczenko &lt;thierry.wasylczenko@gmail.com&gt;

* [upgrade-opm-version] Using OPM 1.19.1

Signed-off-by: Thierry Wasylczenko &lt;thierry.wasylczenko@gmail.com&gt;
diff --git a/changelog/fragments/01-upgrade-opm-version.yaml 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ ifeq (,$(shell which opm 2>/dev/null))`
`149`	`149`	`@{ \`
`150`	`150`	`set -e ;\`
`151`	`151`	`mkdir -p $(dir $(OPM)) ;\`
`152`		`- curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$(OS)-$(ARCH)-opm ;\`
	`152`	`+ curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$(OS)-$(ARCH)-opm ;\`
`153`	`153`	`chmod +x $(OPM) ;\`
`154`	`154`	`}`
`155`	`155`	`else`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ ifeq (,$(shell which opm 2>/dev/null))`
`190`	`190`	`set -e ;\`
`191`	`191`	`mkdir -p $(dir $(OPM)) ;\`
`192`	`192`	`OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \`
`193`		`- curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$${OS}-$${ARCH}-opm ;\`
	`193`	`+ curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$${OS}-$${ARCH}-opm ;\`
`194`	`194`	`chmod +x $(OPM) ;\`
`195`	`195`	`}`
`196`	`196`	`else`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ ifeq (,$(shell which opm 2>/dev/null))`
`189`	`189`	`set -e ;\`
`190`	`190`	`mkdir -p $(dir $(OPM)) ;\`
`191`	`191`	`OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \`
`192`		`- curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$${OS}-$${ARCH}-opm ;\`
	`192`	`+ curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$${OS}-$${ARCH}-opm ;\`
`193`	`193`	`chmod +x $(OPM) ;\`
`194`	`194`	`}`
`195`	`195`	`else`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ ifeq (,$(shell which opm 2>/dev/null))`
`178`	`178`	`@{ \`
`179`	`179`	`set -e ;\`
`180`	`180`	`mkdir -p $(dir $(OPM)) ;\`
`181`		`- curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$(OS)-$(ARCH)-opm ;\`
	`181`	`+ curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$(OS)-$(ARCH)-opm ;\`
`182`	`182`	`chmod +x $(OPM) ;\`
`183`	`183`	`}`
`184`	`184`	`else`