Skip to content

Commit 8210399

Browse files
authored
Operator version bump to v1.16 (#3396)
* Operator bump to v1.16 * Drop new override on namespace's labels and annotations * Update operator to latest patch version v1.16.2
1 parent 1279385 commit 8210399

File tree

6 files changed

+83
-6
lines changed

6 files changed

+83
-6
lines changed

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.34.0:serverless-bundle \
1313
registry.ci.openshift.org/knative/release-1.35.0:serverless-bundle \
14-
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:dc65992f7de172cd0edaddce8154925c44fd94e6827e8e051f6dd5c61dad8691 >> /configs/index.yaml
14+
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:f13b51fe186959f59503a995f994188e67f15e5acea9e2e4aa568e686b13470b >> /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/hack/002-serving-drop-unsupported-fields.patch

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml
2-
index d75b043d0..7c90e1a57 100644
2+
index ff7f02f33..cb69a3aa7 100644
33
--- a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml
44
+++ b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml
5-
@@ -46,17 +46,8 @@ spec:
5+
@@ -45,17 +45,8 @@ spec:
66
type: object
77
spec:
88
description: Spec defines the desired state of KnativeServing
@@ -21,7 +21,7 @@ index d75b043d0..7c90e1a57 100644
2121
config:
2222
additionalProperties:
2323
additionalProperties:
24-
@@ -2220,67 +2211,13 @@ spec:
24+
@@ -2234,79 +2225,13 @@ spec:
2525
x-kubernetes-int-or-string: true
2626
ingress:
2727
description: The ingress configuration for Knative Serving
@@ -74,6 +74,13 @@ index d75b043d0..7c90e1a57 100644
7474
- type: string
7575
- type: object
7676
- tls:
77+
- nullable: true
78+
- oneOf:
79+
- - required:
80+
- - mode
81+
- - credentialName
82+
- - required:
83+
- - httpsRedirect
7784
- properties:
7885
- mode:
7986
- description: TLS mode can be SIMPLE, MUTUAL, ISTIO_MUTUAL.
@@ -83,14 +90,19 @@ index d75b043d0..7c90e1a57 100644
8390
- description: TLS certificate name.
8491
- format: string
8592
- type: string
93+
- httpsRedirect:
94+
- description: If set to true, the load balancer will send a 301 redirect
95+
- to HTTPS for all HTTP requests. Should be used only for HTTP listener,
96+
- is mutually exclusive with all other TLS options.
97+
- type: boolean
8698
- type: object
8799
- type: object
88100
- type: array
89101
- type: object
90102
knative-local-gateway:
91103
description: A means to override the knative-local-gateway
92104
properties:
93-
@@ -2358,46 +2295,6 @@ spec:
105+
@@ -2396,46 +2321,6 @@ spec:
94106
type: boolean
95107
type: object
96108
type: object
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
diff --git a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml
2+
index fbd48dba4..52951f00a 100644
3+
--- a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml
4+
+++ b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml
5+
@@ -1133,20 +1133,6 @@ spec:
6+
type: object
7+
type: object
8+
type: array
9+
- namespace:
10+
- description: A field of namespace name to override the labels and annotations
11+
- type: object
12+
- properties:
13+
- labels:
14+
- additionalProperties:
15+
- type: string
16+
- description: Labels overrides labels for the namespace and its template.
17+
- type: object
18+
- annotations:
19+
- additionalProperties:
20+
- type: string
21+
- description: Annotations overrides labels for the namespace and its template.
22+
- type: object
23+
deployments:
24+
description: A mapping of deployment name to override
25+
type: array
26+
diff --git a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml
27+
index cb69a3aa7..21bc0a70b 100644
28+
--- a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml
29+
+++ b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml
30+
@@ -1144,20 +1144,6 @@ spec:
31+
type: object
32+
type: object
33+
type: array
34+
- namespace:
35+
- description: A field of namespace name to override the labels and annotations
36+
- type: object
37+
- properties:
38+
- labels:
39+
- additionalProperties:
40+
- type: string
41+
- description: Labels overrides labels for the namespace and its template.
42+
- type: object
43+
- annotations:
44+
- additionalProperties:
45+
- type: string
46+
- description: Annotations overrides labels for the namespace and its template.
47+
- type: object
48+
deployments:
49+
description: A mapping of deployment name to override
50+
type: array

olm-catalog/serverless-operator/hack/update-manifests.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ git apply "$root/olm-catalog/serverless-operator/hack/003-eventing-drop-unsuppor
3232

3333
# Drop unsupported sources field from the Eventing CRD.
3434
git apply "$root/olm-catalog/serverless-operator/hack/004-eventing-drop-unsupported-sources.patch"
35+
36+
# Drop unsupported labels and annotations override on existing namespace
37+
git apply "$root/olm-catalog/serverless-operator/hack/005-drop-namespace-override.patch"

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,6 +2254,13 @@ spec:
22542254
type: string
22552255
type: object
22562256
tls:
2257+
nullable: true
2258+
oneOf:
2259+
- required:
2260+
- mode
2261+
- credentialName
2262+
- required:
2263+
- httpsRedirect
22572264
properties:
22582265
mode:
22592266
description: TLS mode can be SIMPLE, MUTUAL, ISTIO_MUTUAL.
@@ -2263,6 +2270,11 @@ spec:
22632270
description: TLS certificate name.
22642271
format: string
22652272
type: string
2273+
httpsRedirect:
2274+
description: If set to true, the load balancer will send a 301 redirect
2275+
to HTTPS for all HTTP requests. Should be used only for HTTP listener,
2276+
is mutually exclusive with all other TLS options.
2277+
type: boolean
22662278
type: object
22672279
type: object
22682280
type: array

olm-catalog/serverless-operator/project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ dependencies:
6868
nodejs_20_minimal: registry.access.redhat.com/ubi8/nodejs-20-minimal@sha256:a2a7e399aaf09a48c28f40820da16709b62aee6f2bc703116b9345fab5830861
6969
openjdk_21: registry.access.redhat.com/ubi8/openjdk-21@sha256:441897a1f691c7d4b3a67bb3e0fea83e18352214264cb383fd057bbbd5ed863c
7070
python-39: registry.access.redhat.com/ubi8/python-39@sha256:27e795fd6b1b77de70d1dc73a65e4c790650748a9cfda138fdbd194b3d6eea3d
71-
operator: 1.15.4
71+
operator: 1.16.2
7272
# Previous versions required for downgrade testing
7373
previous:
7474
serving: knative-v1.15

0 commit comments

Comments
 (0)