Skip to content

Commit bbfd017

Browse files
creydrcreydr
authored
Bump serving to 1.17 (#3689)
* Bump serving components to 1.17 * Run `make generated-files` * Rerun `make generated-files` after annotation fix in net-* repos * Use Konflux images in IMAGE_TEMPLATE * Add image template for helloworld-go image * Rerun `make generated-files` * Use correct helloworld response from helloworld-go image The Go hello-world image returns `Hello World! How about some tasty noodles?` (https://github.com/knative/serving/blob/release-1.16/test/test_images/helloworld/helloworld.go#L30) instead of a plain `Hello World!` as the old image (quay.io/openshift-knative/helloworld-go:multiarch)
1 parent 5f2e828 commit bbfd017

File tree

23 files changed

+647
-892
lines changed

23 files changed

+647
-892
lines changed

‎hack/lib/images.bash

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ function knative_serving_images() {
123123
export KNATIVE_SERVING_STORAGE_VERSION_MIGRATION=${KNATIVE_SERVING_STORAGE_VERSION_MIGRATION:-$(latest_registry_redhat_io_image_sha "${serving}-storage-version-migration:${tag}")}
124124

125125
export KNATIVE_SERVING_IMAGE_PREFIX="${serving}"
126+
127+
# Test images
128+
local serving_test="${serving}-test"
129+
130+
export KNATIVE_SERVING_TEST_HTTPPROXY=${KNATIVE_SERVING_TEST_HTTPPROXY:-$(latest_konflux_image_sha "${serving_test}-httpproxy:${tag}")}
131+
export KNATIVE_SERVING_TEST_AUTOSCALE=${KNATIVE_SERVING_TEST_AUTOSCALE:-$(latest_konflux_image_sha "${serving_test}-autoscale:${tag}")}
132+
export KNATIVE_SERVING_TEST_HELLOWORLD=${KNATIVE_SERVING_TEST_HELLOWORLD:-$(latest_konflux_image_sha "${serving_test}-helloworld:${tag}")}
126133
}
127134

128135
function knative_eventing_images_release() {

‎hack/lib/vars.bash

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ fi
1010

1111
# shellcheck disable=SC1091,SC1090
1212
source "$(dirname "${BASH_SOURCE[0]}")/../../vendor/knative.dev/hack/e2e-tests.sh"
13+
source "$(dirname "${BASH_SOURCE[0]}")/images.bash"
1314

1415
export STRIMZI_VERSION=0.45.0
1516

@@ -90,15 +91,20 @@ export ENABLE_KEDA="${ENABLE_KEDA:-false}"
9091
export SAMPLE_RATE="${SAMPLE_RATE:-"1.0"}"
9192
export ZIPKIN_DEDICATED_NODE="${ZIPKIN_DEDICATED_NODE:-false}"
9293
export QUAY_REGISTRY=quay.io/openshift-knative
94+
95+
default_knative_serving_images
96+
default_knative_eventing_images
97+
9398
DEFAULT_IMAGE_TEMPLATE=$(
9499
cat <<-EOF
95100
{{- with .Name }}
96-
{{- if eq . "httpproxy" }}${QUAY_REGISTRY}/serving/{{.}}:${KNATIVE_SERVING_VERSION#knative-}
97-
{{- else if eq . "autoscale" }}${QUAY_REGISTRY}/serving/{{.}}:${KNATIVE_SERVING_VERSION#knative-}
98-
{{- else if eq . "recordevents" }}${QUAY_REGISTRY}/eventing/{{.}}:${KNATIVE_EVENTING_VERSION#knative-}
99-
{{- else if eq . "wathola-forwarder" }}${QUAY_REGISTRY}/eventing/{{.}}:${KNATIVE_EVENTING_VERSION#knative-}
101+
{{- if eq . "httpproxy" }}${KNATIVE_SERVING_TEST_HTTPPROXY}
102+
{{- else if eq . "autoscale" }}${KNATIVE_SERVING_TEST_AUTOSCALE}
103+
{{- else if eq . "helloworld-go" }}${KNATIVE_SERVING_TEST_HELLOWORLD}
104+
{{- else if eq . "recordevents" }}${KNATIVE_EVENTING_TEST_RECORDEVENTS}
105+
{{- else if eq . "wathola-forwarder" }}${KNATIVE_EVENTING_TEST_WATHOLA_FORWARDER}
100106
{{- else if eq . "kafka" }}quay.io/strimzi/kafka:latest-kafka-3.4.0
101-
{{- else }}${QUAY_REGISTRY}/{{.}}:multiarch{{end -}}
107+
{{- else }}${KNATIVE_SERVING_IMAGE_PREFIX}-test-{{.}}:latest{{end -}}
102108
{{end -}}
103109
EOF
104110
)

‎knative-operator/deploy/resources/knativekafka/controller/eventing-kafka-post-install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ metadata:
2121
name: knative-kafka-controller-post-install
2222
labels:
2323
app.kubernetes.io/version: v1.17
24-
rules: []
24+
rules: null
2525
---
2626
---
2727

‎olm-catalog/serverless-operator-index/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >>
1111
RUN /bin/opm render --skip-tls-verify -o yaml \
1212
registry.ci.openshift.org/knative/release-1.35.0:serverless-bundle \
1313
registry.ci.openshift.org/knative/release-1.36.0:serverless-bundle \
14-
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/serverless-bundle@sha256:2259f52839337c88f7876b0ff8a20415ef03d34efeefacfef5eb67f1b8e2177a >> /configs/index.yaml
14+
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/serverless-bundle@sha256:4e14e9207fa6b0203dc996af590a72766022f997001cf6b8adbecb0528156fce >> /configs/index.yaml
1515

1616
# The base image is expected to contain
1717
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe

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

Lines changed: 70 additions & 70 deletions
Large diffs are not rendered by default.

‎olm-catalog/serverless-operator/project.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ requirements:
3434
# OCP stream for kube-rbac-proxy image.
3535
kube-rbac-proxy: "4.17"
3636
dependencies:
37-
serving: knative-v1.16
37+
serving: knative-v1.17
3838
# serving midstream branch name
39-
serving_artifacts_branch: release-v1.16
39+
serving_artifacts_branch: release-v1.17
4040
# versions for networking components
41-
kourier: knative-v1.16
42-
net_kourier_artifacts_branch: release-v1.16
43-
net_istio: knative-v1.16
44-
net_istio_artifacts_branch: release-v1.16
41+
kourier: knative-v1.17
42+
net_kourier_artifacts_branch: release-v1.17
43+
net_istio: knative-v1.17
44+
net_istio_artifacts_branch: release-v1.17
4545
redhat-knative-istio-authz-chart: 1.37.0
4646
service_mesh_proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:8ee57a44b1fc799fd8565eb339955773bd9beedcbf46f68628ee0bd4abf26515
4747
eventing: knative-v1.17

‎openshift-knative-operator/cmd/openshift-knative-operator/kodata/ingress/latest/istio/1-net-istio-core.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ metadata:
2121
labels:
2222
app.kubernetes.io/component: net-istio
2323
app.kubernetes.io/name: knative-serving
24-
app.kubernetes.io/version: "release-v1.16"
24+
app.kubernetes.io/version: "release-v1.17"
2525
serving.knative.dev/controller: "true"
2626
networking.knative.dev/ingress-provider: istio
2727
rules:
@@ -51,7 +51,7 @@ metadata:
5151
labels:
5252
app.kubernetes.io/component: net-istio
5353
app.kubernetes.io/name: knative-serving
54-
app.kubernetes.io/version: "release-v1.16"
54+
app.kubernetes.io/version: "release-v1.17"
5555
networking.knative.dev/ingress-provider: istio
5656
data:
5757
# TODO(nghia): Extract the .svc.cluster.local suffix into its own config.
@@ -173,7 +173,7 @@ metadata:
173173
labels:
174174
app.kubernetes.io/component: net-istio
175175
app.kubernetes.io/name: knative-serving
176-
app.kubernetes.io/version: "release-v1.16"
176+
app.kubernetes.io/version: "release-v1.17"
177177
networking.knative.dev/ingress-provider: istio
178178
spec:
179179
selector:
@@ -189,7 +189,7 @@ spec:
189189
app: net-istio-controller
190190
app.kubernetes.io/component: net-istio
191191
app.kubernetes.io/name: knative-serving
192-
app.kubernetes.io/version: "release-v1.16"
192+
app.kubernetes.io/version: "release-v1.17"
193193
spec:
194194
serviceAccountName: controller
195195
containers:
@@ -280,7 +280,7 @@ metadata:
280280
labels:
281281
app.kubernetes.io/component: net-istio
282282
app.kubernetes.io/name: knative-serving
283-
app.kubernetes.io/version: "release-v1.16"
283+
app.kubernetes.io/version: "release-v1.17"
284284
networking.knative.dev/ingress-provider: istio
285285
spec:
286286
selector:
@@ -294,7 +294,7 @@ spec:
294294
role: net-istio-webhook
295295
app.kubernetes.io/component: net-istio
296296
app.kubernetes.io/name: knative-serving
297-
app.kubernetes.io/version: "release-v1.16"
297+
app.kubernetes.io/version: "release-v1.17"
298298
spec:
299299
serviceAccountName: controller
300300
containers:
@@ -384,7 +384,7 @@ metadata:
384384
labels:
385385
app.kubernetes.io/component: net-istio
386386
app.kubernetes.io/name: knative-serving
387-
app.kubernetes.io/version: "release-v1.16"
387+
app.kubernetes.io/version: "release-v1.17"
388388
networking.knative.dev/ingress-provider: istio
389389
---
390390
# Copyright 2020 The Knative Authors
@@ -410,7 +410,7 @@ metadata:
410410
role: net-istio-webhook
411411
app.kubernetes.io/component: net-istio
412412
app.kubernetes.io/name: knative-serving
413-
app.kubernetes.io/version: "release-v1.16"
413+
app.kubernetes.io/version: "release-v1.17"
414414
networking.knative.dev/ingress-provider: istio
415415
spec:
416416
ports:
@@ -448,7 +448,7 @@ metadata:
448448
labels:
449449
app.kubernetes.io/component: net-istio
450450
app.kubernetes.io/name: knative-serving
451-
app.kubernetes.io/version: "release-v1.16"
451+
app.kubernetes.io/version: "release-v1.17"
452452
networking.knative.dev/ingress-provider: istio
453453
webhooks:
454454
- admissionReviewVersions:
@@ -486,7 +486,7 @@ metadata:
486486
labels:
487487
app.kubernetes.io/component: net-istio
488488
app.kubernetes.io/name: knative-serving
489-
app.kubernetes.io/version: "release-v1.16"
489+
app.kubernetes.io/version: "release-v1.17"
490490
networking.knative.dev/ingress-provider: istio
491491
webhooks:
492492
- admissionReviewVersions:

‎openshift-knative-operator/cmd/openshift-knative-operator/kodata/ingress/latest/kourier/1-net-kourier.yaml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ metadata:
2121
networking.knative.dev/ingress-provider: kourier
2222
app.kubernetes.io/name: knative-serving
2323
app.kubernetes.io/component: net-kourier
24-
app.kubernetes.io/version: "release-v1.16"
24+
app.kubernetes.io/version: "release-v1.17"
2525
---
2626
# Copyright 2020 The Knative Authors
2727
#
@@ -45,7 +45,7 @@ metadata:
4545
labels:
4646
networking.knative.dev/ingress-provider: kourier
4747
app.kubernetes.io/component: net-kourier
48-
app.kubernetes.io/version: "release-v1.16"
48+
app.kubernetes.io/version: "release-v1.17"
4949
app.kubernetes.io/name: knative-serving
5050
data:
5151
envoy-bootstrap.yaml: |
@@ -173,7 +173,7 @@ metadata:
173173
labels:
174174
networking.knative.dev/ingress-provider: kourier
175175
app.kubernetes.io/component: net-kourier
176-
app.kubernetes.io/version: "release-v1.16"
176+
app.kubernetes.io/version: "release-v1.17"
177177
app.kubernetes.io/name: knative-serving
178178
data:
179179
_example: |
@@ -233,6 +233,9 @@ data:
233233
# Use ',' separated values like "ECDHE-ECDSA-AES128-GCM-SHA256,ECDHE-ECDSA-CHACHA20-POLY1305"
234234
# The default uses the default cipher suites of the envoy version.
235235
cipher-suites: ""
236+
237+
# Disable the Envoy server header injection in the response when response has no such header.
238+
disable-envoy-server-header: "false"
236239
---
237240
# Copyright 2020 The Knative Authors
238241
#
@@ -256,7 +259,7 @@ metadata:
256259
labels:
257260
networking.knative.dev/ingress-provider: kourier
258261
app.kubernetes.io/component: net-kourier
259-
app.kubernetes.io/version: "release-v1.16"
262+
app.kubernetes.io/version: "release-v1.17"
260263
app.kubernetes.io/name: knative-serving
261264
---
262265
apiVersion: rbac.authorization.k8s.io/v1
@@ -266,7 +269,7 @@ metadata:
266269
labels:
267270
networking.knative.dev/ingress-provider: kourier
268271
app.kubernetes.io/component: net-kourier
269-
app.kubernetes.io/version: "release-v1.16"
272+
app.kubernetes.io/version: "release-v1.17"
270273
app.kubernetes.io/name: knative-serving
271274
rules:
272275
- apiGroups: [""]
@@ -295,7 +298,7 @@ metadata:
295298
labels:
296299
networking.knative.dev/ingress-provider: kourier
297300
app.kubernetes.io/component: net-kourier
298-
app.kubernetes.io/version: "release-v1.16"
301+
app.kubernetes.io/version: "release-v1.17"
299302
app.kubernetes.io/name: knative-serving
300303
roleRef:
301304
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +331,7 @@ metadata:
328331
labels:
329332
networking.knative.dev/ingress-provider: kourier
330333
app.kubernetes.io/component: net-kourier
331-
app.kubernetes.io/version: "release-v1.16"
334+
app.kubernetes.io/version: "release-v1.17"
332335
app.kubernetes.io/name: knative-serving
333336
spec:
334337
strategy:
@@ -418,7 +421,7 @@ metadata:
418421
labels:
419422
networking.knative.dev/ingress-provider: kourier
420423
app.kubernetes.io/component: net-kourier
421-
app.kubernetes.io/version: "release-v1.16"
424+
app.kubernetes.io/version: "release-v1.17"
422425
app.kubernetes.io/name: knative-serving
423426
spec:
424427
ports:
@@ -456,7 +459,7 @@ metadata:
456459
labels:
457460
networking.knative.dev/ingress-provider: kourier
458461
app.kubernetes.io/component: net-kourier
459-
app.kubernetes.io/version: "release-v1.16"
462+
app.kubernetes.io/version: "release-v1.17"
460463
app.kubernetes.io/name: knative-serving
461464
spec:
462465
strategy:
@@ -573,7 +576,7 @@ metadata:
573576
labels:
574577
networking.knative.dev/ingress-provider: kourier
575578
app.kubernetes.io/component: net-kourier
576-
app.kubernetes.io/version: "release-v1.16"
579+
app.kubernetes.io/version: "release-v1.17"
577580
app.kubernetes.io/name: knative-serving
578581
spec:
579582
ports:
@@ -597,7 +600,7 @@ metadata:
597600
labels:
598601
networking.knative.dev/ingress-provider: kourier
599602
app.kubernetes.io/component: net-kourier
600-
app.kubernetes.io/version: "release-v1.16"
603+
app.kubernetes.io/version: "release-v1.17"
601604
app.kubernetes.io/name: knative-serving
602605
spec:
603606
ports:
@@ -621,7 +624,7 @@ metadata:
621624
labels:
622625
networking.knative.dev/ingress-provider: kourier
623626
app.kubernetes.io/component: net-kourier
624-
app.kubernetes.io/version: "release-v1.16"
627+
app.kubernetes.io/version: "release-v1.17"
625628
app.kubernetes.io/name: knative-serving
626629
spec:
627630
minReplicas: 1
@@ -647,7 +650,7 @@ metadata:
647650
labels:
648651
networking.knative.dev/ingress-provider: kourier
649652
app.kubernetes.io/component: net-kourier
650-
app.kubernetes.io/version: "release-v1.16"
653+
app.kubernetes.io/version: "release-v1.17"
651654
app.kubernetes.io/name: knative-serving
652655
spec:
653656
minAvailable: 1
@@ -666,7 +669,7 @@ metadata:
666669
app.kubernetes.io/name: knative-serving
667670
app.kubernetes.io/component: net-kourier
668671
networking.knative.dev/ingress-provider: kourier
669-
app.kubernetes.io/version: "release-v1.16"
672+
app.kubernetes.io/version: "release-v1.17"
670673
name: routing-serving-certs
671674
namespace: knative-serving
672675
spec:
@@ -698,7 +701,7 @@ metadata:
698701
app.kubernetes.io/name: knative-serving
699702
app.kubernetes.io/component: net-kourier
700703
networking.knative.dev/ingress-provider: kourier
701-
app.kubernetes.io/version: "release-v1.16"
704+
app.kubernetes.io/version: "release-v1.17"
702705
data:
703706
_example: ""
704707
---
@@ -725,7 +728,7 @@ metadata:
725728
app.kubernetes.io/name: knative-serving
726729
app.kubernetes.io/component: net-kourier
727730
networking.knative.dev/ingress-provider: kourier
728-
app.kubernetes.io/version: "release-v1.16"
731+
app.kubernetes.io/version: "release-v1.17"
729732
data:
730733
_example: ""
731734
---
@@ -752,6 +755,6 @@ metadata:
752755
app.kubernetes.io/name: knative-serving
753756
app.kubernetes.io/component: net-kourier
754757
networking.knative.dev/ingress-provider: kourier
755-
app.kubernetes.io/version: "release-v1.16"
758+
app.kubernetes.io/version: "release-v1.17"
756759
data:
757760
_example: ""

0 commit comments

Comments
 (0)