From 41f6d8c60610203fa79159fd2bbc118eda5ff7a5 Mon Sep 17 00:00:00 2001 From: myan Date: Mon, 3 Nov 2025 10:05:31 -0500 Subject: [PATCH 1/3] Add release-2.16 pipeline configurations - Add new .tekton/ pipelines for globalhub-1-7 (target_branch=main) - Update Containerfile version labels to release-1.7 - Keep existing globalhub-1-6 pipelines for backward compatibility Release: ACM 2.16 / Global Hub v1.7.0 --- ...-hub-agent-globalhub-1-7-pull-request.yaml | 64 ++++++++++++++++ ...r-global-hub-agent-globalhub-1-7-push.yaml | 75 +++++++++++++++++++ ...ub-manager-globalhub-1-7-pull-request.yaml | 64 ++++++++++++++++ ...global-hub-manager-globalhub-1-7-push.yaml | 75 +++++++++++++++++++ ...b-operator-globalhub-1-7-pull-request.yaml | 62 +++++++++++++++ ...lobal-hub-operator-globalhub-1-7-push.yaml | 73 ++++++++++++++++++ agent/Containerfile.agent | 2 +- manager/Containerfile.manager | 2 +- operator/Containerfile.operator | 2 +- 9 files changed, 416 insertions(+), 3 deletions(-) create mode 100644 .tekton/multicluster-global-hub-agent-globalhub-1-7-pull-request.yaml create mode 100644 .tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml create mode 100644 .tekton/multicluster-global-hub-manager-globalhub-1-7-pull-request.yaml create mode 100644 .tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml create mode 100644 .tekton/multicluster-global-hub-operator-globalhub-1-7-pull-request.yaml create mode 100644 .tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml diff --git a/.tekton/multicluster-global-hub-agent-globalhub-1-7-pull-request.yaml b/.tekton/multicluster-global-hub-agent-globalhub-1-7-pull-request.yaml new file mode 100644 index 0000000000..b1369673cd --- /dev/null +++ b/.tekton/multicluster-global-hub-agent-globalhub-1-7-pull-request.yaml @@ -0,0 +1,64 @@ +apiVersion: tekton.dev/v1 +kind: PipelineRun +metadata: + annotations: + build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} + build.appstudio.redhat.com/commit_sha: '{{revision}}' + build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' + build.appstudio.redhat.com/target_branch: '{{target_branch}}' + pipelinesascode.tekton.dev/cancel-in-progress: "true" + pipelinesascode.tekton.dev/max-keep-runs: "3" + pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && (".tekton/multicluster-global-hub-agent-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,agent}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) + creationTimestamp: null + labels: + appstudio.openshift.io/application: release-globalhub-1-7 + appstudio.openshift.io/component: multicluster-global-hub-agent-globalhub-1-7 + pipelines.appstudio.openshift.io/type: build + name: multicluster-global-hub-agent-globalhub-1-7-on-pull-request + namespace: acm-multicluster-glo-tenant +spec: + params: + - name: git-url + value: '{{source_url}}' + - name: revision + value: '{{revision}}' + - name: output-image + value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-agent-globalhub-1-7:on-pr-{{revision}} + - name: image-expires-after + value: 5d + - name: build-platforms + value: + - linux/x86_64 + - linux/ppc64le + - linux/s390x + - linux/arm64 + - name: dockerfile + value: agent/Containerfile.agent + - name: path-context + value: . + - name: build-source-image + value: "true" + - name: hermetic + value: "true" + - name: prefetch-input + value: '[ {"type": "gomod", "path": "."}, {"type": "rpm", "path": "."} ]' + - name: use-dev-package-managers + value: "true" + - name: build-args + value: ["GIT_COMMIT={{revision}}"] + pipelineRef: + resolver: git + params: + - name: url + value: "https://github.com/stolostron/konflux-build-catalog.git" + - name: revision + value: main + - name: pathInRepo + value: pipelines/common.yaml + taskRunTemplate: + serviceAccountName: build-pipeline-multicluster-global-hub-agent-globalhub-1-7 + workspaces: + - name: git-auth + secret: + secretName: '{{ git_auth_secret }}' +status: {} diff --git a/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml b/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml new file mode 100644 index 0000000000..6b9b91e7e0 --- /dev/null +++ b/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml @@ -0,0 +1,75 @@ +apiVersion: tekton.dev/v1 +kind: PipelineRun +metadata: + annotations: + build.appstudio.openshift.io/build-nudge-files: "konflux-patch.sh" + build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} + build.appstudio.redhat.com/commit_sha: '{{revision}}' + build.appstudio.redhat.com/target_branch: '{{target_branch}}' + pipelinesascode.tekton.dev/cancel-in-progress: "false" + pipelinesascode.tekton.dev/max-keep-runs: "3" + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.15" && (".tekton/multicluster-global-hub-agent-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,agent}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) + creationTimestamp: null + labels: + appstudio.openshift.io/application: release-globalhub-1-7 + appstudio.openshift.io/component: multicluster-global-hub-agent-globalhub-1-7 + pipelines.appstudio.openshift.io/type: build + name: multicluster-global-hub-agent-globalhub-1-7-on-push + namespace: acm-multicluster-glo-tenant +spec: + params: + - name: git-url + value: '{{source_url}}' + - name: revision + value: '{{revision}}' + - name: output-image + value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-agent-globalhub-1-7:{{revision}} + - name: build-platforms + value: + - linux/x86_64 + - linux/ppc64le + - linux/s390x + - linux/arm64 + - name: dockerfile + value: agent/Containerfile.agent + - name: path-context + value: . + - name: build-source-image + value: "true" + - name: hermetic + value: "true" + - name: prefetch-input + value: '[ {"type": "gomod", "path": "."}, {"type": "rpm", "path": "."} ]' + - name: use-dev-package-managers + value: "true" + - name: build-args + value: ["GIT_COMMIT={{revision}}"] + - name: send-slack-notification + value: "true" + - name: konflux-application-name + value: "release-globalhub-1-7" + - name: slack-webhook-url-secret-name + # See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html + value: "slack-notify-webhook" + - name: slack-webhook-url-secret-key + value: "slack-webhook-url" + - name: slack-group-id + # Will mention the user in the slack message when the pipeline run failed; this is not required. + # Please make sure replace the value with component owner's slack member id. + value: "S09JCE3DF9N" + pipelineRef: + resolver: git + params: + - name: url + value: "https://github.com/stolostron/konflux-build-catalog.git" + - name: revision + value: main + - name: pathInRepo + value: pipelines/common.yaml + taskRunTemplate: + serviceAccountName: build-pipeline-multicluster-global-hub-agent-globalhub-1-7 + workspaces: + - name: git-auth + secret: + secretName: '{{ git_auth_secret }}' +status: {} \ No newline at end of file diff --git a/.tekton/multicluster-global-hub-manager-globalhub-1-7-pull-request.yaml b/.tekton/multicluster-global-hub-manager-globalhub-1-7-pull-request.yaml new file mode 100644 index 0000000000..c341ed9b91 --- /dev/null +++ b/.tekton/multicluster-global-hub-manager-globalhub-1-7-pull-request.yaml @@ -0,0 +1,64 @@ +apiVersion: tekton.dev/v1 +kind: PipelineRun +metadata: + annotations: + build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} + build.appstudio.redhat.com/commit_sha: '{{revision}}' + build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' + build.appstudio.redhat.com/target_branch: '{{target_branch}}' + pipelinesascode.tekton.dev/cancel-in-progress: "true" + pipelinesascode.tekton.dev/max-keep-runs: "3" + pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && (".tekton/multicluster-global-hub-manager-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,manager}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) + creationTimestamp: null + labels: + appstudio.openshift.io/application: release-globalhub-1-7 + appstudio.openshift.io/component: multicluster-global-hub-manager-globalhub-1-7 + pipelines.appstudio.openshift.io/type: build + name: multicluster-global-hub-manager-globalhub-1-7-on-pull-request + namespace: acm-multicluster-glo-tenant +spec: + params: + - name: git-url + value: '{{source_url}}' + - name: revision + value: '{{revision}}' + - name: output-image + value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-manager-globalhub-1-7:on-pr-{{revision}} + - name: image-expires-after + value: 5d + - name: build-platforms + value: + - linux/x86_64 + - linux/ppc64le + - linux/s390x + - linux/arm64 + - name: dockerfile + value: manager/Containerfile.manager + - name: path-context + value: . + - name: build-source-image + value: "true" + - name: hermetic + value: "true" + - name: prefetch-input + value: '[ {"type": "gomod", "path": "."}, {"type": "rpm", "path": "."} ]' + - name: use-dev-package-managers + value: "true" + - name: build-args + value: ["GIT_COMMIT={{revision}}"] + pipelineRef: + resolver: git + params: + - name: url + value: "https://github.com/stolostron/konflux-build-catalog.git" + - name: revision + value: main + - name: pathInRepo + value: pipelines/common.yaml + taskRunTemplate: + serviceAccountName: build-pipeline-multicluster-global-hub-manager-globalhub-1-7 + workspaces: + - name: git-auth + secret: + secretName: '{{ git_auth_secret }}' +status: {} diff --git a/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml b/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml new file mode 100644 index 0000000000..e7159b228a --- /dev/null +++ b/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml @@ -0,0 +1,75 @@ +apiVersion: tekton.dev/v1 +kind: PipelineRun +metadata: + annotations: + build.appstudio.openshift.io/build-nudge-files: "konflux-patch.sh" + build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} + build.appstudio.redhat.com/commit_sha: '{{revision}}' + build.appstudio.redhat.com/target_branch: '{{target_branch}}' + pipelinesascode.tekton.dev/cancel-in-progress: "false" + pipelinesascode.tekton.dev/max-keep-runs: "3" + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.15" && (".tekton/multicluster-global-hub-manager-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,manager}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) + creationTimestamp: null + labels: + appstudio.openshift.io/application: release-globalhub-1-7 + appstudio.openshift.io/component: multicluster-global-hub-manager-globalhub-1-7 + pipelines.appstudio.openshift.io/type: build + name: multicluster-global-hub-manager-globalhub-1-7-on-push + namespace: acm-multicluster-glo-tenant +spec: + params: + - name: git-url + value: '{{source_url}}' + - name: revision + value: '{{revision}}' + - name: output-image + value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-manager-globalhub-1-7:{{revision}} + - name: build-platforms + value: + - linux/x86_64 + - linux/ppc64le + - linux/s390x + - linux/arm64 + - name: dockerfile + value: manager/Containerfile.manager + - name: path-context + value: . + - name: build-source-image + value: "true" + - name: hermetic + value: "true" + - name: prefetch-input + value: '[ {"type": "gomod", "path": "."}, {"type": "rpm", "path": "."} ]' + - name: use-dev-package-managers + value: "true" + - name: build-args + value: ["GIT_COMMIT={{revision}}"] + - name: send-slack-notification + value: "true" + - name: konflux-application-name + value: "release-globalhub-1-7" + - name: slack-webhook-url-secret-name + # See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html + value: "slack-notify-webhook" + - name: slack-webhook-url-secret-key + value: "slack-webhook-url" + - name: slack-group-id + # Will mention the user in the slack message when the pipeline run failed; this is not required. + # Please make sure replace the value with component owner's slack member id. + value: "S09JCE3DF9N" + pipelineRef: + resolver: git + params: + - name: url + value: "https://github.com/stolostron/konflux-build-catalog.git" + - name: revision + value: main + - name: pathInRepo + value: pipelines/common.yaml + taskRunTemplate: + serviceAccountName: build-pipeline-multicluster-global-hub-manager-globalhub-1-7 + workspaces: + - name: git-auth + secret: + secretName: '{{ git_auth_secret }}' +status: {} \ No newline at end of file diff --git a/.tekton/multicluster-global-hub-operator-globalhub-1-7-pull-request.yaml b/.tekton/multicluster-global-hub-operator-globalhub-1-7-pull-request.yaml new file mode 100644 index 0000000000..39973bf81b --- /dev/null +++ b/.tekton/multicluster-global-hub-operator-globalhub-1-7-pull-request.yaml @@ -0,0 +1,62 @@ +apiVersion: tekton.dev/v1 +kind: PipelineRun +metadata: + annotations: + build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} + build.appstudio.redhat.com/commit_sha: '{{revision}}' + build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' + build.appstudio.redhat.com/target_branch: '{{target_branch}}' + pipelinesascode.tekton.dev/cancel-in-progress: "true" + pipelinesascode.tekton.dev/max-keep-runs: "3" + pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && (".tekton/multicluster-global-hub-operator-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,operator}/***".pathChanged()) + creationTimestamp: null + labels: + appstudio.openshift.io/application: release-globalhub-1-7 + appstudio.openshift.io/component: multicluster-global-hub-operator-globalhub-1-7 + pipelines.appstudio.openshift.io/type: build + name: multicluster-global-hub-operator-globalhub-1-7-on-pull-request + namespace: acm-multicluster-glo-tenant +spec: + params: + - name: git-url + value: '{{source_url}}' + - name: revision + value: '{{revision}}' + - name: output-image + value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-operator-globalhub-1-7:on-pr-{{revision}} + - name: image-expires-after + value: 5d + - name: build-platforms + value: + - linux/x86_64 + - linux/ppc64le + - linux/s390x + - linux/arm64 + - name: dockerfile + value: operator/Containerfile.operator + - name: path-context + value: . + - name: build-source-image + value: "true" + - name: hermetic + value: "true" + - name: prefetch-input + value: '[ {"type": "gomod", "path": "."} ]' + - name: build-args + value: ["GIT_COMMIT={{revision}}"] + pipelineRef: + resolver: git + params: + - name: url + value: "https://github.com/stolostron/konflux-build-catalog.git" + - name: revision + value: main + - name: pathInRepo + value: pipelines/common.yaml + taskRunTemplate: + serviceAccountName: build-pipeline-multicluster-global-hub-operator-globalhub-1-7 + workspaces: + - name: git-auth + secret: + secretName: '{{ git_auth_secret }}' +status: {} diff --git a/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml b/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml new file mode 100644 index 0000000000..4943d66078 --- /dev/null +++ b/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml @@ -0,0 +1,73 @@ +apiVersion: tekton.dev/v1 +kind: PipelineRun +metadata: + annotations: + build.appstudio.openshift.io/build-nudge-files: "konflux-patch.sh" + build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} + build.appstudio.redhat.com/commit_sha: '{{revision}}' + build.appstudio.redhat.com/target_branch: '{{target_branch}}' + pipelinesascode.tekton.dev/cancel-in-progress: "false" + pipelinesascode.tekton.dev/max-keep-runs: "3" + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.15" && (".tekton/multicluster-global-hub-operator-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,operator}/***".pathChanged()) + creationTimestamp: null + labels: + appstudio.openshift.io/application: release-globalhub-1-7 + appstudio.openshift.io/component: multicluster-global-hub-operator-globalhub-1-7 + pipelines.appstudio.openshift.io/type: build + name: multicluster-global-hub-operator-globalhub-1-7-on-push + namespace: acm-multicluster-glo-tenant +spec: + params: + - name: git-url + value: '{{source_url}}' + - name: revision + value: '{{revision}}' + - name: output-image + value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-operator-globalhub-1-7:{{revision}} + - name: build-platforms + value: + - linux/x86_64 + - linux/ppc64le + - linux/s390x + - linux/arm64 + - name: dockerfile + value: operator/Containerfile.operator + - name: path-context + value: . + - name: build-source-image + value: "true" + - name: hermetic + value: "true" + - name: prefetch-input + value: '[ {"type": "gomod", "path": "."} ]' + - name: build-args + value: ["GIT_COMMIT={{revision}}"] + - name: send-slack-notification + value: "true" + - name: konflux-application-name + value: "release-globalhub-1-7" + - name: slack-webhook-url-secret-name + # See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html + value: "slack-notify-webhook" + - name: slack-webhook-url-secret-key + value: "slack-webhook-url" + - name: slack-group-id + # Will mention the user in the slack message when the pipeline run failed; this is not required. + # Please make sure replace the value with component owner's slack member id. + value: "S09JCE3DF9N" + pipelineRef: + resolver: git + params: + - name: url + value: "https://github.com/stolostron/konflux-build-catalog.git" + - name: revision + value: main + - name: pathInRepo + value: pipelines/common.yaml + taskRunTemplate: + serviceAccountName: build-pipeline-multicluster-global-hub-operator-globalhub-1-7 + workspaces: + - name: git-auth + secret: + secretName: '{{ git_auth_secret }}' +status: {} \ No newline at end of file diff --git a/agent/Containerfile.agent b/agent/Containerfile.agent index 1ee3711918..3a699cd51a 100644 --- a/agent/Containerfile.agent +++ b/agent/Containerfile.agent @@ -27,7 +27,7 @@ LABEL org.label-schema.schema-version="1.0" # Bundle metadata LABEL name="multicluster-global-hub/multicluster-global-hub-agent" -LABEL version="release-1.6" +LABEL version="release-1.7" LABEL summary="multicluster global hub agent" LABEL io.openshift.expose-services="" LABEL io.openshift.tags="data,images" diff --git a/manager/Containerfile.manager b/manager/Containerfile.manager index e2223e6b78..1eed6f4c21 100644 --- a/manager/Containerfile.manager +++ b/manager/Containerfile.manager @@ -28,7 +28,7 @@ LABEL org.label-schema.schema-version="1.0" # Bundle metadata LABEL name="multicluster-global-hub/multicluster-global-hub-manager" -LABEL version="release-1.6" +LABEL version="release-1.7" LABEL summary="multicluster global hub manager" LABEL io.openshift.expose-services="" LABEL io.openshift.tags="data,images" diff --git a/operator/Containerfile.operator b/operator/Containerfile.operator index d8cc4c3e35..94c35e2977 100644 --- a/operator/Containerfile.operator +++ b/operator/Containerfile.operator @@ -23,7 +23,7 @@ LABEL org.label-schema.schema-version="1.0" # Bundle metadata LABEL name="multicluster-global-hub/multicluster-global-hub-operator" -LABEL version="release-1.6" +LABEL version="release-1.7" LABEL summary="multicluster global hub operator" LABEL io.openshift.expose-services="" LABEL io.openshift.tags="data,images" From bedf5f3234d9b0ee9991d2ae956d49529c9de1d3 Mon Sep 17 00:00:00 2001 From: myan Date: Mon, 3 Nov 2025 10:26:31 -0500 Subject: [PATCH 2/3] Add release-2.16 pipeline configurations - Add new .tekton/ pipelines for globalhub-1-7 (target_branch=main) - Update Containerfile version labels to release-1.7 - Keep existing globalhub-1-6 pipelines for backward compatibility Release: ACM 2.16 / Global Hub v1.7.0 --- .tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml | 2 +- .tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml | 2 +- .../multicluster-global-hub-operator-globalhub-1-7-push.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml b/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml index 6b9b91e7e0..f21df0b2f9 100644 --- a/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml +++ b/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.15" && (".tekton/multicluster-global-hub-agent-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,agent}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && (".tekton/multicluster-global-hub-agent-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,agent}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) creationTimestamp: null labels: appstudio.openshift.io/application: release-globalhub-1-7 diff --git a/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml b/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml index e7159b228a..14e8a864b2 100644 --- a/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml +++ b/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.15" && (".tekton/multicluster-global-hub-manager-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,manager}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && (".tekton/multicluster-global-hub-manager-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,manager}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) creationTimestamp: null labels: appstudio.openshift.io/application: release-globalhub-1-7 diff --git a/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml b/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml index 4943d66078..1547bc5b3e 100644 --- a/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml +++ b/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.15" && (".tekton/multicluster-global-hub-operator-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,operator}/***".pathChanged()) + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && (".tekton/multicluster-global-hub-operator-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,operator}/***".pathChanged()) creationTimestamp: null labels: appstudio.openshift.io/application: release-globalhub-1-7 From 459c7735eb51db64d37235ae0c76e3a8faddf930 Mon Sep 17 00:00:00 2001 From: myan Date: Mon, 17 Nov 2025 23:45:26 -0500 Subject: [PATCH 3/3] Add release-2.16 pipeline configurations - Add new .tekton/ pipelines for globalhub-1-7 (target_branch=main) - Remove previous release pipeline files (globalhub-1-6) - Update Containerfile version labels to release-1.7 - Update GitHub workflow bundle branch to release-1.7 - Update renovate.json baseBranches (maintain main + last 3 releases) - Update operator Makefile (VERSION, CHANNELS, DEFAULT_CHANNEL) - Update CSV (skipRange, ACM version, maturity) - Regenerate operator bundle ACM: release-2.16, Global Hub: release-1.7 Signed-off-by: myan --- .github/workflows/go.yml | 2 +- ...-hub-agent-globalhub-1-6-pull-request.yaml | 64 ---------------- ...r-global-hub-agent-globalhub-1-6-push.yaml | 75 ------------------- ...r-global-hub-agent-globalhub-1-7-push.yaml | 2 +- ...ub-manager-globalhub-1-6-pull-request.yaml | 64 ---------------- ...global-hub-manager-globalhub-1-6-push.yaml | 75 ------------------- ...global-hub-manager-globalhub-1-7-push.yaml | 2 +- ...b-operator-globalhub-1-6-pull-request.yaml | 62 --------------- ...lobal-hub-operator-globalhub-1-6-push.yaml | 73 ------------------ ...lobal-hub-operator-globalhub-1-7-push.yaml | 2 +- operator/Makefile | 6 +- ...al-hub-operator.clusterserviceversion.yaml | 12 +-- operator/bundle/metadata/annotations.yaml | 4 +- ...al-hub-operator.clusterserviceversion.yaml | 6 +- renovate.json | 2 +- 15 files changed, 19 insertions(+), 432 deletions(-) delete mode 100644 .tekton/multicluster-global-hub-agent-globalhub-1-6-pull-request.yaml delete mode 100644 .tekton/multicluster-global-hub-agent-globalhub-1-6-push.yaml delete mode 100644 .tekton/multicluster-global-hub-manager-globalhub-1-6-pull-request.yaml delete mode 100644 .tekton/multicluster-global-hub-manager-globalhub-1-6-push.yaml delete mode 100644 .tekton/multicluster-global-hub-operator-globalhub-1-6-pull-request.yaml delete mode 100644 .tekton/multicluster-global-hub-operator-globalhub-1-6-push.yaml diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 1c514181fc..01dc7532b5 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -53,7 +53,7 @@ jobs: # ignore createdAt updated in csv by `make bundle` git checkout . -f # clone multicluster-global-hub-operator-bundle repo - git clone https://github.com/stolostron/multicluster-global-hub-operator-bundle.git -b release-1.6 + git clone https://github.com/stolostron/multicluster-global-hub-operator-bundle.git -b release-1.7 # compare the bundle dir diff -I 'createdAt' -ruN operator/bundle multicluster-global-hub-operator-bundle/bundle diff --git a/.tekton/multicluster-global-hub-agent-globalhub-1-6-pull-request.yaml b/.tekton/multicluster-global-hub-agent-globalhub-1-6-pull-request.yaml deleted file mode 100644 index a2002f1ad6..0000000000 --- a/.tekton/multicluster-global-hub-agent-globalhub-1-6-pull-request.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && (".tekton/multicluster-global-hub-agent-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,agent}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) - creationTimestamp: null - labels: - appstudio.openshift.io/application: release-globalhub-1-6 - appstudio.openshift.io/component: multicluster-global-hub-agent-globalhub-1-6 - pipelines.appstudio.openshift.io/type: build - name: multicluster-global-hub-agent-globalhub-1-6-on-pull-request - namespace: acm-multicluster-glo-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-agent-globalhub-1-6:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - linux/ppc64le - - linux/s390x - - linux/arm64 - - name: dockerfile - value: agent/Containerfile.agent - - name: path-context - value: . - - name: build-source-image - value: "true" - - name: hermetic - value: "true" - - name: prefetch-input - value: '[ {"type": "gomod", "path": "."}, {"type": "rpm", "path": "."} ]' - - name: use-dev-package-managers - value: "true" - - name: build-args - value: ["GIT_COMMIT={{revision}}"] - pipelineRef: - resolver: git - params: - - name: url - value: "https://github.com/stolostron/konflux-build-catalog.git" - - name: revision - value: main - - name: pathInRepo - value: pipelines/common.yaml - taskRunTemplate: - serviceAccountName: build-pipeline-multicluster-global-hub-agent-globalhub-1-6 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/multicluster-global-hub-agent-globalhub-1-6-push.yaml b/.tekton/multicluster-global-hub-agent-globalhub-1-6-push.yaml deleted file mode 100644 index 616a40b181..0000000000 --- a/.tekton/multicluster-global-hub-agent-globalhub-1-6-push.yaml +++ /dev/null @@ -1,75 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/build-nudge-files: "konflux-patch.sh" - build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "false" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.15" && (".tekton/multicluster-global-hub-agent-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,agent}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) - creationTimestamp: null - labels: - appstudio.openshift.io/application: release-globalhub-1-6 - appstudio.openshift.io/component: multicluster-global-hub-agent-globalhub-1-6 - pipelines.appstudio.openshift.io/type: build - name: multicluster-global-hub-agent-globalhub-1-6-on-push - namespace: acm-multicluster-glo-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-agent-globalhub-1-6:{{revision}} - - name: build-platforms - value: - - linux/x86_64 - - linux/ppc64le - - linux/s390x - - linux/arm64 - - name: dockerfile - value: agent/Containerfile.agent - - name: path-context - value: . - - name: build-source-image - value: "true" - - name: hermetic - value: "true" - - name: prefetch-input - value: '[ {"type": "gomod", "path": "."}, {"type": "rpm", "path": "."} ]' - - name: use-dev-package-managers - value: "true" - - name: build-args - value: ["GIT_COMMIT={{revision}}"] - - name: send-slack-notification - value: "true" - - name: konflux-application-name - value: "release-globalhub-1-6" - - name: slack-webhook-url-secret-name - # See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html - value: "slack-notify-webhook" - - name: slack-webhook-url-secret-key - value: "slack-webhook-url" - - name: slack-group-id - # Will mention the user in the slack message when the pipeline run failed; this is not required. - # Please make sure replace the value with component owner's slack member id. - value: "S09JCE3DF9N" - pipelineRef: - resolver: git - params: - - name: url - value: "https://github.com/stolostron/konflux-build-catalog.git" - - name: revision - value: main - - name: pathInRepo - value: pipelines/common.yaml - taskRunTemplate: - serviceAccountName: build-pipeline-multicluster-global-hub-agent-globalhub-1-6 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} \ No newline at end of file diff --git a/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml b/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml index f21df0b2f9..eb2a5ade73 100644 --- a/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml +++ b/.tekton/multicluster-global-hub-agent-globalhub-1-7-push.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && (".tekton/multicluster-global-hub-agent-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,agent}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.16" && (".tekton/multicluster-global-hub-agent-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,agent}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) creationTimestamp: null labels: appstudio.openshift.io/application: release-globalhub-1-7 diff --git a/.tekton/multicluster-global-hub-manager-globalhub-1-6-pull-request.yaml b/.tekton/multicluster-global-hub-manager-globalhub-1-6-pull-request.yaml deleted file mode 100644 index aac521c8de..0000000000 --- a/.tekton/multicluster-global-hub-manager-globalhub-1-6-pull-request.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && (".tekton/multicluster-global-hub-manager-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,manager}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) - creationTimestamp: null - labels: - appstudio.openshift.io/application: release-globalhub-1-6 - appstudio.openshift.io/component: multicluster-global-hub-manager-globalhub-1-6 - pipelines.appstudio.openshift.io/type: build - name: multicluster-global-hub-manager-globalhub-1-6-on-pull-request - namespace: acm-multicluster-glo-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-manager-globalhub-1-6:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - linux/ppc64le - - linux/s390x - - linux/arm64 - - name: dockerfile - value: manager/Containerfile.manager - - name: path-context - value: . - - name: build-source-image - value: "true" - - name: hermetic - value: "true" - - name: prefetch-input - value: '[ {"type": "gomod", "path": "."}, {"type": "rpm", "path": "."} ]' - - name: use-dev-package-managers - value: "true" - - name: build-args - value: ["GIT_COMMIT={{revision}}"] - pipelineRef: - resolver: git - params: - - name: url - value: "https://github.com/stolostron/konflux-build-catalog.git" - - name: revision - value: main - - name: pathInRepo - value: pipelines/common.yaml - taskRunTemplate: - serviceAccountName: build-pipeline-multicluster-global-hub-manager-globalhub-1-6 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/multicluster-global-hub-manager-globalhub-1-6-push.yaml b/.tekton/multicluster-global-hub-manager-globalhub-1-6-push.yaml deleted file mode 100644 index 4c7d452021..0000000000 --- a/.tekton/multicluster-global-hub-manager-globalhub-1-6-push.yaml +++ /dev/null @@ -1,75 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/build-nudge-files: "konflux-patch.sh" - build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "false" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.15" && (".tekton/multicluster-global-hub-manager-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,manager}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) - creationTimestamp: null - labels: - appstudio.openshift.io/application: release-globalhub-1-6 - appstudio.openshift.io/component: multicluster-global-hub-manager-globalhub-1-6 - pipelines.appstudio.openshift.io/type: build - name: multicluster-global-hub-manager-globalhub-1-6-on-push - namespace: acm-multicluster-glo-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-manager-globalhub-1-6:{{revision}} - - name: build-platforms - value: - - linux/x86_64 - - linux/ppc64le - - linux/s390x - - linux/arm64 - - name: dockerfile - value: manager/Containerfile.manager - - name: path-context - value: . - - name: build-source-image - value: "true" - - name: hermetic - value: "true" - - name: prefetch-input - value: '[ {"type": "gomod", "path": "."}, {"type": "rpm", "path": "."} ]' - - name: use-dev-package-managers - value: "true" - - name: build-args - value: ["GIT_COMMIT={{revision}}"] - - name: send-slack-notification - value: "true" - - name: konflux-application-name - value: "release-globalhub-1-6" - - name: slack-webhook-url-secret-name - # See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html - value: "slack-notify-webhook" - - name: slack-webhook-url-secret-key - value: "slack-webhook-url" - - name: slack-group-id - # Will mention the user in the slack message when the pipeline run failed; this is not required. - # Please make sure replace the value with component owner's slack member id. - value: "S09JCE3DF9N" - pipelineRef: - resolver: git - params: - - name: url - value: "https://github.com/stolostron/konflux-build-catalog.git" - - name: revision - value: main - - name: pathInRepo - value: pipelines/common.yaml - taskRunTemplate: - serviceAccountName: build-pipeline-multicluster-global-hub-manager-globalhub-1-6 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} \ No newline at end of file diff --git a/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml b/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml index 14e8a864b2..0e58153771 100644 --- a/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml +++ b/.tekton/multicluster-global-hub-manager-globalhub-1-7-push.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && (".tekton/multicluster-global-hub-manager-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,manager}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.16" && (".tekton/multicluster-global-hub-manager-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,manager}/***".pathChanged() || "librdkafka/***".pathChanged() || "rpms.in.yaml".pathChanged() || "rpms.lock.yaml".pathChanged()) creationTimestamp: null labels: appstudio.openshift.io/application: release-globalhub-1-7 diff --git a/.tekton/multicluster-global-hub-operator-globalhub-1-6-pull-request.yaml b/.tekton/multicluster-global-hub-operator-globalhub-1-6-pull-request.yaml deleted file mode 100644 index 5af5054aa6..0000000000 --- a/.tekton/multicluster-global-hub-operator-globalhub-1-6-pull-request.yaml +++ /dev/null @@ -1,62 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && (".tekton/multicluster-global-hub-operator-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,operator}/***".pathChanged()) - creationTimestamp: null - labels: - appstudio.openshift.io/application: release-globalhub-1-6 - appstudio.openshift.io/component: multicluster-global-hub-operator-globalhub-1-6 - pipelines.appstudio.openshift.io/type: build - name: multicluster-global-hub-operator-globalhub-1-6-on-pull-request - namespace: acm-multicluster-glo-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-operator-globalhub-1-6:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - linux/ppc64le - - linux/s390x - - linux/arm64 - - name: dockerfile - value: operator/Containerfile.operator - - name: path-context - value: . - - name: build-source-image - value: "true" - - name: hermetic - value: "true" - - name: prefetch-input - value: '[ {"type": "gomod", "path": "."} ]' - - name: build-args - value: ["GIT_COMMIT={{revision}}"] - pipelineRef: - resolver: git - params: - - name: url - value: "https://github.com/stolostron/konflux-build-catalog.git" - - name: revision - value: main - - name: pathInRepo - value: pipelines/common.yaml - taskRunTemplate: - serviceAccountName: build-pipeline-multicluster-global-hub-operator-globalhub-1-6 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/multicluster-global-hub-operator-globalhub-1-6-push.yaml b/.tekton/multicluster-global-hub-operator-globalhub-1-6-push.yaml deleted file mode 100644 index eed0b73755..0000000000 --- a/.tekton/multicluster-global-hub-operator-globalhub-1-6-push.yaml +++ /dev/null @@ -1,73 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/build-nudge-files: "konflux-patch.sh" - build.appstudio.openshift.io/repo: https://github.com/stolostron/multicluster-global-hub?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "false" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.15" && (".tekton/multicluster-global-hub-operator-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,operator}/***".pathChanged()) - creationTimestamp: null - labels: - appstudio.openshift.io/application: release-globalhub-1-6 - appstudio.openshift.io/component: multicluster-global-hub-operator-globalhub-1-6 - pipelines.appstudio.openshift.io/type: build - name: multicluster-global-hub-operator-globalhub-1-6-on-push - namespace: acm-multicluster-glo-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-operator-globalhub-1-6:{{revision}} - - name: build-platforms - value: - - linux/x86_64 - - linux/ppc64le - - linux/s390x - - linux/arm64 - - name: dockerfile - value: operator/Containerfile.operator - - name: path-context - value: . - - name: build-source-image - value: "true" - - name: hermetic - value: "true" - - name: prefetch-input - value: '[ {"type": "gomod", "path": "."} ]' - - name: build-args - value: ["GIT_COMMIT={{revision}}"] - - name: send-slack-notification - value: "true" - - name: konflux-application-name - value: "release-globalhub-1-6" - - name: slack-webhook-url-secret-name - # See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html - value: "slack-notify-webhook" - - name: slack-webhook-url-secret-key - value: "slack-webhook-url" - - name: slack-group-id - # Will mention the user in the slack message when the pipeline run failed; this is not required. - # Please make sure replace the value with component owner's slack member id. - value: "S09JCE3DF9N" - pipelineRef: - resolver: git - params: - - name: url - value: "https://github.com/stolostron/konflux-build-catalog.git" - - name: revision - value: main - - name: pathInRepo - value: pipelines/common.yaml - taskRunTemplate: - serviceAccountName: build-pipeline-multicluster-global-hub-operator-globalhub-1-6 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} \ No newline at end of file diff --git a/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml b/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml index 1547bc5b3e..d8549a4ad3 100644 --- a/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml +++ b/.tekton/multicluster-global-hub-operator-globalhub-1-7-push.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && (".tekton/multicluster-global-hub-operator-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,operator}/***".pathChanged()) + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.16" && (".tekton/multicluster-global-hub-operator-[!b]*.yaml".pathChanged() || "go.{mod,sum}".pathChanged() || "{pkg,operator}/***".pathChanged()) creationTimestamp: null labels: appstudio.openshift.io/application: release-globalhub-1-7 diff --git a/operator/Makefile b/operator/Makefile index 39b446d144..0884cb41b1 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -3,14 +3,14 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 1.6.0-dev +VERSION ?= 1.7.0-dev # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") # To re-generate a bundle for other specific channels without changing the standard setup, you can: # - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable) # - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable") -CHANNELS = "release-1.6" +CHANNELS = "release-1.7" ifneq ($(origin CHANNELS), undefined) BUNDLE_CHANNELS := --channels=$(CHANNELS) endif @@ -20,7 +20,7 @@ endif # To re-generate a bundle for any other default channel without changing the default setup, you can: # - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable) # - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable") -DEFAULT_CHANNEL = "release-1.6" +DEFAULT_CHANNEL = "release-1.7" ifneq ($(origin DEFAULT_CHANNEL), undefined) BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) endif diff --git a/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml b/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml index 77f332f44f..57707e93dc 100644 --- a/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml +++ b/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml @@ -41,7 +41,7 @@ metadata: categories: Integration & Delivery,OpenShift Optional certified: "false" containerImage: quay.io/stolostron/multicluster-global-hub-operator:latest - createdAt: "2025-08-27T07:10:21Z" + createdAt: "2025-11-18T04:45:26Z" description: Manages the installation and upgrade of the Multicluster Global Hub. features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "false" @@ -53,7 +53,7 @@ metadata: features.operators.openshift.io/token-auth-aws: "false" features.operators.openshift.io/token-auth-azure: "false" features.operators.openshift.io/token-auth-gcp: "false" - olm.skipRange: '>=1.5.0 <1.6.0' + olm.skipRange: '>=1.6.0 <1.7.0' operatorframework.io/initialization-resource: '{"apiVersion":"operator.open-cluster-management.io/v1alpha4", "kind":"MulticlusterGlobalHub","metadata":{"name":"multiclusterglobalhub","namespace":"multicluster-global-hub"}, "spec": {}}' @@ -71,7 +71,7 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported - name: multicluster-global-hub-operator.v1.6.0-dev + name: multicluster-global-hub-operator.v1.7.0-dev namespace: placeholder spec: apiservicedefinitions: {} @@ -255,7 +255,7 @@ spec: ``` ## Documentation For documentation about installing and using the Multicluster GlobalHub Operator with Red Hat Advanced Cluster Management for - Kubernetes, see [Multicluser GlobalHub Documentation](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.15/html-single/multicluster_global_hub/index#doc-wrapper) in the Red Hat Advanced Cluster Management + Kubernetes, see [Multicluser GlobalHub Documentation](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.16/html-single/multicluster_global_hub/index#doc-wrapper) in the Red Hat Advanced Cluster Management documentation. ## Support & Troubleshooting @@ -1164,8 +1164,8 @@ spec: maintainers: - email: acm-contact@redhat.com name: acm-contact - maturity: release-1.6 + maturity: release-1.7 provider: name: Red Hat, Inc url: https://github.com/stolostron/multicluster-global-hub - version: 1.6.0-dev + version: 1.7.0-dev diff --git a/operator/bundle/metadata/annotations.yaml b/operator/bundle/metadata/annotations.yaml index 5099dfcd66..636c6310f3 100644 --- a/operator/bundle/metadata/annotations.yaml +++ b/operator/bundle/metadata/annotations.yaml @@ -4,8 +4,8 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: multicluster-global-hub-operator - operators.operatorframework.io.bundle.channels.v1: release-1.6 - operators.operatorframework.io.bundle.channel.default.v1: release-1.6 + operators.operatorframework.io.bundle.channels.v1: release-1.7 + operators.operatorframework.io.bundle.channel.default.v1: release-1.7 operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 diff --git a/operator/config/manifests/bases/multicluster-global-hub-operator.clusterserviceversion.yaml b/operator/config/manifests/bases/multicluster-global-hub-operator.clusterserviceversion.yaml index 730f0864be..823ea5e6f3 100644 --- a/operator/config/manifests/bases/multicluster-global-hub-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/bases/multicluster-global-hub-operator.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: features.operators.openshift.io/token-auth-aws: "false" features.operators.openshift.io/token-auth-azure: "false" features.operators.openshift.io/token-auth-gcp: "false" - olm.skipRange: '>=1.5.0 <1.6.0' + olm.skipRange: '>=1.6.0 <1.7.0' operatorframework.io/initialization-resource: '{"apiVersion":"operator.open-cluster-management.io/v1alpha4", "kind":"MulticlusterGlobalHub","metadata":{"name":"multiclusterglobalhub","namespace":"multicluster-global-hub"}, "spec": {}}' @@ -220,7 +220,7 @@ spec: ``` ## Documentation For documentation about installing and using the Multicluster GlobalHub Operator with Red Hat Advanced Cluster Management for - Kubernetes, see [Multicluser GlobalHub Documentation](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.15/html-single/multicluster_global_hub/index#doc-wrapper) in the Red Hat Advanced Cluster Management + Kubernetes, see [Multicluser GlobalHub Documentation](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.16/html-single/multicluster_global_hub/index#doc-wrapper) in the Red Hat Advanced Cluster Management documentation. ## Support & Troubleshooting @@ -253,7 +253,7 @@ spec: maintainers: - email: acm-contact@redhat.com name: acm-contact - maturity: release-1.6 + maturity: release-1.7 provider: name: Red Hat, Inc url: https://github.com/stolostron/multicluster-global-hub diff --git a/renovate.json b/renovate.json index a729f80399..bfdcf46a65 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "baseBranches": ["main", "release-2.14", "release-2.13", "release-2.12"], + "baseBranches": ["main", "release-2.15", "release-2.14", "release-2.13"], "addLabels": ["ok-to-test"], "schedule": ["every weekend"], "timezone": "America/New_York",