Skip to content
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

Jump to bottom

PTX-25021 Add API acknowledgement for OCP 4.16 #2663

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PTX-25021 Add API acknowledgement for OCP 4.16 #2663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion drivers/scheduler/openshift/openshift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ var (
openshiftVersion_4_12, _ = version.NewVersion("4.12.0")
openshiftVersion_4_13, _ = version.NewVersion("4.13.0")
openshiftVersion_4_14, _ = version.NewVersion("4.14.0")
openshiftVersion_4_15, _ = version.NewVersion("4.15.0")
openshiftVersion_4_16, _ = version.NewVersion("4.16.0")
)

type openshift struct {
Expand Down Expand Up @@ -753,8 +755,10 @@ func ackAPIRemoval(ocpVer string) error {
patchData = "{\"data\":{\"ack-4.11-kube-1.25-api-removals-in-4.12\":\"true\"}}"
} else if openshiftVersion.GreaterThanOrEqual(openshiftVersion_4_13) && openshiftVersion.LessThan(openshiftVersion_4_14) {
patchData = "{\"data\":{\"ack-4.12-kube-1.26-api-removals-in-4.13\":\"true\"}}"
} else if openshiftVersion.GreaterThanOrEqual(openshiftVersion_4_14) {
} else if openshiftVersion.GreaterThanOrEqual(openshiftVersion_4_14) && openshiftVersion.LessThan(openshiftVersion_4_15) {
patchData = "{\"data\":{\"ack-4.13-kube-1.27-api-removals-in-4.14\":\"true\"}}"
} else if openshiftVersion.GreaterThanOrEqual(openshiftVersion_4_16) {
patchData = "{\"data\":{\"ack-4.15-kube-1.29-api-removals-in-4.16\":\"true\"}}"
} else {
log.Infof("Providing acknowledgment of API removal is not needed when upgrading to OCP version [%s]", openshiftVersion.String())
return nil
Expand Down