Skip to content

Commit 262dc19

Browse files
committed
Upgrade OPM version to v1.18 and update 00-template.yaml
1 parent 737d91b commit 262dc19

File tree

8 files changed

+9
-17
lines changed

8 files changed

+9
-17
lines changed

changelog/fragments/00-template.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,15 @@
22
# release notes and/or the migration guide
33
entries:
44
- description: >
5-
Description is the line that shows up in the CHANGELOG. This
6-
should be formatted as markdown and be on a single line. Using
7-
the YAML string '>' operator means you can write your entry
8-
multiple lines and it will still be parsed as a single line.
9-
10-
If an operator type's plugin is being changed then prefix the description with
11-
"(<operator language>/<plugin version>)", ex. "(go/v2)".
12-
If an operator type's runtime is being changed, use then prefix the description
13-
with "For <operator language>-based operators,", ex. "For Go-based operators".
5+
Upgrade OPM version that is used by default in the generated Makefile so `make catalog-build` also works on OSX.
146
157
# kind is one of:
168
# - addition
179
# - change
1810
# - deprecation
1911
# - removal
2012
# - bugfix
21-
kind: ""
13+
kind: "change"
2214
2315
# Is this a breaking change?
2416
breaking: false

internal/plugins/manifests/v2/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232

3333
// Version of `opm` to download and use for building index images.
3434
// This version's release artifacts *must* contain a binary for multiple arches; certain releases do not.
35-
const opmVersion = "v1.17.5"
35+
const opmVersion = "v1.18"
3636

3737
const filePath = "Makefile"
3838

testdata/ansible/memcached-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ ifeq (,$(shell which opm 2>/dev/null))
140140
@{ \
141141
set -e ;\
142142
mkdir -p $(dir $(OPM)) ;\
143-
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.17.5/$(OS)-$(ARCH)-opm ;\
143+
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.18/$(OS)-$(ARCH)-opm ;\
144144
chmod +x $(OPM) ;\
145145
}
146146
else

testdata/go/v2/memcached-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ ifeq (,$(shell which opm 2>/dev/null))
169169
set -e ;\
170170
mkdir -p $(dir $(OPM)) ;\
171171
OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
172-
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.17.5/$${OS}-$${ARCH}-opm ;\
172+
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.18/$${OS}-$${ARCH}-opm ;\
173173
chmod +x $(OPM) ;\
174174
}
175175
else

testdata/go/v3/memcached-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ ifeq (,$(shell which opm 2>/dev/null))
169169
set -e ;\
170170
mkdir -p $(dir $(OPM)) ;\
171171
OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
172-
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.17.5/$${OS}-$${ARCH}-opm ;\
172+
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.18/$${OS}-$${ARCH}-opm ;\
173173
chmod +x $(OPM) ;\
174174
}
175175
else

testdata/helm/memcached-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ ifeq (,$(shell which opm 2>/dev/null))
140140
@{ \
141141
set -e ;\
142142
mkdir -p $(dir $(OPM)) ;\
143-
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.17.5/$(OS)-$(ARCH)-opm ;\
143+
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.18/$(OS)-$(ARCH)-opm ;\
144144
chmod +x $(OPM) ;\
145145
}
146146
else

website/content/en/docs/upgrading-sdk-version/v1.6.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ ifeq (,$(shell which opm 2>/dev/null))
178178
@{ \
179179
set -e ;\
180180
mkdir -p $(dir $(OPM)) ;\
181-
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.17.5/$(OS)-$(ARCH)-opm ;\
181+
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.18/$(OS)-$(ARCH)-opm ;\
182182
chmod +x $(OPM) ;\
183183
}
184184
else

website/content/en/docs/upgrading-sdk-version/v1.6.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ ifeq (,$(shell which opm 2>/dev/null))
178178
@{ \
179179
set -e ;\
180180
mkdir -p $(dir $(OPM)) ;\
181-
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.17.5/$(OS)-$(ARCH)-opm ;\
181+
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.18/$(OS)-$(ARCH)-opm ;\
182182
chmod +x $(OPM) ;\
183183
}
184184
else

0 commit comments

Comments
 (0)