diff --git a/deploy/osd-cluster-acks/sts/4.13/config.yaml b/deploy/osd-cluster-acks/sts/4.13/config.yaml new file mode 100644 index 0000000000..c23d187fb9 --- /dev/null +++ b/deploy/osd-cluster-acks/sts/4.13/config.yaml @@ -0,0 +1,12 @@ +deploymentMode: SelectorSyncSet +selectorSyncSet: + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: ["4.12"] + - key: api.openshift.com/gate-sts + operator: In + values: ["4.13"] + - key: api.openshift.com/sts + operator: In + values: ["true"] diff --git a/deploy/osd-cluster-acks/sts/4.13/osd-sts-ack_CloudCredential.yaml b/deploy/osd-cluster-acks/sts/4.13/osd-sts-ack_CloudCredential.yaml new file mode 100644 index 0000000000..746db8abf5 --- /dev/null +++ b/deploy/osd-cluster-acks/sts/4.13/osd-sts-ack_CloudCredential.yaml @@ -0,0 +1,6 @@ +apiVersion: operator.openshift.io/v1 +kind: CloudCredential +name: cluster +applyMode: AlwaysApply +patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.13"}}}' +patchType: merge diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index 3bc50c02ea..12dae4a220 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -24124,6 +24124,39 @@ objects: applyMode: AlwaysApply patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.12"}}}' 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-cluster-acks-sts-4.13 + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: + - '4.12' + - key: api.openshift.com/gate-sts + operator: In + values: + - '4.13' + - key: api.openshift.com/sts + operator: In + values: + - 'true' + resourceApplyMode: Sync + patches: + - apiVersion: operator.openshift.io/v1 + kind: CloudCredential + name: cluster + applyMode: AlwaysApply + patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.13"}}}' + 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 fcb36027af..56f4964dae 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -24124,6 +24124,39 @@ objects: applyMode: AlwaysApply patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.12"}}}' 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-cluster-acks-sts-4.13 + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: + - '4.12' + - key: api.openshift.com/gate-sts + operator: In + values: + - '4.13' + - key: api.openshift.com/sts + operator: In + values: + - 'true' + resourceApplyMode: Sync + patches: + - apiVersion: operator.openshift.io/v1 + kind: CloudCredential + name: cluster + applyMode: AlwaysApply + patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.13"}}}' + 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 6840ad71ad..2eeb6a4e09 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -24124,6 +24124,39 @@ objects: applyMode: AlwaysApply patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.12"}}}' 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-cluster-acks-sts-4.13 + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: + - '4.12' + - key: api.openshift.com/gate-sts + operator: In + values: + - '4.13' + - key: api.openshift.com/sts + operator: In + values: + - 'true' + resourceApplyMode: Sync + patches: + - apiVersion: operator.openshift.io/v1 + kind: CloudCredential + name: cluster + applyMode: AlwaysApply + patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.13"}}}' + patchType: merge - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: