From af8b1cfe023519d90013c941192f35066a337d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= Date: Thu, 9 Sep 2021 15:54:15 +0200 Subject: [PATCH] Update operator CRDs to 0.24 (#1195) --- .../002-serving-drop-unsupported-fields.patch | 10 +-- ...003-eventing-drop-unsupported-fields.patch | 12 ++-- ...operator_v1alpha1_knativeeventing_crd.yaml | 63 +++++++++++++++++++ .../operator_v1alpha1_knativeserving_crd.yaml | 5 ++ olm-catalog/serverless-operator/project.yaml | 2 +- 5 files changed, 80 insertions(+), 12 deletions(-) diff --git a/olm-catalog/serverless-operator/hack/002-serving-drop-unsupported-fields.patch b/olm-catalog/serverless-operator/hack/002-serving-drop-unsupported-fields.patch index ad3fb6def9..7c0680351c 100644 --- a/olm-catalog/serverless-operator/hack/002-serving-drop-unsupported-fields.patch +++ b/olm-catalog/serverless-operator/hack/002-serving-drop-unsupported-fields.patch @@ -1,5 +1,5 @@ diff --git a/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeserving_crd.yaml b/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeserving_crd.yaml -index 141b7e33..8ce6f448 100644 +index aa8f3e459..4b4f9b580 100644 --- a/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeserving_crd.yaml +++ b/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeserving_crd.yaml @@ -44,27 +44,8 @@ spec: @@ -31,8 +31,8 @@ index 141b7e33..8ce6f448 100644 config: additionalProperties: additionalProperties: -@@ -122,13 +103,8 @@ spec: - minimum: 1 +@@ -127,13 +108,8 @@ spec: + type: object ingress: description: The ingress configuration for Knative Serving + x-kubernetes-preserve-unknown-fields: true # To allow for some fields we've deleted. @@ -46,7 +46,7 @@ index 141b7e33..8ce6f448 100644 istio: description: Istio settings properties: -@@ -162,53 +138,6 @@ spec: +@@ -167,53 +143,6 @@ spec: type: string type: object type: object @@ -100,7 +100,7 @@ index 141b7e33..8ce6f448 100644 resources: description: A mapping of deployment name to resource requirements items: -@@ -248,9 +177,6 @@ spec: +@@ -253,9 +182,6 @@ spec: type: object type: object type: array diff --git a/olm-catalog/serverless-operator/hack/003-eventing-drop-unsupported-fields.patch b/olm-catalog/serverless-operator/hack/003-eventing-drop-unsupported-fields.patch index beee26e098..a95a329ae0 100644 --- a/olm-catalog/serverless-operator/hack/003-eventing-drop-unsupported-fields.patch +++ b/olm-catalog/serverless-operator/hack/003-eventing-drop-unsupported-fields.patch @@ -1,5 +1,5 @@ diff --git a/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeeventing_crd.yaml b/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeeventing_crd.yaml -index ef7efd15..553b03a4 100644 +index 0d311a02a..7b4cd096c 100644 --- a/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeeventing_crd.yaml +++ b/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeeventing_crd.yaml @@ -44,17 +44,8 @@ spec: @@ -21,10 +21,10 @@ index ef7efd15..553b03a4 100644 config: additionalProperties: additionalProperties: -@@ -99,43 +90,6 @@ spec: - description: The number of replicas that HA parts of the control plane will be scaled to - type: integer - minimum: 1 +@@ -162,43 +153,6 @@ spec: + type: boolean + type: object + type: object - manifests: - description: A list of eventing manifests, which will be installed - by the operator @@ -65,7 +65,7 @@ index ef7efd15..553b03a4 100644 resources: description: A mapping of deployment name to resource requirements items: -@@ -182,9 +136,6 @@ spec: +@@ -245,9 +199,6 @@ spec: is selected, only `bindings.knative.dev/exclude:true` label is checked and these will NOT be considered. The default for Openshift Serverless is `inclusion`. type: string diff --git a/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeeventing_crd.yaml b/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeeventing_crd.yaml index 553b03a484..7b4cd096c0 100644 --- a/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeeventing_crd.yaml +++ b/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeeventing_crd.yaml @@ -90,6 +90,69 @@ spec: description: The number of replicas that HA parts of the control plane will be scaled to type: integer minimum: 1 + nodeSelector: + additionalProperties: + type: string + description: NodeSelector overrides nodeSelector for the deployment. + type: object + source: + description: The source configuration for Knative Eventing + properties: + ceph: + description: Ceph settings + properties: + enabled: + type: boolean + type: object + couchdb: + description: Apache CouchDB settings + properties: + enabled: + type: boolean + type: object + github: + description: GitHub settings + properties: + enabled: + type: boolean + type: object + gitlab: + description: GitLab settings + properties: + enabled: + type: boolean + type: object + kafka: + description: Apache Kafka settings + properties: + enabled: + type: boolean + type: object + natss: + description: NATS Streaming settings + properties: + enabled: + type: boolean + type: object + prometheus: + description: Prometheus settings + properties: + enabled: + type: boolean + type: object + rabbitmq: + description: RabbitMQ settings + properties: + enabled: + type: boolean + type: object + redis: + description: Redis settings + properties: + enabled: + type: boolean + type: object + type: object resources: description: A mapping of deployment name to resource requirements items: diff --git a/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeserving_crd.yaml b/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeserving_crd.yaml index 8ce6f448bd..4b4f9b5807 100644 --- a/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeserving_crd.yaml +++ b/olm-catalog/serverless-operator/manifests/operator_v1alpha1_knativeserving_crd.yaml @@ -101,6 +101,11 @@ spec: description: The number of replicas that HA parts of the control plane will be scaled to type: integer minimum: 1 + nodeSelector: + additionalProperties: + type: string + description: NodeSelector overrides nodeSelector for the deployment. + type: object ingress: description: The ingress configuration for Knative Serving x-kubernetes-preserve-unknown-fields: true # To allow for some fields we've deleted. diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml index 6280d8637e..627cdded28 100644 --- a/olm-catalog/serverless-operator/project.yaml +++ b/olm-catalog/serverless-operator/project.yaml @@ -29,4 +29,4 @@ dependencies: eventing: 0.24.0 eventing_kafka: 0.24.3 cli: 0.24.0 - operator: 0.23.2 + operator: 0.24.0