diff --git a/deploy/osd-cluster-acks/ocp/4.12/admin-gates.yaml b/deploy/osd-cluster-acks/ocp/4.12/admin-gates.yaml new file mode 100644 index 0000000000..1e0b435e2e --- /dev/null +++ b/deploy/osd-cluster-acks/ocp/4.12/admin-gates.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +data: + ack-4.11-kube-1.25-api-removals-in-4.12: "true" +kind: ConfigMap +metadata: + name: admin-acks + namespace: openshift-config diff --git a/deploy/osd-cluster-acks/ocp/4.12/config.yaml b/deploy/osd-cluster-acks/ocp/4.12/config.yaml new file mode 100644 index 0000000000..339d6f4a58 --- /dev/null +++ b/deploy/osd-cluster-acks/ocp/4.12/config.yaml @@ -0,0 +1,10 @@ +deploymentMode: "SelectorSyncSet" +selectorSyncSet: + resourceApplyMode: Upsert + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: ["4.11"] + - key: api.openshift.com/gate-ocp + operator: In + values: ["4.12"] diff --git a/deploy/osd-cluster-acks/sts/4.12/config.yaml b/deploy/osd-cluster-acks/sts/4.12/config.yaml new file mode 100644 index 0000000000..502c29562b --- /dev/null +++ b/deploy/osd-cluster-acks/sts/4.12/config.yaml @@ -0,0 +1,12 @@ +deploymentMode: SelectorSyncSet +selectorSyncSet: + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: ["4.11"] + - key: api.openshift.com/gate-sts + operator: In + values: ["4.12"] + - key: api.openshift.com/sts + operator: In + values: ["true"] diff --git a/deploy/osd-cluster-acks/sts/4.12/osd-sts-ack_CloudCredential.yaml b/deploy/osd-cluster-acks/sts/4.12/osd-sts-ack_CloudCredential.yaml new file mode 100644 index 0000000000..27abc0f089 --- /dev/null +++ b/deploy/osd-cluster-acks/sts/4.12/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.12"}}}' +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 f8ae09c28b..4b082c510c 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -10163,6 +10163,36 @@ objects: applyMode: AlwaysApply patch: '{"spec":{"channel":"stable-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-cluster-acks-ocp-4.12 + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: + - '4.11' + - key: api.openshift.com/gate-ocp + operator: In + values: + - '4.12' + resourceApplyMode: Upsert + resources: + - apiVersion: v1 + data: + ack-4.11-kube-1.25-api-removals-in-4.12: 'true' + kind: ConfigMap + metadata: + name: admin-acks + namespace: openshift-config - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: @@ -10259,6 +10289,39 @@ objects: applyMode: AlwaysApply patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.11"}}}' 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.12 + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: + - '4.11' + - key: api.openshift.com/gate-sts + operator: In + values: + - '4.12' + - 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.12"}}}' + 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 fbda25cfbe..6fdab9de8e 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -10163,6 +10163,36 @@ objects: applyMode: AlwaysApply patch: '{"spec":{"channel":"stable-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-cluster-acks-ocp-4.12 + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: + - '4.11' + - key: api.openshift.com/gate-ocp + operator: In + values: + - '4.12' + resourceApplyMode: Upsert + resources: + - apiVersion: v1 + data: + ack-4.11-kube-1.25-api-removals-in-4.12: 'true' + kind: ConfigMap + metadata: + name: admin-acks + namespace: openshift-config - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: @@ -10259,6 +10289,39 @@ objects: applyMode: AlwaysApply patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.11"}}}' 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.12 + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: + - '4.11' + - key: api.openshift.com/gate-sts + operator: In + values: + - '4.12' + - 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.12"}}}' + 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 0187daf6f1..2a9dfb348e 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -10163,6 +10163,36 @@ objects: applyMode: AlwaysApply patch: '{"spec":{"channel":"stable-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-cluster-acks-ocp-4.12 + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: + - '4.11' + - key: api.openshift.com/gate-ocp + operator: In + values: + - '4.12' + resourceApplyMode: Upsert + resources: + - apiVersion: v1 + data: + ack-4.11-kube-1.25-api-removals-in-4.12: 'true' + kind: ConfigMap + metadata: + name: admin-acks + namespace: openshift-config - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: @@ -10259,6 +10289,39 @@ objects: applyMode: AlwaysApply patch: '{"metadata":{"annotations":{"cloudcredential.openshift.io/upgradeable-to":"v4.11"}}}' 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.12 + spec: + clusterDeploymentSelector: + matchLabels: + api.openshift.com/managed: 'true' + matchExpressions: + - key: hive.openshift.io/version-major-minor + operator: In + values: + - '4.11' + - key: api.openshift.com/gate-sts + operator: In + values: + - '4.12' + - 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.12"}}}' + patchType: merge - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: