From e95abdbd5ccb7ca0fd586e0c6f578e491b0a025b Mon Sep 17 00:00:00 2001 From: Adam Cornett Date: Tue, 18 Jun 2024 11:12:23 -0700 Subject: [PATCH] Release v1.35.0 (#6775) Signed-off-by: Adam D. Cornett --- Makefile | 2 +- .../01-ansible-operator-plugin-upgrade.yaml | 26 ------------------- .../02-helm-operator-role-generation-fix.yaml | 24 ----------------- changelog/generated/v1.35.0.md | 9 +++++++ .../bundle/tests/scorecard/config.yaml | 12 ++++----- .../scorecard/patches/basic.config.yaml | 2 +- .../config/scorecard/patches/olm.config.yaml | 10 +++---- .../bundle/tests/scorecard/config.yaml | 12 ++++----- .../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 ++++----- .../scorecard/patches/basic.config.yaml | 2 +- .../config/scorecard/patches/olm.config.yaml | 10 +++---- website/config.toml | 6 +++++ .../content/en/docs/installation/_index.md | 2 +- .../en/docs/upgrading-sdk-version/v1.35.0.md | 11 ++++++++ 18 files changed, 66 insertions(+), 90 deletions(-) delete mode 100644 changelog/fragments/01-ansible-operator-plugin-upgrade.yaml delete mode 100644 changelog/fragments/02-helm-operator-role-generation-fix.yaml create mode 100644 changelog/generated/v1.35.0.md create mode 100644 website/content/en/docs/upgrading-sdk-version/v1.35.0.md diff --git a/Makefile b/Makefile index 40a07e3982..e5eab97431 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.34.0 +export IMAGE_VERSION = v1.35.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-operator-plugin-upgrade.yaml b/changelog/fragments/01-ansible-operator-plugin-upgrade.yaml deleted file mode 100644 index 51e29618ea..0000000000 --- a/changelog/fragments/01-ansible-operator-plugin-upgrade.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - For Ansible-based operators, upgrade the version of the Ansible Operator Plugin - used in operator-sdk to v1.34.2. - - # 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 diff --git a/changelog/fragments/02-helm-operator-role-generation-fix.yaml b/changelog/fragments/02-helm-operator-role-generation-fix.yaml deleted file mode 100644 index 31e956047c..0000000000 --- a/changelog/fragments/02-helm-operator-role-generation-fix.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# entries is a list of entries to include in -# release notes and/or the migration guide -entries: - - description: > - (helm/v1) Fix broken helm-operator role scaffolding which causes reconciler to hang due to lack of permissions. - - # kind is one of: - # - addition - # - change - # - deprecation - # - removal - # - bugfix - kind: "bugfix" - - # Is this a breaking change? - breaking: false - - # Migration can be defined to automatically add a section to - # the migration guide. This is required for breaking changes. - migration: - header: Fix helm-operator scaffolding that was broken in 1.34.0, 1.34.1, and 1.34.2 - body: | - Users who scaffolded a helm-operator project with 1.34.0, 1.34.1, or 1.34.2 - need re-generate the project in order to get a fixed `config/rbac/role.yaml` file. diff --git a/changelog/generated/v1.35.0.md b/changelog/generated/v1.35.0.md new file mode 100644 index 0000000000..cded8f21e1 --- /dev/null +++ b/changelog/generated/v1.35.0.md @@ -0,0 +1,9 @@ +## v1.35.0 + +### Changes + +- For Ansible-based operators, upgrade the version of the Ansible Operator Plugin used in operator-sdk to v1.34.2. ([#6749](https://github.com/operator-framework/operator-sdk/pull/6749)) + +### Bug Fixes + +- (helm/v1) Fix broken helm-operator role scaffolding which causes reconciler to hang due to lack of permissions. ([#6769](https://github.com/operator-framework/operator-sdk/pull/6769)) diff --git a/testdata/go/v4/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/go/v4/memcached-operator/bundle/tests/scorecard/config.yaml index 8f68dc1b75..4e32de13b2 100644 --- a/testdata/go/v4/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/go/v4/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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v4/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/go/v4/memcached-operator/config/scorecard/patches/basic.config.yaml index 55fd480423..893ebd2da2 100644 --- a/testdata/go/v4/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/go/v4/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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.0 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/go/v4/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/go/v4/memcached-operator/config/scorecard/patches/olm.config.yaml index 3767c00c93..6cf777b8f0 100644 --- a/testdata/go/v4/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/go/v4/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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v4/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml b/testdata/go/v4/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml index 8f68dc1b75..4e32de13b2 100644 --- a/testdata/go/v4/monitoring/memcached-operator/bundle/tests/scorecard/config.yaml +++ b/testdata/go/v4/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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/go/v4/monitoring/memcached-operator/config/scorecard/patches/basic.config.yaml b/testdata/go/v4/monitoring/memcached-operator/config/scorecard/patches/basic.config.yaml index 55fd480423..893ebd2da2 100644 --- a/testdata/go/v4/monitoring/memcached-operator/config/scorecard/patches/basic.config.yaml +++ b/testdata/go/v4/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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.0 labels: suite: basic test: basic-check-spec-test diff --git a/testdata/go/v4/monitoring/memcached-operator/config/scorecard/patches/olm.config.yaml b/testdata/go/v4/monitoring/memcached-operator/config/scorecard/patches/olm.config.yaml index 3767c00c93..6cf777b8f0 100644 --- a/testdata/go/v4/monitoring/memcached-operator/config/scorecard/patches/olm.config.yaml +++ b/testdata/go/v4/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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/testdata/helm/memcached-operator/Dockerfile b/testdata/helm/memcached-operator/Dockerfile index fc23ddfda4..509b516a96 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.34.0 +FROM quay.io/operator-framework/helm-operator:v1.35.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 306aef13f3..77dfc6f17c 100644 --- a/testdata/helm/memcached-operator/Makefile +++ b/testdata/helm/memcached-operator/Makefile @@ -147,7 +147,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.34.0/helm-operator_$(OS)_$(ARCH) ;\ + curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.35.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 8f68dc1b75..4e32de13b2 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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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 55fd480423..893ebd2da2 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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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 3767c00c93..6cf777b8f0 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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.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.34.0 + image: quay.io/operator-framework/scorecard-test:v1.35.0 labels: suite: olm test: olm-status-descriptors-test diff --git a/website/config.toml b/website/config.toml index 413a232555..926e7092c9 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.35" + url = "https://v1-35-x.sdk.operatorframework.io" + kube_version = "1.28.0" + client_go_version = "v0.28.5" + [[params.versions]] version = "v1.34" url = "https://v1-34-x.sdk.operatorframework.io" diff --git a/website/content/en/docs/installation/_index.md b/website/content/en/docs/installation/_index.md index 6820ba78a8..00cef79b84 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.34.0 +export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/v1.35.0 curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} ``` diff --git a/website/content/en/docs/upgrading-sdk-version/v1.35.0.md b/website/content/en/docs/upgrading-sdk-version/v1.35.0.md new file mode 100644 index 0000000000..47835b4c6c --- /dev/null +++ b/website/content/en/docs/upgrading-sdk-version/v1.35.0.md @@ -0,0 +1,11 @@ +--- +title: v1.35.0 +weight: 998965000 +--- + +## Fix helm-operator scaffolding that was broken in 1.34.0, 1.34.1, and 1.34.2 + +Users who scaffolded a helm-operator project with 1.34.0, 1.34.1, or 1.34.2 +need re-generate the project in order to get a fixed `config/rbac/role.yaml` file. + +_See [#6769](https://github.com/operator-framework/operator-sdk/pull/6769) for more details._