diff --git a/Makefile b/Makefile index ba46fb9617..d9cf678548 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.30.0 +export IMAGE_VERSION = v1.31.0 # Build-time variables to inject into binaries export SIMPLE_VERSION = $(shell (test "$(shell git describe --tags)" = "$(shell git describe --tags --abbrev=0)" && echo $(shell git describe --tags)) || echo $(shell git describe --tags --abbrev=0)+git) export GIT_VERSION = $(shell git describe --dirty --tags --always) diff --git a/changelog/fragments/01-ansible-bump.yaml b/changelog/fragments/01-ansible-bump.yaml deleted file mode 100644 index 3faff4d38f..0000000000 --- a/changelog/fragments/01-ansible-bump.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - (ansible): Update the `quay.io/operator-framework/ansible-operator` base image to now use Ansible 2.15.0. - Removes pre-installed Python modules that are not required to build and run the `testdata/ansible/memcached-operator` sample. - Updates Python to 3.9 to work with Ansible 2.15.0 - kind: "change" - breaking: false - - # Migration can be defined to automatically add a section to - # the migration guide. This is required for breaking changes. - migration: - header: Updating an Ansible Operator to use the updated Ansible 2.15.0 image - body: | - 1. Update the `FROM` directive in the `Dockerfile` to have a version tag > `v1.30.0` - 2. Evaluate your dependency requirements. The change to Ansible 2.15.0 also included removal of some pre-installed Python modules. You may need to update your `Dockerfile` to `pip install` modules required by your operator. - - description: > - (ansible/v1): Updates the `ansible/v1` plugin scaffolding to: - - Remove the `community.kubernetes` collection - - Update the `operator_sdk.util` collection from `v0.4.0` --> `v0.5.0` - - Update the `molecule.yaml` files to work with `molecule v5.1.0` - kind: "change" - breaking: false - - # Migration can be defined to automatically add a section to - # the migration guide. This is required for breaking changes. - migration: - header: Upgrading an Ansible Operator project to match the latest `ansible/v1` plugin changes - body: | - 1. In the `requirements.yml` file: - - Remove the `community.kubernetes` collection entry - - Update the version of the `operator_sdk.util` collection entry to `v0.5.0` - 2. In the `molecule/kind/molecule.yml` and `molecule/default/molecule.yml` files: - - Remove all instances of the `lint` field. For an example of the diff, see: https://github.com/operator-framework/operator-sdk/pull/6483/files#diff-f159b0d7ec17de90f5b5c297ce997254e6ea4001269167be25615c45c489539e - - description: > - (ansible): Remove the `quay.io/operator-framework/ansible-operator-2.11-preview` image. This image will no longer be built after Operator-SDK v1.30.0. - kind: "removal" - breaking: false - - # Migration can be defined to automatically add a section to - # the migration guide. This is required for breaking changes. - migration: - header: Migrating away from the `quay.io/operator-framework/ansible-operator-2.11-preview` base image - body: | - 1. Update the `FROM` directive in the `Dockerfile` to use the base image `quay.io/operator-framework/ansible-operator:vX.Y.Z` where `vX.Y.Z` is > `v1.30.0` \ No newline at end of file diff --git a/changelog/fragments/02-olm-install-retry.yaml b/changelog/fragments/02-olm-install-retry.yaml deleted file mode 100644 index 31e374b3e4..0000000000 --- a/changelog/fragments/02-olm-install-retry.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - Fix a bug where `olm install` command is failed fo "no-match" error. - - The output in this case is something like: - - ``` - $ operator-sdk olm install --verbose - ... - FATA[0001] Failed to install OLM version "latest": failed to create CRDs and resources: no matches for kind "OLMConfig" in version "operators.coreos.com/v1" - ``` - - Now, in this case, operator-sdk tries to create the resource again, until it succeed (or until the timeout exceeded). - - kind: "bugfix" - - # Is this a breaking change? - breaking: false diff --git a/changelog/fragments/03-run-bundle-cmd.yaml b/changelog/fragments/03-run-bundle-cmd.yaml deleted file mode 100644 index c8671f7138..0000000000 --- a/changelog/fragments/03-run-bundle-cmd.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - Fix a bug where `run bundle` command does not copy all FBC manifests into the new catalog image if custom index-image is passed. - - kind: "bugfix" - - # Is this a breaking change? - breaking: false diff --git a/changelog/fragments/05-template.yaml b/changelog/fragments/05-template.yaml deleted file mode 100644 index a9a7930b30..0000000000 --- a/changelog/fragments/05-template.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - (helm): Use informer to list helm secrets to improve performance - - # kind is one of: - # - addition - # - change - # - deprecation - # - removal - # - bugfix - kind: "change" - - # Is this a breaking change? - breaking: false - - # NOTE: ONLY USE `pull_request_override` WHEN ADDING THIS - # FILE FOR A PREVIOUSLY MERGED PULL_REQUEST! - # - # The generator auto-detects the PR number from the commit - # message in which this file was originally added. - # - # What is the pull request number (without the "#")? - # pull_request_override: 0 - - - # Migration can be defined to automatically add a section to - # the migration guide. This is required for breaking changes. - migration: - header: Require `watch` on `secrets` - body: | - The operator now requires the watch operation on secrets. - When using a custom ServiceAccount for deployment, the following additional role is now required: - ``` - rules: - - apiGroups: - - "" - resources: - - secrets - verbs: - - watch - ``` diff --git a/changelog/fragments/10-mark-unsafe.yaml b/changelog/fragments/10-mark-unsafe.yaml deleted file mode 100644 index 1be431ff0a..0000000000 --- a/changelog/fragments/10-mark-unsafe.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - markUnsafe now correctly marks as unsafe the spec extra variable. - - # kind is one of: - # - addition - # - change - # - deprecation - # - removal - # - bugfix - kind: "bugfix" - - # Is this a breaking change? - breaking: false - - # NOTE: ONLY USE `pull_request_override` WHEN ADDING THIS - # FILE FOR A PREVIOUSLY MERGED PULL_REQUEST! - # - # The generator auto-detects the PR number from the commit - # message in which this file was originally added. - # - # What is the pull request number (without the "#")? - # pull_request_override: 0 diff --git a/changelog/fragments/doc info.yaml b/changelog/fragments/doc info.yaml deleted file mode 100644 index 5700d217ab..0000000000 --- a/changelog/fragments/doc info.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - Updated Reference from " to_be_owned.namespace" to " to_be_owned.metadata.namespace " at line 186. - # kind is one of: - # - addition - # - change - # - deprecation - # - removal - # - bugfix - kind: "change" - - # Is this a breaking change? - breaking: false \ No newline at end of file diff --git a/changelog/generated/v1.31.0.md b/changelog/generated/v1.31.0.md new file mode 100644 index 0000000000..3adaa2b253 --- /dev/null +++ b/changelog/generated/v1.31.0.md @@ -0,0 +1,20 @@ +## v1.31.0 + +### Changes + +- (ansible): Update the `quay.io/operator-framework/ansible-operator` base image to now use Ansible 2.15.0. Removes pre-installed Python modules that are not required to build and run the `testdata/ansible/memcached-operator` sample. Updates Python to 3.9 to work with Ansible 2.15.0. ([#6483](https://github.com/operator-framework/operator-sdk/pull/6483)) +- (ansible/v1): Updates the `ansible/v1` plugin scaffolding to: - Remove the `community.kubernetes` collection - Update the `operator_sdk.util` collection from `v0.4.0` --> `v0.5.0` - Update the `molecule.yaml` files to work with `molecule v5.1.0`. ([#6483](https://github.com/operator-framework/operator-sdk/pull/6483)) +- (helm): Use informer to list helm secrets to improve performance. ([#6354](https://github.com/operator-framework/operator-sdk/pull/6354)) +- Updated Reference from "to_be_owned.namespace" to "to_be_owned.metadata.namespace " in the ansible reference documentation. ([#6409](https://github.com/operator-framework/operator-sdk/pull/6409)) + +### Removals + +- (ansible): Remove the `quay.io/operator-framework/ansible-operator-2.11-preview` image. This image will no longer be built after Operator-SDK v1.30.0. ([#6483](https://github.com/operator-framework/operator-sdk/pull/6483)) + +### Bug Fixes + +- Fix a bug where `olm install` command is failed for "no-match" error. +The output in this case is something like: +```$ operator-sdk olm install --verbose ... FATA[0001] Failed to install OLM version "latest": failed to create CRDs and resources: no matches for kind "OLMConfig" in version "operators.coreos.com/v1"```. Now, in this case, operator-sdk tries to create the resource again, until it succeeds (or until the timeout exceeded). ([#6490](https://github.com/operator-framework/operator-sdk/pull/6490)) +- Fix a bug where `run bundle` command does not copy all FBC manifests into the new catalog image if custom index-image is passed. ([#6512](https://github.com/operator-framework/operator-sdk/pull/6512)) +- `markUnsafe` now correctly marks as unsafe the all variables passed in `spec`. ([#6376](https://github.com/operator-framework/operator-sdk/pull/6376)) diff --git a/testdata/ansible/memcached-operator/Dockerfile b/testdata/ansible/memcached-operator/Dockerfile index 4fb6c381da..fe7cfbfa72 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.30.0 +FROM quay.io/operator-framework/ansible-operator:v1.31.0 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 e7aee606fb..8f7a290a2e 100644 --- a/testdata/ansible/memcached-operator/Makefile +++ b/testdata/ansible/memcached-operator/Makefile @@ -151,7 +151,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.30.0/ansible-operator_$(OS)_$(ARCH) ;\ + curl -sSLo $(ANSIBLE_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.31.0/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 104883e28b..0c0690cc47 100644 --- a/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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 c95b4ec130..04b59f3a91 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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 f6607c2d03..8f1c9521cd 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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 104883e28b..0c0690cc47 100644 --- a/testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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 c95b4ec130..04b59f3a91 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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 f6607c2d03..8f1c9521cd 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v3/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/go/v3/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml index 104883e28b..0c0690cc47 100644 --- a/testdata/go/v3/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/go/v3/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v3/monitoring/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/go/v3/monitoring/memcached-operator/config/scorecard/patches/basic.config.yaml index c95b4ec130..04b59f3a91 100644 --- a/testdata/go/v3/monitoring/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/go/v3/monitoring/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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/go/v3/monitoring/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/go/v3/monitoring/memcached-operator/config/scorecard/patches/olm.config.yaml index f6607c2d03..8f1c9521cd 100644 --- a/testdata/go/v3/monitoring/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/go/v3/monitoring/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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v4-alpha/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/go/v4-alpha/memcached-operator/bundle/tests/scorecard/config.yaml index 104883e28b..0c0690cc47 100644 --- a/testdata/go/v4-alpha/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/go/v4-alpha/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/basic.config.yaml index c95b4ec130..04b59f3a91 100644 --- a/testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/go/v4-alpha/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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/olm.config.yaml index f6607c2d03..8f1c9521cd 100644 --- a/testdata/go/v4-alpha/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/go/v4-alpha/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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v4-alpha/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/go/v4-alpha/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml index 104883e28b..0c0690cc47 100644 --- a/testdata/go/v4-alpha/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/go/v4-alpha/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v4-alpha/monitoring/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/go/v4-alpha/monitoring/memcached-operator/config/scorecard/patches/basic.config.yaml index c95b4ec130..04b59f3a91 100644 --- a/testdata/go/v4-alpha/monitoring/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/go/v4-alpha/monitoring/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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/go/v4-alpha/monitoring/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/go/v4-alpha/monitoring/memcached-operator/config/scorecard/patches/olm.config.yaml index f6607c2d03..8f1c9521cd 100644 --- a/testdata/go/v4-alpha/monitoring/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/go/v4-alpha/monitoring/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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/helm/memcached-operator/Dockerfile b/testdata/helm/memcached-operator/Dockerfile index 85e54df645..bdb4a982ff 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.30.0 +FROM quay.io/operator-framework/helm-operator:v1.31.0 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 5edeb8343f..7f51daee8f 100644 --- a/testdata/helm/memcached-operator/Makefile +++ b/testdata/helm/memcached-operator/Makefile @@ -150,7 +150,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.30.0/helm-operator_$(OS)_$(ARCH) ;\ + curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.31.0/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 104883e28b..0c0690cc47 100644 --- a/testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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 c95b4ec130..04b59f3a91 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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 f6607c2d03..8f1c9521cd 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 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.30.0 + image: quay.io/operator-framework/scorecard-test:v1.31.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/website/config.toml b/website/config.toml index 406515399b..123eb4d84e 100644 --- a/website/config.toml +++ b/website/config.toml @@ -107,6 +107,12 @@ url_latest_version = "https://sdk.operatorframework.io" ##RELEASE_ADDME## +[[params.versions]] + version = "v1.31" + url = "https://v1-31-x.sdk.operatorframework.io" + kube_version = "1.26.0" + client_go_version = "v0.26.2" + [[params.versions]] version = "v1.30" url = "https://v1-30-x.sdk.operatorframework.io" diff --git a/website/content/en/docs/installation/_index.md b/website/content/en/docs/installation/_index.md index cd92f7c4b7..508e66bde6 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.30.0 +export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/v1.31.0 curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} ``` diff --git a/website/content/en/docs/upgrading-sdk-version/v1.31.0.md b/website/content/en/docs/upgrading-sdk-version/v1.31.0.md new file mode 100644 index 0000000000..585be5cb55 --- /dev/null +++ b/website/content/en/docs/upgrading-sdk-version/v1.31.0.md @@ -0,0 +1,43 @@ +--- +title: v1.31.0 +weight: 998969000 +--- + +## Updating an Ansible Operator to use the updated Ansible 2.15.0 image + +1. Update the `FROM` directive in the `Dockerfile` to have a version tag > `v1.30.0` +2. Evaluate your dependency requirements. The change to Ansible 2.15.0 also included removal of some pre-installed Python modules. You may need to update your `Dockerfile` to `pip install` modules required by your operator. + +_See [#6483](https://github.com/operator-framework/operator-sdk/pull/6483) for more details._ + +## Upgrading an Ansible Operator project to match the latest `ansible/v1` plugin changes + +1. In the `requirements.yml` file: + - Remove the `community.kubernetes` collection entry + - Update the version of the `operator_sdk.util` collection entry to `v0.5.0` +2. In the `molecule/kind/molecule.yml` and `molecule/default/molecule.yml` files: + - Remove all instances of the `lint` field. For an example of the diff, see: https://github.com/operator-framework/operator-sdk/pull/6483/files#diff-f159b0d7ec17de90f5b5c297ce997254e6ea4001269167be25615c45c489539e + +_See [#6483](https://github.com/operator-framework/operator-sdk/pull/6483) for more details._ + +## Migrating away from the `quay.io/operator-framework/ansible-operator-2.11-preview` base image + +1. Update the `FROM` directive in the `Dockerfile` to use the base image `quay.io/operator-framework/ansible-operator:vX.Y.Z` where `vX.Y.Z` is > `v1.30.0` + +_See [#6483](https://github.com/operator-framework/operator-sdk/pull/6483) for more details._ + +## Require `watch` on `secrets` + +The operator now requires the watch operation on secrets. +When using a custom ServiceAccount for deployment, the following additional role is now required: +``` +rules: + - apiGroups: + - "" + resources: + - secrets + verbs: + - watch +``` + +_See [#6354](https://github.com/operator-framework/operator-sdk/pull/6354) for more details._