Skip to content

Bug 1999092: Add and enable admin ack Upgradeable condition gate #647

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 3 commits into from
Sep 28, 2021
Merged

Bug 1999092: Add and enable admin ack Upgradeable condition gate #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6194634
Bug 1978376: Add admin ack Upgradeable condition gate
jottofar Jul 27, 2021
a5db872
pkg/cvo/upgradeable: Enable admin-ack logic
wking Aug 27, 2021
1504de0
admin-gates: Add ack-4.8-kube-122-api-removals-in-4.9 gate
jottofar Aug 31, 2021
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
10 changes: 10 additions & 0 deletions install/0000_00_cluster-version-operator_01_adminack_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: admin-acks
namespace: openshift-config
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/create-only: "true"
13 changes: 13 additions & 0 deletions install/0000_00_cluster-version-operator_01_admingate_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: v1
kind: ConfigMap
data:
ack-4.8-kube-1.22-api-removals-in-4.9: |
Kubernetes 1.22 and therefore OpenShift 4.9 remove several APIs which require admin consideration. Please see
the knowledge article https://access.redhat.com/articles/6329921 for details and instructions.
metadata:
name: admin-gates
namespace: openshift-config-managed
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
4 changes: 3 additions & 1 deletion pkg/cvo/cvo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ func New(
}

cvInformer.Informer().AddEventHandler(optr.eventHandler())
cmConfigInformer.Informer().AddEventHandler(optr.adminAcksEventHandler())
cmConfigManagedInformer.Informer().AddEventHandler(optr.adminGatesEventHandler())

optr.coLister = coInformer.Lister()
optr.cacheSynced = append(optr.cacheSynced, coInformer.Informer().HasSynced)
Expand Down Expand Up @@ -587,7 +589,7 @@ func (optr *Operator) upgradeableSync(ctx context.Context, key string) error {
return nil
}

return optr.syncUpgradeable(config)
return optr.syncUpgradeable()
}

// isOlderThanLastUpdate returns true if the cluster version is older than
Expand Down
Loading