Skip to content

Commit 5cc8af0

Browse files
authored
Set max OCP version to 4.17 (#2915)
* Set max OCP version to 4.17 * Run make generated-files * Copy oc for RHEL 8 from cli image
1 parent f81fe06 commit 5cc8af0

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

knative-operator/deploy/resources/quickstart/serverless-application-quickstart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
review:
4747
failedTaskHelp: >-
4848
This task isn’t verified yet. Try the task again, or [read
49-
more](https://docs.openshift.com/container-platform/4.15/applications/odc-viewing-application-composition-using-topology-view.html)
49+
more](https://docs.openshift.com/container-platform/4.17/applications/odc-viewing-application-composition-using-topology-view.html)
5050
about this topic.
5151
instructions: >-
5252
#### To verify the application was successfully created:
@@ -83,7 +83,7 @@ spec:
8383
review:
8484
failedTaskHelp: >-
8585
This task isn’t verified yet. Try the task again, or [read
86-
more](https://docs.openshift.com/container-platform/4.15/applications/odc-viewing-application-composition-using-topology-view.html#odc-scaling-application-pods-and-checking-builds-and-routes_viewing-application-composition-using-topology-view)
86+
more](https://docs.openshift.com/container-platform/4.17/applications/odc-viewing-application-composition-using-topology-view.html#odc-scaling-application-pods-and-checking-builds-and-routes_viewing-application-composition-using-topology-view)
8787
about this topic.
8888
instructions: >-
8989
#### To verify the application scaled down:
@@ -124,7 +124,7 @@ spec:
124124
review:
125125
failedTaskHelp: >-
126126
This task isn’t verified yet. Try the task again, or [read
127-
more](https://docs.openshift.com/container-platform/4.15/serverless/eventing/event-sources/serverless-pingsource.html#serverless-pingsource-odc_serverless-pingsource)
127+
more](https://docs.openshift.com/container-platform/4.17/serverless/eventing/event-sources/serverless-pingsource.html#serverless-pingsource-odc_serverless-pingsource)
128128
about this topic.
129129
instructions: >-
130130
#### To verify that the event connected to your Knative service:
@@ -176,7 +176,7 @@ spec:
176176
review:
177177
failedTaskHelp: >-
178178
This task isn’t verified yet. Try the task again, or [read
179-
more](https://docs.openshift.com/container-platform/4.15/serverless/knative-serving/traffic-splitting/traffic-splitting-revisions.html#odc-splitting-traffic-between-revisions-using-developer-perspective_traffic-splitting-revisions)
179+
more](https://docs.openshift.com/container-platform/4.17/serverless/knative-serving/traffic-splitting/traffic-splitting-revisions.html#odc-splitting-traffic-between-revisions-using-developer-perspective_traffic-splitting-revisions)
180180
about this topic.
181181
instructions: >-
182182
#### To verify that you forced a new revision and set traffic
@@ -204,7 +204,7 @@ spec:
204204
review:
205205
failedTaskHelp: >-
206206
This task is not verified yet. Try the task again, or [read
207-
more](https://docs.openshift.com/container-platform/4.15/applications/odc-deleting-applications.html)
207+
more](https://docs.openshift.com/container-platform/4.17/applications/odc-deleting-applications.html)
208208
about this topic.
209209
instructions: |-
210210
#### To verify you deleted your application: :

olm-catalog/serverless-operator/index/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/origin/4.15:operator-registry AS opm
1+
FROM registry.ci.openshift.org/origin/4.17:operator-registry AS opm
22

33
FROM registry.access.redhat.com/ubi9/ubi-minimal as builder
44

@@ -19,7 +19,7 @@ registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle \
1919

2020
# The base image is expected to contain
2121
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
22-
FROM registry.ci.openshift.org/origin/4.15:operator-registry
22+
FROM registry.ci.openshift.org/origin/4.17:operator-registry
2323

2424
# Copy declarative config root into image at /configs
2525
COPY --from=builder /configs /configs

olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ spec:
188188
- kafka
189189
links:
190190
- name: Documentation
191-
url: https://access.redhat.com/documentation/en-us/openshift_container_platform/4.15/html/serverless/index
191+
url: https://access.redhat.com/documentation/en-us/openshift_container_platform/4.17/html/serverless/index
192192
- name: Source Repository
193193
url: https://github.com/openshift-knative/serverless-operator
194194
maintainers:
@@ -928,7 +928,7 @@ spec:
928928
- name: "IMAGE_eventmesh-backend__controller"
929929
value: "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-backstage-plugins-eventmesh@sha256:d042a6c240e33f7044e86a9e0874465954efbd3d71ad531421b905afdf6927a4"
930930
- name: "IMAGE_KUBE_RBAC_PROXY"
931-
value: "registry.ci.openshift.org/origin/4.15:kube-rbac-proxy"
931+
value: "registry.ci.openshift.org/origin/4.17:kube-rbac-proxy"
932932
- name: "IMAGE_KN_PLUGIN_EVENT_SENDER"
933933
value: "registry.ci.openshift.org/knative/release-1.15:client-plugin-event-sender"
934934
- name: "IMAGE_KN_CLIENT"
@@ -1100,7 +1100,7 @@ spec:
11001100
- name: "IMAGE_eventmesh-backend__controller"
11011101
value: "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-backstage-plugins-eventmesh@sha256:d042a6c240e33f7044e86a9e0874465954efbd3d71ad531421b905afdf6927a4"
11021102
- name: "IMAGE_KUBE_RBAC_PROXY"
1103-
value: "registry.ci.openshift.org/origin/4.15:kube-rbac-proxy"
1103+
value: "registry.ci.openshift.org/origin/4.17:kube-rbac-proxy"
11041104
- name: "IMAGE_KN_PLUGIN_EVENT_SENDER"
11051105
value: "registry.ci.openshift.org/knative/release-1.15:client-plugin-event-sender"
11061106
- name: "IMAGE_KN_CLIENT"
@@ -1375,7 +1375,7 @@ spec:
13751375
- name: "IMAGE_eventmesh-backend__controller"
13761376
image: "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-backstage-plugins-eventmesh@sha256:d042a6c240e33f7044e86a9e0874465954efbd3d71ad531421b905afdf6927a4"
13771377
- name: "IMAGE_KUBE_RBAC_PROXY"
1378-
image: "registry.ci.openshift.org/origin/4.15:kube-rbac-proxy"
1378+
image: "registry.ci.openshift.org/origin/4.17:kube-rbac-proxy"
13791379
- name: "IMAGE_KN_PLUGIN_EVENT_SENDER"
13801380
image: "registry.ci.openshift.org/knative/release-1.15:client-plugin-event-sender"
13811381
- name: "IMAGE_KN_CLIENT"

olm-catalog/serverless-operator/project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ requirements:
2323
nodejs: 20.x
2424
ocpVersion:
2525
min: '4.13'
26-
max: '4.15'
26+
max: '4.17'
2727
label: 'v4.13'
2828
dependencies:
2929
serving: knative-v1.15

openshift/ci-operator/source-image/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
FROM registry.ci.openshift.org/ocp/4.15:cli AS oc-image
1+
FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts AS oc-image
22

33
FROM src
44

5-
COPY --from=oc-image /usr/bin/oc /usr/bin/oc
5+
ARG TARGETARCH
6+
7+
COPY --from=oc-image /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
68
COPY --from=registry.ci.openshift.org/openshift/knative-serving-src:knative-v1.15 /go/src/github.com/openshift-knative/serving/ /go/src/knative.dev/serving/
79
COPY --from=registry.ci.openshift.org/openshift/knative-eventing-src:knative-v1.15 /go/src/github.com/openshift-knative/eventing/ /go/src/knative.dev/eventing/
810
COPY --from=registry.ci.openshift.org/openshift/eventing-kafka-broker-src:knative-v1.15 /go/src/github.com/openshift-knative/eventing-kafka-broker/ /go/src/knative.dev/eventing-kafka-broker/

templates/test-source-image.Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
FROM registry.ci.openshift.org/ocp/__OCP_MAX_VERSION__:cli AS oc-image
1+
FROM registry.ci.openshift.org/ocp/__OCP_MAX_VERSION__:cli-artifacts AS oc-image
22

33
FROM src
44

5-
COPY --from=oc-image /usr/bin/oc /usr/bin/oc
5+
ARG TARGETARCH
6+
7+
COPY --from=oc-image /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
68
COPY --from=registry.ci.openshift.org/openshift/knative-serving-src:__SERVING_VERSION__ /go/src/github.com/openshift-knative/serving/ /go/src/knative.dev/serving/
79
COPY --from=registry.ci.openshift.org/openshift/knative-eventing-src:__EVENTING_VERSION__ /go/src/github.com/openshift-knative/eventing/ /go/src/knative.dev/eventing/
810
COPY --from=registry.ci.openshift.org/openshift/eventing-kafka-broker-src:__EVENTING_KAFKA_BROKER_VERSION__ /go/src/github.com/openshift-knative/eventing-kafka-broker/ /go/src/knative.dev/eventing-kafka-broker/

0 commit comments

Comments
 (0)