Skip to content

Commit 09e8145

Browse files
Release PR for Patch release v1.9.1 (#5084)
* Release v1.9.1 Signed-off-by: laxmikantbpandhare <[email protected]> * testdata Signed-off-by: laxmikantbpandhare <[email protected]> * modified change log Signed-off-by: laxmikantbpandhare <[email protected]>
1 parent cfbb076 commit 09e8145

File tree

23 files changed

+67
-92
lines changed

23 files changed

+67
-92
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SHELL = /bin/bash
44
# This value must be updated to the release tag of the most recent release, a change that must
55
# occur in the release commit. IMAGE_VERSION will be removed once each subproject that uses this
66
# version is moved to a separate repo and release process.
7-
export IMAGE_VERSION = v1.9.0
7+
export IMAGE_VERSION = v1.9.1
88
# Build-time variables to inject into binaries
99
export SIMPLE_VERSION = $(shell (test "$(shell git describe)" = "$(shell git describe --abbrev=0)" && echo $(shell git describe)) || echo $(shell git describe --abbrev=0)+git)
1010
export GIT_VERSION = $(shell git describe --dirty --tags --always)

changelog/fragments/generate-bundle-fix.yaml

-17
This file was deleted.

changelog/fragments/helm-deepequals.yaml

-4
This file was deleted.

changelog/fragments/modify-default-channel.yaml

-17
This file was deleted.

changelog/generated/v1.9.1.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## v1.9.1
2+
3+
### Bug Fixes
4+
5+
- Fixed the `operator-sdk generate bundle` command to specify the right path of bundle metadata in bundle.Dockerfile. ([#5035](https://github.com/operator-framework/operator-sdk/pull/5035))
6+
- For Helm-based operators, fixed release equality comparison such that number values are compared and not their types to avoid unnecessary reconciliations. ([#5046](https://github.com/operator-framework/operator-sdk/pull/5046))
7+
- In the `pkgman-to-bundle` command, changed the default channel name used for CSV's not specified in `package.yaml` to `defaultChannel` instead of "candidate". ([#5067](https://github.com/operator-framework/operator-sdk/pull/5067))

testdata/ansible/memcached-operator/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/operator-framework/ansible-operator:v1.9.0
1+
FROM quay.io/operator-framework/ansible-operator:v1.9.1
22

33
COPY requirements.yml ${HOME}/requirements.yml
44
RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \

testdata/ansible/memcached-operator/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ ifeq (,$(shell which ansible-operator 2>/dev/null))
109109
@{ \
110110
set -e ;\
111111
mkdir -p $(dir $(ANSIBLE_OPERATOR)) ;\
112-
curl -sSLo $(ANSIBLE_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.9.0/ansible-operator_$(OS)_$(ARCH) ;\
112+
curl -sSLo $(ANSIBLE_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.9.1/ansible-operator_$(OS)_$(ARCH) ;\
113113
chmod +x $(ANSIBLE_OPERATOR) ;\
114114
}
115115
else

testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@ stages:
88
- entrypoint:
99
- scorecard-test
1010
- basic-check-spec
11-
image: quay.io/operator-framework/scorecard-test:v1.9.0
11+
image: quay.io/operator-framework/scorecard-test:v1.9.1
1212
labels:
1313
suite: basic
1414
test: basic-check-spec-test
1515
- entrypoint:
1616
- scorecard-test
1717
- olm-bundle-validation
18-
image: quay.io/operator-framework/scorecard-test:v1.9.0
18+
image: quay.io/operator-framework/scorecard-test:v1.9.1
1919
labels:
2020
suite: olm
2121
test: olm-bundle-validation-test
2222
- entrypoint:
2323
- scorecard-test
2424
- olm-crds-have-validation
25-
image: quay.io/operator-framework/scorecard-test:v1.9.0
25+
image: quay.io/operator-framework/scorecard-test:v1.9.1
2626
labels:
2727
suite: olm
2828
test: olm-crds-have-validation-test
2929
- entrypoint:
3030
- scorecard-test
3131
- olm-crds-have-resources
32-
image: quay.io/operator-framework/scorecard-test:v1.9.0
32+
image: quay.io/operator-framework/scorecard-test:v1.9.1
3333
labels:
3434
suite: olm
3535
test: olm-crds-have-resources-test
3636
- entrypoint:
3737
- scorecard-test
3838
- olm-spec-descriptors
39-
image: quay.io/operator-framework/scorecard-test:v1.9.0
39+
image: quay.io/operator-framework/scorecard-test:v1.9.1
4040
labels:
4141
suite: olm
4242
test: olm-spec-descriptors-test
4343
- entrypoint:
4444
- scorecard-test
4545
- olm-status-descriptors
46-
image: quay.io/operator-framework/scorecard-test:v1.9.0
46+
image: quay.io/operator-framework/scorecard-test:v1.9.1
4747
labels:
4848
suite: olm
4949
test: olm-status-descriptors-test

testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- basic-check-spec
7-
image: quay.io/operator-framework/scorecard-test:v1.9.0
7+
image: quay.io/operator-framework/scorecard-test:v1.9.1
88
labels:
99
suite: basic
1010
test: basic-check-spec-test

testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- olm-bundle-validation
7-
image: quay.io/operator-framework/scorecard-test:v1.9.0
7+
image: quay.io/operator-framework/scorecard-test:v1.9.1
88
labels:
99
suite: olm
1010
test: olm-bundle-validation-test
@@ -14,7 +14,7 @@
1414
entrypoint:
1515
- scorecard-test
1616
- olm-crds-have-validation
17-
image: quay.io/operator-framework/scorecard-test:v1.9.0
17+
image: quay.io/operator-framework/scorecard-test:v1.9.1
1818
labels:
1919
suite: olm
2020
test: olm-crds-have-validation-test
@@ -24,7 +24,7 @@
2424
entrypoint:
2525
- scorecard-test
2626
- olm-crds-have-resources
27-
image: quay.io/operator-framework/scorecard-test:v1.9.0
27+
image: quay.io/operator-framework/scorecard-test:v1.9.1
2828
labels:
2929
suite: olm
3030
test: olm-crds-have-resources-test
@@ -34,7 +34,7 @@
3434
entrypoint:
3535
- scorecard-test
3636
- olm-spec-descriptors
37-
image: quay.io/operator-framework/scorecard-test:v1.9.0
37+
image: quay.io/operator-framework/scorecard-test:v1.9.1
3838
labels:
3939
suite: olm
4040
test: olm-spec-descriptors-test
@@ -44,7 +44,7 @@
4444
entrypoint:
4545
- scorecard-test
4646
- olm-status-descriptors
47-
image: quay.io/operator-framework/scorecard-test:v1.9.0
47+
image: quay.io/operator-framework/scorecard-test:v1.9.1
4848
labels:
4949
suite: olm
5050
test: olm-status-descriptors-test

testdata/go/v2/memcached-operator/bundle/tests/scorecard/config.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@ stages:
88
- entrypoint:
99
- scorecard-test
1010
- basic-check-spec
11-
image: quay.io/operator-framework/scorecard-test:v1.9.0
11+
image: quay.io/operator-framework/scorecard-test:v1.9.1
1212
labels:
1313
suite: basic
1414
test: basic-check-spec-test
1515
- entrypoint:
1616
- scorecard-test
1717
- olm-bundle-validation
18-
image: quay.io/operator-framework/scorecard-test:v1.9.0
18+
image: quay.io/operator-framework/scorecard-test:v1.9.1
1919
labels:
2020
suite: olm
2121
test: olm-bundle-validation-test
2222
- entrypoint:
2323
- scorecard-test
2424
- olm-crds-have-validation
25-
image: quay.io/operator-framework/scorecard-test:v1.9.0
25+
image: quay.io/operator-framework/scorecard-test:v1.9.1
2626
labels:
2727
suite: olm
2828
test: olm-crds-have-validation-test
2929
- entrypoint:
3030
- scorecard-test
3131
- olm-crds-have-resources
32-
image: quay.io/operator-framework/scorecard-test:v1.9.0
32+
image: quay.io/operator-framework/scorecard-test:v1.9.1
3333
labels:
3434
suite: olm
3535
test: olm-crds-have-resources-test
3636
- entrypoint:
3737
- scorecard-test
3838
- olm-spec-descriptors
39-
image: quay.io/operator-framework/scorecard-test:v1.9.0
39+
image: quay.io/operator-framework/scorecard-test:v1.9.1
4040
labels:
4141
suite: olm
4242
test: olm-spec-descriptors-test
4343
- entrypoint:
4444
- scorecard-test
4545
- olm-status-descriptors
46-
image: quay.io/operator-framework/scorecard-test:v1.9.0
46+
image: quay.io/operator-framework/scorecard-test:v1.9.1
4747
labels:
4848
suite: olm
4949
test: olm-status-descriptors-test

testdata/go/v2/memcached-operator/config/scorecard/patches/basic.config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- basic-check-spec
7-
image: quay.io/operator-framework/scorecard-test:v1.9.0
7+
image: quay.io/operator-framework/scorecard-test:v1.9.1
88
labels:
99
suite: basic
1010
test: basic-check-spec-test

testdata/go/v2/memcached-operator/config/scorecard/patches/olm.config.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- olm-bundle-validation
7-
image: quay.io/operator-framework/scorecard-test:v1.9.0
7+
image: quay.io/operator-framework/scorecard-test:v1.9.1
88
labels:
99
suite: olm
1010
test: olm-bundle-validation-test
@@ -14,7 +14,7 @@
1414
entrypoint:
1515
- scorecard-test
1616
- olm-crds-have-validation
17-
image: quay.io/operator-framework/scorecard-test:v1.9.0
17+
image: quay.io/operator-framework/scorecard-test:v1.9.1
1818
labels:
1919
suite: olm
2020
test: olm-crds-have-validation-test
@@ -24,7 +24,7 @@
2424
entrypoint:
2525
- scorecard-test
2626
- olm-crds-have-resources
27-
image: quay.io/operator-framework/scorecard-test:v1.9.0
27+
image: quay.io/operator-framework/scorecard-test:v1.9.1
2828
labels:
2929
suite: olm
3030
test: olm-crds-have-resources-test
@@ -34,7 +34,7 @@
3434
entrypoint:
3535
- scorecard-test
3636
- olm-spec-descriptors
37-
image: quay.io/operator-framework/scorecard-test:v1.9.0
37+
image: quay.io/operator-framework/scorecard-test:v1.9.1
3838
labels:
3939
suite: olm
4040
test: olm-spec-descriptors-test
@@ -44,7 +44,7 @@
4444
entrypoint:
4545
- scorecard-test
4646
- olm-status-descriptors
47-
image: quay.io/operator-framework/scorecard-test:v1.9.0
47+
image: quay.io/operator-framework/scorecard-test:v1.9.1
4848
labels:
4949
suite: olm
5050
test: olm-status-descriptors-test

testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@ stages:
88
- entrypoint:
99
- scorecard-test
1010
- basic-check-spec
11-
image: quay.io/operator-framework/scorecard-test:v1.9.0
11+
image: quay.io/operator-framework/scorecard-test:v1.9.1
1212
labels:
1313
suite: basic
1414
test: basic-check-spec-test
1515
- entrypoint:
1616
- scorecard-test
1717
- olm-bundle-validation
18-
image: quay.io/operator-framework/scorecard-test:v1.9.0
18+
image: quay.io/operator-framework/scorecard-test:v1.9.1
1919
labels:
2020
suite: olm
2121
test: olm-bundle-validation-test
2222
- entrypoint:
2323
- scorecard-test
2424
- olm-crds-have-validation
25-
image: quay.io/operator-framework/scorecard-test:v1.9.0
25+
image: quay.io/operator-framework/scorecard-test:v1.9.1
2626
labels:
2727
suite: olm
2828
test: olm-crds-have-validation-test
2929
- entrypoint:
3030
- scorecard-test
3131
- olm-crds-have-resources
32-
image: quay.io/operator-framework/scorecard-test:v1.9.0
32+
image: quay.io/operator-framework/scorecard-test:v1.9.1
3333
labels:
3434
suite: olm
3535
test: olm-crds-have-resources-test
3636
- entrypoint:
3737
- scorecard-test
3838
- olm-spec-descriptors
39-
image: quay.io/operator-framework/scorecard-test:v1.9.0
39+
image: quay.io/operator-framework/scorecard-test:v1.9.1
4040
labels:
4141
suite: olm
4242
test: olm-spec-descriptors-test
4343
- entrypoint:
4444
- scorecard-test
4545
- olm-status-descriptors
46-
image: quay.io/operator-framework/scorecard-test:v1.9.0
46+
image: quay.io/operator-framework/scorecard-test:v1.9.1
4747
labels:
4848
suite: olm
4949
test: olm-status-descriptors-test

testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- basic-check-spec
7-
image: quay.io/operator-framework/scorecard-test:v1.9.0
7+
image: quay.io/operator-framework/scorecard-test:v1.9.1
88
labels:
99
suite: basic
1010
test: basic-check-spec-test

testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- olm-bundle-validation
7-
image: quay.io/operator-framework/scorecard-test:v1.9.0
7+
image: quay.io/operator-framework/scorecard-test:v1.9.1
88
labels:
99
suite: olm
1010
test: olm-bundle-validation-test
@@ -14,7 +14,7 @@
1414
entrypoint:
1515
- scorecard-test
1616
- olm-crds-have-validation
17-
image: quay.io/operator-framework/scorecard-test:v1.9.0
17+
image: quay.io/operator-framework/scorecard-test:v1.9.1
1818
labels:
1919
suite: olm
2020
test: olm-crds-have-validation-test
@@ -24,7 +24,7 @@
2424
entrypoint:
2525
- scorecard-test
2626
- olm-crds-have-resources
27-
image: quay.io/operator-framework/scorecard-test:v1.9.0
27+
image: quay.io/operator-framework/scorecard-test:v1.9.1
2828
labels:
2929
suite: olm
3030
test: olm-crds-have-resources-test
@@ -34,7 +34,7 @@
3434
entrypoint:
3535
- scorecard-test
3636
- olm-spec-descriptors
37-
image: quay.io/operator-framework/scorecard-test:v1.9.0
37+
image: quay.io/operator-framework/scorecard-test:v1.9.1
3838
labels:
3939
suite: olm
4040
test: olm-spec-descriptors-test
@@ -44,7 +44,7 @@
4444
entrypoint:
4545
- scorecard-test
4646
- olm-status-descriptors
47-
image: quay.io/operator-framework/scorecard-test:v1.9.0
47+
image: quay.io/operator-framework/scorecard-test:v1.9.1
4848
labels:
4949
suite: olm
5050
test: olm-status-descriptors-test

testdata/helm/memcached-operator/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM quay.io/operator-framework/helm-operator:v1.9.0
2+
FROM quay.io/operator-framework/helm-operator:v1.9.1
33

44
ENV HOME=/opt/helm
55
COPY watches.yaml ${HOME}/watches.yaml

testdata/helm/memcached-operator/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ ifeq (,$(shell which helm-operator 2>/dev/null))
109109
@{ \
110110
set -e ;\
111111
mkdir -p $(dir $(HELM_OPERATOR)) ;\
112-
curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.9.0/helm-operator_$(OS)_$(ARCH) ;\
112+
curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.9.1/helm-operator_$(OS)_$(ARCH) ;\
113113
chmod +x $(HELM_OPERATOR) ;\
114114
}
115115
else

0 commit comments

Comments
 (0)