Merge remote-tracking branch 'upstream/main' into feature/SRVCOM-1512…

…-stability-test

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

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

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:

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.

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

test/chaos/kafkasource_duck.go

@@ -40,7 +40,7 @@ func (d *donald) Quak() {
 	for {
 		select {
 		case wg = <-ch:
-			d.log.Info("someone told me to stop")
+			d.log.Info("Herder told me to stop quaking :-<")
 			return
 		default:
 			d.quak(testCtx, ns)
@@ -65,7 +65,7 @@ func (d *donald) quak(testCtx *test.Context, namespaces []string) {
 	for _, kafkaSource := range victims {
 		d.quakAt(kafkaSource, testCtx)
 	}
-	d.log.Info("Done with the quaking. Doing to sleep for now...")
+	d.log.Info("Done with the quaking. Going to sleep for now...")
 	time.Sleep(d.cfg.Wait)
 }