From c002780c4ec9a00201b1dc4ba5e58b00a1178121 Mon Sep 17 00:00:00 2001 From: OpenShift Cherrypick Robot Date: Thu, 1 Jul 2021 13:38:43 -0700 Subject: [PATCH 1/4] fix: specify the right path of metadata in bundle.Dockerfile (#5035) Signed-off-by: varshaprasad96 Co-authored-by: varshaprasad96 --- changelog/fragments/generate-bundle-fix.yaml | 17 +++++++++++++++++ internal/util/bundleutil/bundleutil.go | 8 +++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 changelog/fragments/generate-bundle-fix.yaml diff --git a/changelog/fragments/generate-bundle-fix.yaml b/changelog/fragments/generate-bundle-fix.yaml new file mode 100644 index 0000000000..88320363fc --- /dev/null +++ b/changelog/fragments/generate-bundle-fix.yaml @@ -0,0 +1,17 @@ +# entries is a list of entries to include in +# release notes and/or the migration guide +entries: + - description: > + Fixed the `operator-sdk generate bundle` command to specify the right path of bundle + metadata in bundle.Dcokerfile. + + # kind is one of: + # - addition + # - change + # - deprecation + # - removal + # - bugfix + kind: bugfix + + # Is this a breaking change? + breaking: false diff --git a/internal/util/bundleutil/bundleutil.go b/internal/util/bundleutil/bundleutil.go index eab231cfeb..a604c3c1f9 100644 --- a/internal/util/bundleutil/bundleutil.go +++ b/internal/util/bundleutil/bundleutil.go @@ -88,7 +88,7 @@ func (meta *BundleMetaData) GenerateMetadata() error { // Create annotation values for both bundle.Dockerfile and annotations.yaml, which should // hold the same set of values always. values := annotationsValues{ - BundleDir: filepath.Base(meta.BundleDir), + BundleDir: meta.BundleDir, PackageName: meta.PackageName, Channels: meta.Channels, DefaultChannel: meta.DefaultChannel, @@ -107,11 +107,13 @@ func (meta *BundleMetaData) GenerateMetadata() error { } dockerfilePath := defaultBundleDockerfilePath - // If migrating from packagemanifests to bundle, bundle.Docker file is present - // inside bundleDir, else its in the project directory. + // If migrating from packagemanifests to bundle, bundle.Dockerfile is present + // inside bundleDir, else its in the project directory. Hence dockerfile + // should have the path specified with respect to output directory of resulting bundles. // Remmove this, when pkgman-to-bundle migrate command is removed. if len(meta.PkgmanifestPath) != 0 { dockerfilePath = filepath.Join(filepath.Dir(meta.BundleDir), "bundle.Dockerfile") + values.BundleDir = filepath.Base(meta.BundleDir) } templateMap := map[string]*template.Template{ From 5714a46c2fc0b9a0c00cd1477c5facd7a5ebeca3 Mon Sep 17 00:00:00 2001 From: OpenShift Cherrypick Robot Date: Tue, 6 Jul 2021 14:53:25 -0700 Subject: [PATCH 2/4] fix:issue-5041 (#5046) Signed-off-by: cndoit18 Co-authored-by: cndoit18 --- changelog/fragments/helm-deepequals.yaml | 4 +++ internal/helm/release/manager.go | 40 +++++++++++++++++++----- internal/helm/release/manager_test.go | 25 ++++++++++++--- 3 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 changelog/fragments/helm-deepequals.yaml diff --git a/changelog/fragments/helm-deepequals.yaml b/changelog/fragments/helm-deepequals.yaml new file mode 100644 index 0000000000..0a331945a4 --- /dev/null +++ b/changelog/fragments/helm-deepequals.yaml @@ -0,0 +1,4 @@ +entries: + - description: > + For Helm-based operators, fixed release equality comparison such that number values are compared and not their types to avoid unnecessary reconciliations. + kind: bugfix \ No newline at end of file diff --git a/internal/helm/release/manager.go b/internal/helm/release/manager.go index 7ee19a0b3e..ffeb40b2c8 100644 --- a/internal/helm/release/manager.go +++ b/internal/helm/release/manager.go @@ -20,6 +20,7 @@ import ( "encoding/json" "errors" "fmt" + "reflect" "strings" jsonpatch "gomodules.xyz/jsonpatch/v3" @@ -126,8 +127,10 @@ func (m *manager) Sync(ctx context.Context) error { m.deployedRelease = deployedRelease m.isInstalled = true - m.isUpgradeRequired = m.isUpgrade(deployedRelease) - + m.isUpgradeRequired, err = m.isUpgrade(deployedRelease) + if err != nil { + return fmt.Errorf("failed to get upgrade status: %w", err) + } return nil } @@ -135,18 +138,41 @@ func notFoundErr(err error) bool { return err != nil && strings.Contains(err.Error(), "not found") } -func (m manager) isUpgrade(deployedRelease *rpb.Release) bool { +// This is caused by the different logic of loading from local and loading from secret +// For example, the Raw field, which has the tag `json:"-"`, causes the Unmarshal to be lost when it into Release +// We need to make them follow the JSON tag +// see: https://github.com/helm/helm/blob/cf0c6fed519d48101cd69ce01a355125215ee46f/pkg/storage/driver/util.go#L81 +func equalJSONStruct(a, b interface{}) (bool, error) { + if reflect.ValueOf(a).IsNil() || reflect.ValueOf(b).IsNil() { + return apiequality.Semantic.DeepEqual(a, b), nil + } + + aBuf, bBuf := &bytes.Buffer{}, &bytes.Buffer{} + err := json.NewEncoder(aBuf).Encode(a) + if err != nil { + return false, err + } + err = json.NewEncoder(bBuf).Encode(b) + return aBuf.String() == bBuf.String(), err +} + +func (m manager) isUpgrade(deployedRelease *rpb.Release) (bool, error) { if deployedRelease == nil { - return false + return false, nil } // Judging whether to skip updates skip := m.namespace == deployedRelease.Namespace skip = skip && m.releaseName == deployedRelease.Name - skip = skip && apiequality.Semantic.DeepEqual(m.chart, deployedRelease.Chart) - skip = skip && apiequality.Semantic.DeepEqual(m.values, deployedRelease.Config) - return !skip + ok, err := equalJSONStruct(m.chart, deployedRelease.Chart) + if err != nil { + return false, err + } + skip = skip && ok + + ok, err = equalJSONStruct(m.values, deployedRelease.Config) + return !(skip && ok), err } func (m manager) getDeployedRelease() (*rpb.Release, error) { diff --git a/internal/helm/release/manager_test.go b/internal/helm/release/manager_test.go index f930374e50..70c5e5b514 100644 --- a/internal/helm/release/manager_test.go +++ b/internal/helm/release/manager_test.go @@ -15,6 +15,8 @@ package release import ( + "bytes" + "encoding/json" "testing" "github.com/stretchr/testify/assert" @@ -247,11 +249,20 @@ func TestManagerisUpgrade(t *testing.T) { name: "different values", releaseName: "deployed", releaseNs: "deployed-ns", - values: map[string]interface{}{"key": "1"}, + values: map[string]interface{}{"key": "1", "int": int32(1)}, chart: newTestChart(t, "./testdata/simple"), - deployedRelease: newTestRelease(newTestChart(t, "./testdata/simple"), map[string]interface{}{"key": ""}, "deployed", "deployed-ns"), + deployedRelease: newTestRelease(newTestChart(t, "./testdata/simple"), map[string]interface{}{"key": "", "int": int64(1)}, "deployed", "deployed-ns"), want: true, }, + { + name: "nil values", + releaseName: "deployed", + releaseNs: "deployed-ns", + values: nil, + chart: newTestChart(t, "./testdata/simple"), + deployedRelease: newTestRelease(newTestChart(t, "./testdata/simple"), map[string]interface{}{}, "deployed", "deployed-ns"), + want: false, + }, } for _, test := range tests { t.Run(test.name, func(t *testing.T) { @@ -261,8 +272,9 @@ func TestManagerisUpgrade(t *testing.T) { values: test.values, chart: test.chart, } - isUpgrade := m.isUpgrade(test.deployedRelease) + isUpgrade, err := m.isUpgrade(test.deployedRelease) assert.Equal(t, test.want, isUpgrade) + assert.Equal(t, nil, err) }) } } @@ -273,13 +285,16 @@ func newTestChart(t *testing.T, path string) *cpb.Chart { return chart } -func newTestRelease(chart *cpb.Chart, values map[string]interface{}, name, namespace string) *rpb.Release { +func newTestRelease(chart *cpb.Chart, values map[string]interface{}, name, namespace string) *rpb.Release { // nolint: unparam release := rpb.Mock(&rpb.MockReleaseOptions{ Name: name, Namespace: namespace, - Chart: chart, Version: 1, }) + + buffer := &bytes.Buffer{} + _ = json.NewEncoder(buffer).Encode(chart) + _ = json.NewDecoder(buffer).Decode(release.Chart) release.Config = values return release } From cfbb076c08058ef8540611b6d9569c97732fa4f7 Mon Sep 17 00:00:00 2001 From: OpenShift Cherrypick Robot Date: Wed, 21 Jul 2021 10:22:37 -0700 Subject: [PATCH 3/4] modify default channels for previous versions of manifests (#5067) Previously, the versions of manifests other than the latest version, used to have the channel as `candidate`. This caused errors while running the bundle. With this commit, the channels for those manifests would be the defaultchannel specified in package.yaml. Signed-off-by: varshaprasad96 Co-authored-by: varshaprasad96 --- .../fragments/modify-default-channel.yaml | 17 ++++++++++++ .../cmd/operator-sdk/pkgmantobundle/cmd.go | 26 ++++++++----------- .../pkgmantobundle/pkgmantobundle_test.go | 16 +++++++----- 3 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 changelog/fragments/modify-default-channel.yaml diff --git a/changelog/fragments/modify-default-channel.yaml b/changelog/fragments/modify-default-channel.yaml new file mode 100644 index 0000000000..94b9e5197b --- /dev/null +++ b/changelog/fragments/modify-default-channel.yaml @@ -0,0 +1,17 @@ +# entries is a list of entries to include in +# release notes and/or the migration guide +entries: + - description: > + 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". + + # kind is one of: + # - addition + # - change + # - deprecation + # - removal + # - bugfix + kind: "bugfix" + + # Is this a breaking change? + breaking: false diff --git a/internal/cmd/operator-sdk/pkgmantobundle/cmd.go b/internal/cmd/operator-sdk/pkgmantobundle/cmd.go index 9d614abfdc..b2c0d3f8ad 100644 --- a/internal/cmd/operator-sdk/pkgmantobundle/cmd.go +++ b/internal/cmd/operator-sdk/pkgmantobundle/cmd.go @@ -182,7 +182,7 @@ func (p *pkgManToBundleCmd) run() (err error) { for _, dir := range directories { if dir.IsDir() { // this is required to extract project layout and SDK version information. - otherLabels, channels, err := getSDKStampsAndChannels(filepath.Join(p.pkgmanifestDir, dir.Name()), channelsByCSV) + otherLabels, channels, err := getSDKStampsAndChannels(filepath.Join(p.pkgmanifestDir, dir.Name()), defaultChannel, channelsByCSV) if err != nil { return fmt.Errorf("error getting CSV from provided packagemanifest %v", err) } @@ -268,7 +268,7 @@ func getScorecardConfigPath(inputDir string) (string, error) { return scorecardConfigPath, nil } -func getSDKStampsAndChannels(path string, channelsByCSV map[string][]string) (map[string]string, string, error) { +func getSDKStampsAndChannels(path, defaultChannel string, channelsByCSV map[string][]string) (map[string]string, string, error) { bundle, err := apimanifests.GetBundleFromDir(path) if err != nil { return nil, "", err @@ -280,7 +280,7 @@ func getSDKStampsAndChannels(path string, channelsByCSV map[string][]string) (ma } // Find channels matching the CSV names - channels := getChannelsByCSV(bundle, channelsByCSV) + channels := getChannelsByCSV(bundle, channelsByCSV, defaultChannel) return sdkLabels, channels, nil } @@ -308,23 +308,18 @@ func getSDKStamps(bundle *apimanifests.Bundle) (map[string]string, error) { return sdkLabels, nil } -// getChannelsByCSV creates a list for channels for the currentCSV, -func getChannelsByCSV(bundle *apimanifests.Bundle, channelsByCSV map[string][]string) (channels string) { +// getChannelsByCSV creates a list for channels for the currentCSV. For other versions of manifests which +// are not present in the manifest, the defaultChannel is added. +func getChannelsByCSV(bundle *apimanifests.Bundle, channelsByCSV map[string][]string, defaultChannel string) (channels string) { // Find channels matching the CSV names - var channelNames []string - for csv, ch := range channelsByCSV { - if csv == bundle.CSV.GetName() { - channelNames = ch - break - } - } + channelNames := channelsByCSV[bundle.CSV.GetName()] channels = strings.Join(channelNames, ",") // TODO: verify if we have to add this validation since while building bundles if channel is not specified // we add the default channel. if channels == "" { - channels = "candidate" - log.Infof("Supported channels cannot be identified from CSV %s, using default channel 'preview'", bundle.CSV.GetName()) + channels = defaultChannel + log.Infof("Supported channels cannot be identified from CSV %s, using default channel %s", bundle.CSV.GetName(), defaultChannel) } return channels @@ -339,7 +334,8 @@ func getPackageMetadata(pkg *apimanifests.PackageManifest) (packagename, default defaultChannel = pkg.DefaultChannelName if defaultChannel == "" { - defaultChannel = "candidate" + err = fmt.Errorf("cannot find the default channel for package %q", packagename) + return } channelsByCSV = make(map[string][]string) diff --git a/internal/cmd/operator-sdk/pkgmantobundle/pkgmantobundle_test.go b/internal/cmd/operator-sdk/pkgmantobundle/pkgmantobundle_test.go index 2a8159b47b..578b3e8453 100644 --- a/internal/cmd/operator-sdk/pkgmantobundle/pkgmantobundle_test.go +++ b/internal/cmd/operator-sdk/pkgmantobundle/pkgmantobundle_test.go @@ -164,19 +164,21 @@ var _ = Describe("Running pkgmanToBundle command", func() { }, } + defaultChannel := "gamma" + It("should get the list of channels for corresponding CSV", func() { channels := map[string][]string{ "memcached-operator:0.0.1": {"alpha", "beta"}, } - ch := getChannelsByCSV(&bundle, channels) + ch := getChannelsByCSV(&bundle, channels, defaultChannel) Expect(ch).To(BeEquivalentTo("alpha,beta")) }) It("if no channel is provided, default to candidate", func() { channels := map[string][]string{} - ch := getChannelsByCSV(&bundle, channels) - Expect(ch).To(BeEquivalentTo("candidate")) + ch := getChannelsByCSV(&bundle, channels, defaultChannel) + Expect(ch).To(BeEquivalentTo(defaultChannel)) }) }) }) @@ -224,11 +226,11 @@ var _ = Describe("Running pkgmanToBundle command", func() { Expect(err.Error()).To(ContainSubstring("cannot find packagename from the manifest directory")) }) - It("should assign default channel name of not provided", func() { + It("should error when defaultChannel name is empty", func() { pkg.DefaultChannelName = "" - _, defaultChannel, _, err := getPackageMetadata(&pkg) - Expect(err).NotTo(HaveOccurred()) - Expect(defaultChannel).To(BeEquivalentTo("candidate")) + _, _, _, err := getPackageMetadata(&pkg) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("cannot find the default channel for package")) }) }) }) From 09e8145153199a31a76886568348122afe4f4600 Mon Sep 17 00:00:00 2001 From: Laxmikant Bhaskar Pandhare <47066536+laxmikantbpandhare@users.noreply.github.com> Date: Fri, 23 Jul 2021 10:12:11 -0700 Subject: [PATCH 4/4] Release PR for Patch release v1.9.1 (#5084) * Release v1.9.1 Signed-off-by: laxmikantbpandhare * testdata Signed-off-by: laxmikantbpandhare * modified change log Signed-off-by: laxmikantbpandhare --- Makefile | 2 +- changelog/fragments/generate-bundle-fix.yaml | 17 ----------------- changelog/fragments/helm-deepequals.yaml | 4 ---- changelog/fragments/modify-default-channel.yaml | 17 ----------------- changelog/generated/v1.9.1.md | 7 +++++++ testdata/ansible/memcached-operator/Dockerfile | 2 +- testdata/ansible/memcached-operator/Makefile | 2 +- .../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 +++++----- .../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 | 2 +- .../bundle/tests/scorecard/config.yaml | 12 ++++++------ .../config/scorecard/patches/basic.config.yaml | 2 +- .../config/scorecard/patches/olm.config.yaml | 10 +++++----- website/content/en/docs/installation/_index.md | 2 +- .../en/docs/upgrading-sdk-version/v1.9.1.md | 6 ++++++ 23 files changed, 67 insertions(+), 92 deletions(-) delete mode 100644 changelog/fragments/generate-bundle-fix.yaml delete mode 100644 changelog/fragments/helm-deepequals.yaml delete mode 100644 changelog/fragments/modify-default-channel.yaml create mode 100644 changelog/generated/v1.9.1.md create mode 100644 website/content/en/docs/upgrading-sdk-version/v1.9.1.md diff --git a/Makefile b/Makefile index cb752b1632..61205c54f9 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.9.0 +export IMAGE_VERSION = v1.9.1 # 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/changelog/fragments/generate-bundle-fix.yaml b/changelog/fragments/generate-bundle-fix.yaml deleted file mode 100644 index 88320363fc..0000000000 --- a/changelog/fragments/generate-bundle-fix.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - Fixed the `operator-sdk generate bundle` command to specify the right path of bundle - metadata in bundle.Dcokerfile. - - # kind is one of: - # - addition - # - change - # - deprecation - # - removal - # - bugfix - kind: bugfix - - # Is this a breaking change? - breaking: false diff --git a/changelog/fragments/helm-deepequals.yaml b/changelog/fragments/helm-deepequals.yaml deleted file mode 100644 index 0a331945a4..0000000000 --- a/changelog/fragments/helm-deepequals.yaml +++ /dev/null @@ -1,4 +0,0 @@ -entries: - - description: > - For Helm-based operators, fixed release equality comparison such that number values are compared and not their types to avoid unnecessary reconciliations. - kind: bugfix \ No newline at end of file diff --git a/changelog/fragments/modify-default-channel.yaml b/changelog/fragments/modify-default-channel.yaml deleted file mode 100644 index 94b9e5197b..0000000000 --- a/changelog/fragments/modify-default-channel.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - 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". - - # kind is one of: - # - addition - # - change - # - deprecation - # - removal - # - bugfix - kind: "bugfix" - - # Is this a breaking change? - breaking: false diff --git a/changelog/generated/v1.9.1.md b/changelog/generated/v1.9.1.md new file mode 100644 index 0000000000..4d23f25537 --- /dev/null +++ b/changelog/generated/v1.9.1.md @@ -0,0 +1,7 @@ +## v1.9.1 + +### Bug Fixes + +- 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)) +- 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)) +- 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)) diff --git a/testdata/ansible/memcached-operator/Dockerfile b/testdata/ansible/memcached-operator/Dockerfile index 8c99010c19..fe541f0596 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.9.0 +FROM quay.io/operator-framework/ansible-operator:v1.9.1 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 7e11437e0d..5e4c3a9981 100644 --- a/testdata/ansible/memcached-operator/Makefile +++ b/testdata/ansible/memcached-operator/Makefile @@ -109,7 +109,7 @@ ifeq (,$(shell which ansible-operator 2>/dev/null)) @{ \ set -e ;\ mkdir -p $(dir $(ANSIBLE_OPERATOR)) ;\ - curl -sSLo $(ANSIBLE_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.9.0/ansible-operator_$(OS)_$(ARCH) ;\ + curl -sSLo $(ANSIBLE_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.9.1/ansible-operator_$(OS)_$(ARCH) ;\ chmod +x $(ANSIBLE_OPERATOR) ;\ } else diff --git a/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml index 37f7e03468..73c94680e1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: basic test: basic-check-spec-test - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-bundle-validation-test - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-crds-have-validation-test - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-crds-have-resources-test - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-spec-descriptors-test - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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 a32ceaa7c8..deee61f3af 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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 92e3e4129d..0054eb4e06 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v2/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/go/v2/memcached-operator/bundle/tests/scorecard/config.yaml index 37f7e03468..73c94680e1 100644 --- a/testdata/go/v2/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/go/v2/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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: basic test: basic-check-spec-test - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-bundle-validation-test - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-crds-have-validation-test - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-crds-have-resources-test - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-spec-descriptors-test - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v2/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/go/v2/memcached-operator/config/scorecard/patches/basic.config.yaml index a32ceaa7c8..deee61f3af 100644 --- a/testdata/go/v2/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/go/v2/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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/go/v2/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/go/v2/memcached-operator/config/scorecard/patches/olm.config.yaml index 92e3e4129d..0054eb4e06 100644 --- a/testdata/go/v2/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/go/v2/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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml index 37f7e03468..73c94680e1 100644 --- a/testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/go/v3/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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: basic test: basic-check-spec-test - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-bundle-validation-test - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-crds-have-validation-test - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-crds-have-resources-test - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-spec-descriptors-test - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml index a32ceaa7c8..deee61f3af 100644 --- a/testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/go/v3/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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml index 92e3e4129d..0054eb4e06 100644 --- a/testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/go/v3/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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/helm/memcached-operator/Dockerfile b/testdata/helm/memcached-operator/Dockerfile index c32bc9b4f2..49f6302ab1 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.9.0 +FROM quay.io/operator-framework/helm-operator:v1.9.1 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 7c2c63c932..23220bda85 100644 --- a/testdata/helm/memcached-operator/Makefile +++ b/testdata/helm/memcached-operator/Makefile @@ -109,7 +109,7 @@ ifeq (,$(shell which helm-operator 2>/dev/null)) @{ \ set -e ;\ mkdir -p $(dir $(HELM_OPERATOR)) ;\ - curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.9.0/helm-operator_$(OS)_$(ARCH) ;\ + curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.9.1/helm-operator_$(OS)_$(ARCH) ;\ chmod +x $(HELM_OPERATOR) ;\ } else diff --git a/testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml index 37f7e03468..73c94680e1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: basic test: basic-check-spec-test - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-bundle-validation-test - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-crds-have-validation-test - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-crds-have-resources-test - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-spec-descriptors-test - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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 a32ceaa7c8..deee61f3af 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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 92e3e4129d..0054eb4e06 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 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.9.0 + image: quay.io/operator-framework/scorecard-test:v1.9.1 labels: suite: olm test: olm-status-descriptors-test diff --git a/website/content/en/docs/installation/_index.md b/website/content/en/docs/installation/_index.md index a71c6af935..65c996a92f 100644 --- a/website/content/en/docs/installation/_index.md +++ b/website/content/en/docs/installation/_index.md @@ -36,7 +36,7 @@ export OS=$(uname | awk '{print tolower($0)}') Download the binary for your platform: ```sh -export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/v1.9.0 +export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/v1.9.1 curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} ``` diff --git a/website/content/en/docs/upgrading-sdk-version/v1.9.1.md b/website/content/en/docs/upgrading-sdk-version/v1.9.1.md new file mode 100644 index 0000000000..c7251a2ff7 --- /dev/null +++ b/website/content/en/docs/upgrading-sdk-version/v1.9.1.md @@ -0,0 +1,6 @@ +--- +title: v1.9.1 +weight: 998990999 +--- + +There are no migrations for this release! :tada: