Skip to content

Set min OCP to 4.13 #2848

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-bot merged 1 commit into from
Sep 11, 2024
Merged

Set min OCP to 4.13 #2848

Show file tree
Hide file tree
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
16 changes: 1 addition & 15 deletions hack/lib/certmanager.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,7 @@ function deploy_certmanager_operator {

openshift_version=$(oc version -o yaml | yq read - openshiftVersion)
deployment_namespace="cert-manager"
if printf '%s\n4.12\n' "${openshift_version}" | sort --version-sort -C; then
# OCP version is older as 4.12 and thus cert-manager-operator is only available as tech-preview in this version (cert-manager-operator GA'ed in OCP 4.12)

echo "Running on OpenShift ${openshift_version} which supports cert-manager-operator only in tech-preview"

yq delete "${certmanager_resources_dir}"/subscription.yaml --doc 1 spec | \
yq write - --doc 2 spec.channel tech-preview | \
oc apply -f - || return $?

deployment_namespace="openshift-cert-manager"
else
echo "Running on OpenShift ${openshift_version} which supports GA'ed cert-manager-operator"

oc apply -f "${certmanager_resources_dir}"/subscription.yaml || return $?
fi
oc apply -f "${certmanager_resources_dir}"/subscription.yaml || return $?
Copy link
Copy Markdown
Collaborator Author

@skonto skonto Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess certmanager is GA on 4.13+


logger.info "Waiting until cert manager operator is available"

Expand Down
2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ LABEL \
maintainer="serverless-support@redhat.com" \
description="Red Hat OpenShift Serverless Bundle" \
io.k8s.display-name="Red Hat OpenShift Serverless Bundle" \
com.redhat.openshift.versions="v4.12" \
com.redhat.openshift.versions="v4.13" \
com.redhat.delivery.operator.bundle=true \
com.redhat.delivery.backport=false
4 changes: 2 additions & 2 deletions olm-catalog/serverless-operator/project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ requirements:
golang: '1.22'
nodejs: 20.x
ocpVersion:
min: '4.12'
min: '4.13'
max: '4.15'
label: 'v4.12'
label: 'v4.13'
dependencies:
serving: knative-v1.14
# serving midstream branch name
Expand Down
2 changes: 1 addition & 1 deletion test/upgrade/installation/openshift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var (
// adminAcks includes admin acks for cluster upgrades.
// See https://access.redhat.com/articles/6955381 for more details.
adminAcks = []string{
"ack-4.11-kube-1.25-api-removals-in-4.12",
"ack-4.12-kube-1.26-api-removals-in-4.13",
"ack-4.13-kube-1.27-api-removals-in-4.14",
Copy link
Copy Markdown
Collaborator Author

@skonto skonto Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might need admin acks for 4.16 too, see what others have.

}
)
Expand Down