Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7
git clone https://github.com/stolostron/multicluster-global-hub-operator-bundle.git -b release-1.8

# compare the bundle dir
diff -I 'createdAt' -ruN operator/bundle multicluster-global-hub-operator-bundle/bundle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
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
appstudio.openshift.io/application: release-globalhub-1-8
appstudio.openshift.io/component: multicluster-global-hub-agent-globalhub-1-8
pipelines.appstudio.openshift.io/type: build
name: multicluster-global-hub-agent-globalhub-1-7-on-pull-request
name: multicluster-global-hub-agent-globalhub-1-8-on-pull-request
namespace: acm-multicluster-glo-tenant
spec:
params:
Expand All @@ -23,7 +23,7 @@ spec:
- 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}}
value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-agent-globalhub-1-8:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: build-platforms
Expand Down Expand Up @@ -56,7 +56,7 @@ spec:
- name: pathInRepo
value: pipelines/common-base.yaml
taskRunTemplate:
serviceAccountName: build-pipeline-multicluster-global-hub-agent-globalhub-1-7
serviceAccountName: build-pipeline-multicluster-global-hub-agent-globalhub-1-8
workspaces:
- name: git-auth
secret:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ 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.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())
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.17" && (".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
appstudio.openshift.io/application: release-globalhub-1-8
appstudio.openshift.io/component: multicluster-global-hub-agent-globalhub-1-8
pipelines.appstudio.openshift.io/type: build
name: multicluster-global-hub-agent-globalhub-1-7-on-push
name: multicluster-global-hub-agent-globalhub-1-8-on-push
namespace: acm-multicluster-glo-tenant
spec:
params:
Expand All @@ -23,7 +23,7 @@ spec:
- 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}}
value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-agent-globalhub-1-8:{{revision}}
- name: build-platforms
value:
- linux/x86_64
Expand All @@ -47,7 +47,7 @@ spec:
- name: send-slack-notification
value: "true"
- name: konflux-application-name
value: "release-globalhub-1-7"
value: "release-globalhub-1-8"
- name: slack-webhook-url-secret-name
# See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html
value: "slack-notify-webhook"
Expand All @@ -67,7 +67,7 @@ spec:
- name: pathInRepo
value: pipelines/common-base.yaml
taskRunTemplate:
serviceAccountName: build-pipeline-multicluster-global-hub-agent-globalhub-1-7
serviceAccountName: build-pipeline-multicluster-global-hub-agent-globalhub-1-8
workspaces:
- name: git-auth
secret:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
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
appstudio.openshift.io/application: release-globalhub-1-8
appstudio.openshift.io/component: multicluster-global-hub-manager-globalhub-1-8
pipelines.appstudio.openshift.io/type: build
name: multicluster-global-hub-manager-globalhub-1-7-on-pull-request
name: multicluster-global-hub-manager-globalhub-1-8-on-pull-request
namespace: acm-multicluster-glo-tenant
spec:
params:
Expand All @@ -23,7 +23,7 @@ spec:
- 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}}
value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-manager-globalhub-1-8:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: build-platforms
Expand Down Expand Up @@ -56,7 +56,7 @@ spec:
- name: pathInRepo
value: pipelines/common-base.yaml
taskRunTemplate:
serviceAccountName: build-pipeline-multicluster-global-hub-manager-globalhub-1-7
serviceAccountName: build-pipeline-multicluster-global-hub-manager-globalhub-1-8
workspaces:
- name: git-auth
secret:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ 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.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())
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-2.17" && (".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
appstudio.openshift.io/application: release-globalhub-1-8
appstudio.openshift.io/component: multicluster-global-hub-manager-globalhub-1-8
pipelines.appstudio.openshift.io/type: build
name: multicluster-global-hub-manager-globalhub-1-7-on-push
name: multicluster-global-hub-manager-globalhub-1-8-on-push
namespace: acm-multicluster-glo-tenant
spec:
params:
Expand All @@ -23,7 +23,7 @@ spec:
- 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}}
value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-manager-globalhub-1-8:{{revision}}
- name: build-platforms
value:
- linux/x86_64
Expand All @@ -47,7 +47,7 @@ spec:
- name: send-slack-notification
value: "true"
- name: konflux-application-name
value: "release-globalhub-1-7"
value: "release-globalhub-1-8"
- name: slack-webhook-url-secret-name
# See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html
value: "slack-notify-webhook"
Expand All @@ -67,7 +67,7 @@ spec:
- name: pathInRepo
value: pipelines/common-base.yaml
taskRunTemplate:
serviceAccountName: build-pipeline-multicluster-global-hub-manager-globalhub-1-7
serviceAccountName: build-pipeline-multicluster-global-hub-manager-globalhub-1-8
workspaces:
- name: git-auth
secret:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
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
appstudio.openshift.io/application: release-globalhub-1-8
appstudio.openshift.io/component: multicluster-global-hub-operator-globalhub-1-8
pipelines.appstudio.openshift.io/type: build
name: multicluster-global-hub-operator-globalhub-1-7-on-pull-request
name: multicluster-global-hub-operator-globalhub-1-8-on-pull-request
namespace: acm-multicluster-glo-tenant
spec:
params:
Expand All @@ -23,7 +23,7 @@ spec:
- 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}}
value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-operator-globalhub-1-8:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: build-platforms
Expand Down Expand Up @@ -54,7 +54,7 @@ spec:
- name: pathInRepo
value: pipelines/common-base.yaml
taskRunTemplate:
serviceAccountName: build-pipeline-multicluster-global-hub-operator-globalhub-1-7
serviceAccountName: build-pipeline-multicluster-global-hub-operator-globalhub-1-8
workspaces:
- name: git-auth
secret:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ 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.16" && (".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.17" && (".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
appstudio.openshift.io/application: release-globalhub-1-8
appstudio.openshift.io/component: multicluster-global-hub-operator-globalhub-1-8
pipelines.appstudio.openshift.io/type: build
name: multicluster-global-hub-operator-globalhub-1-7-on-push
name: multicluster-global-hub-operator-globalhub-1-8-on-push
namespace: acm-multicluster-glo-tenant
spec:
params:
Expand All @@ -23,7 +23,7 @@ spec:
- 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}}
value: quay.io/redhat-user-workloads/acm-multicluster-glo-tenant/multicluster-global-hub-operator-globalhub-1-8:{{revision}}
- name: build-platforms
value:
- linux/x86_64
Expand All @@ -45,7 +45,7 @@ spec:
- name: send-slack-notification
value: "true"
- name: konflux-application-name
value: "release-globalhub-1-7"
value: "release-globalhub-1-8"
- name: slack-webhook-url-secret-name
# See details: https://konflux.pages.redhat.com/docs/users/patterns/slack-notifications.html
value: "slack-notify-webhook"
Expand All @@ -65,7 +65,7 @@ spec:
- name: pathInRepo
value: pipelines/common-base.yaml
taskRunTemplate:
serviceAccountName: build-pipeline-multicluster-global-hub-operator-globalhub-1-7
serviceAccountName: build-pipeline-multicluster-global-hub-operator-globalhub-1-8
workspaces:
- name: git-auth
secret:
Expand Down
4 changes: 2 additions & 2 deletions agent/Containerfile.agent
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ LABEL com.redhat.component="multicluster-globalhub-agent-rhel9"
LABEL org.label-schema.vendor="Red Hat"
LABEL org.label-schema.license="Red Hat Advanced Cluster Management for Kubernetes EULA"
LABEL org.label-schema.schema-version="1.0"
LABEL cpe="cpe:/a:redhat:multicluster_globalhub:1.7::el9"
LABEL cpe="cpe:/a:redhat:multicluster_globalhub:1.8::el9"

# Bundle metadata
LABEL name="multicluster-globalhub/multicluster-globalhub-agent-rhel9"
LABEL version="release-1.7"
LABEL version="release-1.8"
LABEL summary="multicluster global hub agent"
LABEL io.openshift.expose-services=""
LABEL io.openshift.tags="data,images"
Expand Down
4 changes: 2 additions & 2 deletions manager/Containerfile.manager
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ LABEL com.redhat.component="multicluster-globalhub-manager-rhel9"
LABEL org.label-schema.vendor="Red Hat"
LABEL org.label-schema.license="Red Hat Advanced Cluster Management for Kubernetes EULA"
LABEL org.label-schema.schema-version="1.0"
LABEL cpe="cpe:/a:redhat:multicluster_globalhub:1.7::el9"
LABEL cpe="cpe:/a:redhat:multicluster_globalhub:1.8::el9"

# Bundle metadata
LABEL name="multicluster-globalhub/multicluster-globalhub-manager-rhel9"
LABEL version="release-1.7"
LABEL version="release-1.8"
LABEL summary="multicluster global hub manager"
LABEL io.openshift.expose-services=""
LABEL io.openshift.tags="data,images"
Expand Down
4 changes: 2 additions & 2 deletions operator/Containerfile.operator
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ LABEL com.redhat.component="multicluster-globalhub-rhel9-operator"
LABEL org.label-schema.vendor="Red Hat"
LABEL org.label-schema.license="Red Hat Advanced Cluster Management for Kubernetes EULA"
LABEL org.label-schema.schema-version="1.0"
LABEL cpe="cpe:/a:redhat:multicluster_globalhub:1.7::el9"
LABEL cpe="cpe:/a:redhat:multicluster_globalhub:1.8::el9"

# Bundle metadata
LABEL name="multicluster-globalhub/multicluster-globalhub-rhel9-operator"
LABEL version="release-1.7"
LABEL version="release-1.8"
LABEL summary="multicluster global hub operator"
LABEL io.openshift.expose-services=""
LABEL io.openshift.tags="data,images"
Expand Down
6 changes: 3 additions & 3 deletions operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0-dev
VERSION ?= 1.8.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.7"
CHANNELS = "release-1.8"
ifneq ($(origin CHANNELS), undefined)
BUNDLE_CHANNELS := --channels=$(CHANNELS)
endif
Expand All @@ -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.7"
DEFAULT_CHANNEL = "release-1.8"
ifneq ($(origin DEFAULT_CHANNEL), undefined)
BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ metadata:
categories: Integration & Delivery,OpenShift Optional
certified: "false"
containerImage: quay.io/stolostron/multicluster-global-hub-operator:latest
createdAt: "2026-01-21T06:18:42Z"
createdAt: "2026-03-12T08:36:41Z"
description: Manages the installation and upgrade of the Multicluster Global Hub.
features.operators.openshift.io/cnf: "false"
features.operators.openshift.io/cni: "false"
Expand All @@ -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.6.0 <1.7.0'
olm.skipRange: '>=1.7.0 <1.8.0'
operatorframework.io/initialization-resource: '{"apiVersion":"operator.open-cluster-management.io/v1alpha4",
"kind":"MulticlusterGlobalHub","metadata":{"name":"multiclusterglobalhub","namespace":"multicluster-global-hub"},
"spec": {}}'
Expand All @@ -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.7.0-dev
name: multicluster-global-hub-operator.v1.8.0-dev
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -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.16/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.17/html-single/multicluster_global_hub/index#doc-wrapper) in the Red Hat Advanced Cluster Management
documentation.

## Support & Troubleshooting
Expand Down Expand Up @@ -1141,8 +1141,8 @@ spec:
maintainers:
- email: acm-contact@redhat.com
name: acm-contact
maturity: release-1.7
maturity: release-1.8
provider:
name: Red Hat, Inc
url: https://github.com/stolostron/multicluster-global-hub
version: 1.7.0-dev
version: 1.8.0-dev
4 changes: 2 additions & 2 deletions operator/bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7
operators.operatorframework.io.bundle.channel.default.v1: release-1.7
operators.operatorframework.io.bundle.channels.v1: release-1.8
operators.operatorframework.io.bundle.channel.default.v1: release-1.8
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
Expand Down
Loading