diff --git a/deploy/osd-channel-patch/nightly/01-patch.clusterversion.yaml b/deploy/osd-channel-patch/nightly/01-patch.clusterversion.yaml new file mode 100644 index 0000000000..e9ffd9e079 --- /dev/null +++ b/deploy/osd-channel-patch/nightly/01-patch.clusterversion.yaml @@ -0,0 +1,6 @@ +apiVersion: config.openshift.io/v1 +kind: ClusterVersion +name: version +applyMode: AlwaysApply +patch: '{"spec":{"channel":""}}' +patchType: merge diff --git a/deploy/osd-channel-patch/nightly/config.yaml b/deploy/osd-channel-patch/nightly/config.yaml new file mode 100644 index 0000000000..8107ac420c --- /dev/null +++ b/deploy/osd-channel-patch/nightly/config.yaml @@ -0,0 +1,6 @@ +deploymentMode: "SelectorSyncSet" +selectorSyncSet: + matchExpressions: + - key: api.openshift.com/channel-group + operator: In + values: ["nightly"] diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index 2b9da8f69c..1e2e1faa0a 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -4628,6 +4628,31 @@ objects: applyMode: AlwaysApply patch: '{"spec":{"channel":"fast-4.9"}}' patchType: merge +- apiVersion: hive.openshift.io/v1 + kind: SelectorSyncSet + metadata: + labels: + managed.openshift.io/gitHash: ${IMAGE_TAG} + managed.openshift.io/gitRepoName: ${REPO_NAME} + managed.openshift.io/osd: 'true' + name: osd-channel-patch-nightly + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: api.openshift.com/channel-group + operator: In + values: + - nightly + resourceApplyMode: Sync + patches: + - apiVersion: config.openshift.io/v1 + kind: ClusterVersion + name: version + applyMode: AlwaysApply + patch: '{"spec":{"channel":""}}' + patchType: merge - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index 89374aabf0..edf2c2997d 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -4628,6 +4628,31 @@ objects: applyMode: AlwaysApply patch: '{"spec":{"channel":"fast-4.9"}}' patchType: merge +- apiVersion: hive.openshift.io/v1 + kind: SelectorSyncSet + metadata: + labels: + managed.openshift.io/gitHash: ${IMAGE_TAG} + managed.openshift.io/gitRepoName: ${REPO_NAME} + managed.openshift.io/osd: 'true' + name: osd-channel-patch-nightly + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: api.openshift.com/channel-group + operator: In + values: + - nightly + resourceApplyMode: Sync + patches: + - apiVersion: config.openshift.io/v1 + kind: ClusterVersion + name: version + applyMode: AlwaysApply + patch: '{"spec":{"channel":""}}' + patchType: merge - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index 5662e9a004..3bc1557368 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -4628,6 +4628,31 @@ objects: applyMode: AlwaysApply patch: '{"spec":{"channel":"fast-4.9"}}' patchType: merge +- apiVersion: hive.openshift.io/v1 + kind: SelectorSyncSet + metadata: + labels: + managed.openshift.io/gitHash: ${IMAGE_TAG} + managed.openshift.io/gitRepoName: ${REPO_NAME} + managed.openshift.io/osd: 'true' + name: osd-channel-patch-nightly + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: api.openshift.com/channel-group + operator: In + values: + - nightly + resourceApplyMode: Sync + patches: + - apiVersion: config.openshift.io/v1 + kind: ClusterVersion + name: version + applyMode: AlwaysApply + patch: '{"spec":{"channel":""}}' + patchType: merge - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: