From f9cb74950b64cbd864d8e6e615156b5fa6be8aa8 Mon Sep 17 00:00:00 2001 From: Balasankar 'Balu' C Date: Fri, 19 Dec 2025 18:55:41 +0530 Subject: [PATCH 1/4] release: Stop using development version [noissue] Signed-off-by: Balasankar 'Balu' C --- release/Dockerfile | 3 +-- release/README.md | 3 --- release/release.sh | 9 +++------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/release/Dockerfile b/release/Dockerfile index 8380a48d5..912190090 100644 --- a/release/Dockerfile +++ b/release/Dockerfile @@ -12,7 +12,6 @@ ENV GIT_REMOTE_NAME="${GIT_REMOTE_NAME:-origin}" ENV PULP_OPERATOR_SOURCE_PATH="${PULP_OPERATOR_SOURCE_PATH:-/app/pulp-operator}" ENV PULP_OPERATOR_REPLACE_VERSION="${PULP_OPERATOR_REPLACE_VERSION:-1.0.0-beta.3}" ENV PULP_OPERATOR_RELEASE_VERSION="${PULP_OPERATOR_RELEASE_VERSION:-1.0.0-beta.4}" -ENV PULP_OPERATOR_DEV_VERSION="${PULP_OPERATOR_DEV_VERSION:-1.0.0-beta.5}" ENV OPERATORHUB_REPO_PATH="${OPERATORHUB_REPO_PATH:-/app/community-operators}" ENV GIT_OPERATORHUB_RELEASE_BRANCH="${GIT_OPERATORHUB_RELEASE_BRANCH:-pulp-operator-$PULP_OPERATOR_RELEASE_VERSION}" @@ -46,4 +45,4 @@ COPY release.sh /app COPY ssh_config /root/.ssh/config -ENTRYPOINT ["./release.sh"] \ No newline at end of file +ENTRYPOINT ["./release.sh"] diff --git a/release/README.md b/release/README.md index fdab61dc0..126f0b34c 100644 --- a/release/README.md +++ b/release/README.md @@ -39,7 +39,6 @@ podman build --build-arg GOLANG_VERSION=1.23.0 --build-arg CONTROLLER_TOOLS_VERS GIT_RELEASE_BRANCH=release-beta-4 PULP_OPERATOR_REPLACE_VERSION=1.0.0-beta.3 PULP_OPERATOR_RELEASE_VERSION=1.0.0-beta.4 -PULP_OPERATOR_DEV_VERSION=1.0.0-beta.5 GITHUB_SSH_KEY=~/.ssh/github PULP_OPERATOR_REPO_PATH=/tmp/pulp-operator/ OPERATORHUB_REPO_PATH=/tmp/community-operators/ @@ -63,7 +62,6 @@ podman run -dit --name pulp-operator-release \ -e GIT_REMOTE_BRANCH \ -e PULP_OPERATOR_REPLACE_VERSION \ -e PULP_OPERATOR_RELEASE_VERSION \ - -e PULP_OPERATOR_DEV_VERSION \ -e GIT_OPERATORHUB_RELEASE_BRANCH \ -e GIT_OPERATORHUB_UPSTREAM_REMOTE_NAME \ -e GIT_OPERATORHUB_REMOTE_NAME \ @@ -85,7 +83,6 @@ podman run -dit --name pulp-operator-release \ |GIT_REMOTE_NAME|`pulp-operator` fork git remote name. For example: origin| |PULP_OPERATOR_REPLACE_VERSION|`pulp-operator` version to be replaced by this release. For example:1.0.0-beta.3| |PULP_OPERATOR_RELEASE_VERSION|`pulp-operator` release version. For example: 1.0.0-beta.4| -|PULP_OPERATOR_DEV_VERSION|`pulp-operator` development version (version that will be worked on after this release). For example: 1.0.0-beta.5| |GIT_OPERATORHUB_RELEASE_BRANCH|name of the release branch that will be created on `operatorhub catalog`. For example: "pulp-operator-$PULP_OPERATOR_RELEASE_VERSION"| |GIT_OPERATORHUB_UPSTREAM_REMOTE_NAME|`operatorhub catalog` upstream git remote name. For example: upstream| |GIT_OPERATORHUB_REMOTE_NAME|`operatorhub catalog` fork git remote name. For example: origin| diff --git a/release/release.sh b/release/release.sh index e373d36d3..e3e0cf40f 100755 --- a/release/release.sh +++ b/release/release.sh @@ -23,11 +23,8 @@ function new_release { function bump_version { - echo "Bumping main.go version ..." - sed -i -E "s/(pulp-operator version:) .*/\1 ${PULP_OPERATOR_DEV_VERSION}\")/g" main.go - echo "Bumping Makefile operator's version ..." - sed -i -E "s/^(VERSION \?=) .*/\1 ${PULP_OPERATOR_DEV_VERSION}/g" Makefile + sed -i -E "s/^(VERSION \?=) .*/\1 ${PULP_OPERATOR_RELEASE_VERSION}/g" Makefile echo "Bumping the tag used in bundle-upgrade pipeline ..." sed -i -E "s/(ref:) ${PULP_OPERATOR_REPLACE_VERSION}/\1 ${PULP_OPERATOR_RELEASE_VERSION}/g" .github/workflows/ci.yml @@ -36,7 +33,7 @@ function bump_version { make generate manifests bundle echo "Commiting changes ..." - git commit -am "Bump version from Makefile to $PULP_OPERATOR_DEV_VERSION" -m "[noissue]" + git commit -am "Bump version from Makefile to $PULP_OPERATOR_RELEASE_VERSION" -m "[noissue]" } function stash_files { @@ -86,4 +83,4 @@ bump_version operatorhub redhat_catalog -echo -e "[\e[32mOK\e[0m] All tasks finished!" \ No newline at end of file +echo -e "[\e[32mOK\e[0m] All tasks finished!" From 5d0371a9bca4e976eb38b2a29ea6fb273909013b Mon Sep 17 00:00:00 2001 From: Balasankar 'Balu' C Date: Fri, 19 Dec 2025 18:56:47 +0530 Subject: [PATCH 2/4] release: Update containerImage manifest in all type of releases [noissue] Signed-off-by: Balasankar 'Balu' C --- release/release.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/release.sh b/release/release.sh index e3e0cf40f..0a0b9ac75 100755 --- a/release/release.sh +++ b/release/release.sh @@ -32,6 +32,10 @@ function bump_version { echo "Updating the manifests with the changes ..." make generate manifests bundle + echo "Updating containerImage annotation" + CSV_FILE=manifests/pulp-operator.clusterserviceversion.yaml + sed -i "s#containerImage: quay.io/pulp/pulp-operator:devel#containerImage: quay.io/pulp/pulp-operator:v${PULP_OPERATOR_RELEASE_VERSION}#g" $CSV_FILE + echo "Commiting changes ..." git commit -am "Bump version from Makefile to $PULP_OPERATOR_RELEASE_VERSION" -m "[noissue]" } @@ -63,7 +67,6 @@ function operatorhub { cp -a ${PULP_OPERATOR_SOURCE_PATH}/bundle/* ${CATALOG_DIR}/ CSV_FILE=${CATALOG_DIR}/manifests/pulp-operator.clusterserviceversion.yaml - sed -i "s#containerImage: quay.io/pulp/pulp-operator:devel#containerImage: quay.io/pulp/pulp-operator:v${PULP_OPERATOR_RELEASE_VERSION}#g" $CSV_FILE echo " replaces: pulp-operator.v${PULP_OPERATOR_REPLACE_VERSION}" >> $CSV_FILE echo "Commiting changes ..." From 57a1acf86dfc9bcde911195bbd33d405de32409b Mon Sep 17 00:00:00 2001 From: Balasankar 'Balu' C Date: Fri, 19 Dec 2025 18:57:42 +0530 Subject: [PATCH 3/4] release: Set com.redhat.openshift.versions annotation for community operator releases [noissue] Signed-off-by: Balasankar 'Balu' C --- release/release.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/release.sh b/release/release.sh index 0a0b9ac75..ddde1ac74 100755 --- a/release/release.sh +++ b/release/release.sh @@ -69,6 +69,9 @@ function operatorhub { CSV_FILE=${CATALOG_DIR}/manifests/pulp-operator.clusterserviceversion.yaml echo " replaces: pulp-operator.v${PULP_OPERATOR_REPLACE_VERSION}" >> $CSV_FILE + ANNOTATIONS_FILE=${CATALOG_DIR}/metadata/annotations.yaml + echo 'com.redhat.openshift.versions: "v4.17-v4.18"' >> $ANNOTATIONS_FILE + echo "Commiting changes ..." git add operators/pulp-operator/ git commit -sm "operator pulp-operator ($PULP_OPERATOR_RELEASE_VERSION)" From a68524d6b21588a63b1bfb4761889ff9609605f0 Mon Sep 17 00:00:00 2001 From: Balasankar 'Balu' C Date: Fri, 19 Dec 2025 20:02:39 +0530 Subject: [PATCH 4/4] release: Fix metadata.annotations.support field [noissue] Signed-off-by: Balasankar 'Balu' C --- bundle/manifests/pulp-operator.clusterserviceversion.yaml | 2 +- config/manifests/bases/pulp-operator.clusterserviceversion.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/manifests/pulp-operator.clusterserviceversion.yaml b/bundle/manifests/pulp-operator.clusterserviceversion.yaml index 4b7da1916..9915f582c 100644 --- a/bundle/manifests/pulp-operator.clusterserviceversion.yaml +++ b/bundle/manifests/pulp-operator.clusterserviceversion.yaml @@ -67,7 +67,7 @@ metadata: createdAt: "2025-12-19T03:33:08Z" description: Pulp is a platform for managing repositories of software packages and making them available to a large number of consumers. - metadata.annotations.support: Community + support: Community operators.operatorframework.io/builder: operator-sdk-v1.31.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/pulp/pulp-operator diff --git a/config/manifests/bases/pulp-operator.clusterserviceversion.yaml b/config/manifests/bases/pulp-operator.clusterserviceversion.yaml index 4c18abd07..b8d8201e8 100644 --- a/config/manifests/bases/pulp-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/pulp-operator.clusterserviceversion.yaml @@ -77,10 +77,10 @@ metadata: createdAt: "2021-03-26 16:57:40" description: Pulp is a platform for managing repositories of software packages and making them available to a large number of consumers. - metadata.annotations.support: Community operators.operatorframework.io/builder: operator-sdk-v1.22.2 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/pulp/pulp-operator + support: Community name: pulp-operator.v1.0.0 namespace: placeholder spec: