Skip to content

Add admin/sts acks for 4.12 #1343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Nov 23, 2022
Merged

Add admin/sts acks for 4.12 #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dfc838
Add admin/sts acks for 4.12
cblecker Nov 22, 2022
95c9da8
on push: make
cblecker Nov 22, 2022
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
7 changes: 7 additions & 0 deletions deploy/osd-cluster-acks/ocp/4.12/admin-gates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions deploy/osd-cluster-acks/ocp/4.12/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
12 changes: 12 additions & 0 deletions deploy/osd-cluster-acks/sts/4.12/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
6 changes: 6 additions & 0 deletions deploy/osd-cluster-acks/sts/4.12/osd-sts-ack_CloudCredential.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
63 changes: 63 additions & 0 deletions hack/00-osd-managed-cluster-config-integration.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
63 changes: 63 additions & 0 deletions hack/00-osd-managed-cluster-config-production.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
63 changes: 63 additions & 0 deletions hack/00-osd-managed-cluster-config-stage.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down