diff --git a/knative-operator/deploy/resources/knativekafka/1-channel-consolidated.yaml b/knative-operator/deploy/resources/knativekafka/1-channel-consolidated.yaml index 432d709d4e..78666ce2b0 100644 --- a/knative-operator/deploy/resources/knativekafka/1-channel-consolidated.yaml +++ b/knative-operator/deploy/resources/knativekafka/1-channel-consolidated.yaml @@ -17,7 +17,7 @@ kind: ClusterRole metadata: name: kafka-addressable-resolver labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -51,7 +51,7 @@ kind: ClusterRole metadata: name: kafka-channelable-manipulator labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" duck.knative.dev/channelable: "true" # Do not use this role directly. These rules will be added to the "channelable-manipulator" role. rules: @@ -88,7 +88,7 @@ kind: ClusterRole metadata: name: kafka-ch-controller labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" rules: - apiGroups: - messaging.knative.dev @@ -199,7 +199,7 @@ metadata: name: kafka-ch-controller namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" --- # Copyright 2020 The Knative Authors @@ -221,7 +221,7 @@ kind: ClusterRole metadata: name: kafka-ch-dispatcher labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" rules: - apiGroups: - messaging.knative.dev @@ -306,7 +306,7 @@ metadata: name: kafka-ch-dispatcher namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" --- # Copyright 2020 The Knative Authors @@ -328,7 +328,7 @@ kind: ClusterRole metadata: name: kafka-webhook labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" rules: # For watching logging configuration and getting certs. - apiGroups: @@ -357,6 +357,20 @@ rules: - "deployments" verbs: - "get" + # For acquiring namespace for the owner reference of the webhook + - apiGroups: + - "" + resources: + - "namespaces" + verbs: + - "get" + # finalizers are needed for the owner reference of the webhook + - apiGroups: + - "" + resources: + - "namespaces/finalizers" + verbs: + - "update" - apiGroups: - "apps" resources: @@ -429,7 +443,7 @@ metadata: name: kafka-webhook namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" --- # Copyright 2019 The Knative Authors @@ -451,7 +465,7 @@ kind: ClusterRoleBinding metadata: name: kafka-ch-controller labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" subjects: - kind: ServiceAccount name: kafka-ch-controller @@ -466,7 +480,7 @@ kind: ClusterRoleBinding metadata: name: kafka-ch-dispatcher labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" subjects: - kind: ServiceAccount name: kafka-ch-dispatcher @@ -496,7 +510,7 @@ kind: ClusterRoleBinding metadata: name: kafka-webhook labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" subjects: - kind: ServiceAccount name: kafka-webhook @@ -526,7 +540,7 @@ kind: CustomResourceDefinition metadata: name: kafkachannels.messaging.knative.dev labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" knative.dev/crd-install: "true" messaging.knative.dev/subscribable: "true" duck.knative.dev/addressable: "true" @@ -783,16 +797,16 @@ spec: # limitations under the License. apiVersion: v1 -kind: ConfigMap -metadata: - name: config-kafka - namespace: knative-eventing data: # Broker URL. Replace this with the URLs for your kafka cluster, # which is in the format of my-cluster-kafka-bootstrap.my-kafka-namespace:9092. bootstrapServers: REPLACE_WITH_CLUSTER_URL #authSecretName: name-of-your-secret-for-kafka-auth #authSecretNamespace: namespace-of-your-secret-for-kafka-auth +kind: ConfigMap +metadata: + name: config-kafka + namespace: knative-eventing --- # Copyright 2020 The Knative Authors @@ -815,7 +829,7 @@ metadata: name: kafka-webhook namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" role: kafka-webhook spec: ports: @@ -848,7 +862,7 @@ metadata: labels: messaging.knative.dev/channel: kafka-channel messaging.knative.dev/role: controller - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" spec: replicas: 1 selector: @@ -914,7 +928,7 @@ kind: MutatingWebhookConfiguration metadata: name: defaulting.webhook.kafka.messaging.knative.dev labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -930,7 +944,7 @@ kind: ValidatingWebhookConfiguration metadata: name: validation.webhook.kafka.messaging.knative.dev labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -962,7 +976,7 @@ metadata: name: kafka-webhook namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" spec: replicas: 1 selector: @@ -1043,7 +1057,7 @@ metadata: name: messaging-webhook-certs namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" # The data is populated at install time. --- diff --git a/knative-operator/deploy/resources/knativekafka/2-source.yaml b/knative-operator/deploy/resources/knativekafka/2-source.yaml index 27ed8e7fc9..2d94afc881 100644 --- a/knative-operator/deploy/resources/knativekafka/2-source.yaml +++ b/knative-operator/deploy/resources/knativekafka/2-source.yaml @@ -18,7 +18,7 @@ metadata: name: kafka-controller-manager namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" --- # Copyright 2019 The Knative Authors @@ -40,7 +40,7 @@ kind: ClusterRole metadata: name: eventing-sources-kafka-controller labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" rules: - apiGroups: - sources.knative.dev @@ -111,6 +111,13 @@ rules: - list - watch - patch + # finalizers are needed for the owner reference of the webhook + - apiGroups: + - "" + resources: + - "namespaces/finalizers" + verbs: + - "update" # For leader election - apiGroups: - "coordination.k8s.io" @@ -153,7 +160,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: eventing-kafka-source-observer labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" duck.knative.dev/source: "true" rules: - apiGroups: @@ -185,7 +192,7 @@ kind: ClusterRoleBinding metadata: name: eventing-sources-kafka-controller labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" subjects: - kind: ServiceAccount name: kafka-controller-manager @@ -200,7 +207,7 @@ kind: ClusterRoleBinding metadata: name: eventing-sources-kafka-controller-addressable-resolver labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" subjects: - kind: ServiceAccount name: kafka-controller-manager @@ -217,7 +224,7 @@ kind: ClusterRoleBinding metadata: name: eventing-sources-kafka-controller-podspecable-binding labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" subjects: - kind: ServiceAccount name: kafka-controller-manager @@ -248,21 +255,20 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" duck.knative.dev/binding: "true" knative.dev/crd-install: "true" name: kafkabindings.bindings.knative.dev spec: group: bindings.knative.dev versions: - - &version - name: v1alpha1 + - name: v1beta1 served: true - storage: false + storage: true subresources: status: {} schema: - openAPIV3Schema: &openAPIV3Schema + openAPIV3Schema: type: object # this is a work around so we don't need to flush out the # schema for each version at this time @@ -282,13 +288,6 @@ spec: - name: Age type: date jsonPath: .metadata.creationTimestamp - - !!merge <<: *version - name: v1beta1 - served: true - storage: true - schema: - openAPIV3Schema: - !!merge <<: *openAPIV3Schema names: categories: - all @@ -326,7 +325,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -339,12 +338,11 @@ metadata: spec: group: sources.knative.dev versions: - - &version - name: v1alpha1 + - name: v1beta1 served: true - storage: false + storage: true schema: - openAPIV3Schema: &openAPIV3Schema + openAPIV3Schema: type: object # this is a work around so we don't need to flush out the # schema for each version at this time @@ -376,13 +374,6 @@ spec: - name: Age type: date jsonPath: .metadata.creationTimestamp - - !!merge <<: *version - name: v1beta1 - served: true - storage: true - schema: - openAPIV3Schema: - !!merge <<: *openAPIV3Schema names: categories: - all @@ -422,7 +413,7 @@ metadata: name: kafka-controller namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" control-plane: kafka-controller-manager spec: selector: @@ -452,7 +443,7 @@ metadata: name: kafka-controller-manager namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" control-plane: kafka-controller-manager spec: replicas: 1 @@ -504,7 +495,7 @@ kind: Service metadata: labels: role: webhook - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" name: kafka-source-webhook namespace: knative-eventing spec: @@ -535,7 +526,7 @@ kind: MutatingWebhookConfiguration metadata: name: defaulting.webhook.kafka.sources.knative.dev labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -551,7 +542,7 @@ kind: MutatingWebhookConfiguration metadata: name: kafkabindings.webhook.kafka.sources.knative.dev labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -567,7 +558,7 @@ kind: ValidatingWebhookConfiguration metadata: name: validation.webhook.kafka.sources.knative.dev labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -583,7 +574,7 @@ kind: ValidatingWebhookConfiguration metadata: name: config.webhook.kafka.sources.knative.dev labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -604,7 +595,7 @@ metadata: name: kafka-source-webhook-certs namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: "v0.23.5" + kafka.eventing.knative.dev/release: "v0.24.3" # The data is populated at install time. --- diff --git a/knative-operator/hack/008-keep-old-config-as-default.patch b/knative-operator/hack/008-keep-old-config-as-default.patch new file mode 100644 index 0000000000..2578ffb6b4 --- /dev/null +++ b/knative-operator/hack/008-keep-old-config-as-default.patch @@ -0,0 +1,28 @@ +diff --git a/knative-operator/deploy/resources/knativekafka/1-channel-consolidated.yaml b/knative-operator/deploy/resources/knativekafka/1-channel-consolidated.yaml +index 151b01ef..78666ce2 100644 +--- a/knative-operator/deploy/resources/knativekafka/1-channel-consolidated.yaml ++++ b/knative-operator/deploy/resources/knativekafka/1-channel-consolidated.yaml +@@ -798,18 +798,11 @@ spec: + + apiVersion: v1 + data: +- version: 1.0.0 +- # eventing-kafka.kafka.brokers: Replace this with the URLs for your kafka cluster, +- # which is in the format of my-cluster-kafka-bootstrap.my-kafka-namespace:9092. +- # eventing-kafka.kafka.authSecretName: name-of-your-secret-for-kafka-auth +- # eventing-kafka.kafka.authSecretNamespace: namespace-of-your-secret-for-kafka-auth +- eventing-kafka: | +- kafka: +- brokers: REPLACE_WITH_CLUSTER_URL +- topic: +- defaultNumPartitions: 4 +- defaultReplicationFactor: 1 # Cannot exceed the number of Kafka Brokers! +- defaultRetentionMillis: 604800000 # 1 week ++ # Broker URL. Replace this with the URLs for your kafka cluster, ++ # which is in the format of my-cluster-kafka-bootstrap.my-kafka-namespace:9092. ++ bootstrapServers: REPLACE_WITH_CLUSTER_URL ++ #authSecretName: name-of-your-secret-for-kafka-auth ++ #authSecretNamespace: namespace-of-your-secret-for-kafka-auth + kind: ConfigMap + metadata: + name: config-kafka diff --git a/knative-operator/hack/update-manifests.sh b/knative-operator/hack/update-manifests.sh index 1f2a7893bd..bb46da853f 100755 --- a/knative-operator/hack/update-manifests.sh +++ b/knative-operator/hack/update-manifests.sh @@ -45,3 +45,6 @@ git apply "$root/knative-operator/hack/001-remove_hpa_pdb.patch" # The kafka-ch-controller requires DELETE on deployment in OpenShift git apply "$root/knative-operator/hack/002-eventing-kafka-ctor-role.patch" + +# Will be no longer needed with SRVKE-812 +git apply "$root/knative-operator/hack/008-keep-old-config-as-default.patch" diff --git a/knative-operator/pkg/controller/knativekafka/knativekafka_controller.go b/knative-operator/pkg/controller/knativekafka/knativekafka_controller.go index 675a4ba448..957f32f648 100644 --- a/knative-operator/pkg/controller/knativekafka/knativekafka_controller.go +++ b/knative-operator/pkg/controller/knativekafka/knativekafka_controller.go @@ -66,17 +66,11 @@ func newReconciler(mgr manager.Manager) (*ReconcileKnativeKafka, error) { return nil, fmt.Errorf("failed to load KafkaSource manifest: %w", err) } - kafkaSourcePostInstallManifest, err := mf.ManifestFrom(mf.Path(os.Getenv("KAFKA_POST_INSTALL_MANIFEST_PATH"))) - if err != nil { - return nil, fmt.Errorf("failed to load KafkaChannel Post Install manifest: %w", err) - } - reconcileKnativeKafka := ReconcileKnativeKafka{ - client: mgr.GetClient(), - scheme: mgr.GetScheme(), - rawKafkaChannelManifest: kafkaChannelManifest, - rawKafkaSourceManifest: kafkaSourceManifest, - rawKafkaSourcePostInstallManifest: kafkaSourcePostInstallManifest, + client: mgr.GetClient(), + scheme: mgr.GetScheme(), + rawKafkaChannelManifest: kafkaChannelManifest, + rawKafkaSourceManifest: kafkaSourceManifest, } return &reconcileKnativeKafka, nil } @@ -114,11 +108,10 @@ var _ reconcile.Reconciler = &ReconcileKnativeKafka{} type ReconcileKnativeKafka struct { // This client, initialized using mgr.Client() above, is a split client // that reads objects from the cache and writes to the apiserver - client client.Client - scheme *runtime.Scheme - rawKafkaChannelManifest mf.Manifest - rawKafkaSourceManifest mf.Manifest - rawKafkaSourcePostInstallManifest mf.Manifest + client client.Client + scheme *runtime.Scheme + rawKafkaChannelManifest mf.Manifest + rawKafkaSourceManifest mf.Manifest } // Reconcile reads that state of the cluster for a KnativeKafka object and makes changes based on the state read @@ -407,7 +400,6 @@ func (r *ReconcileKnativeKafka) buildManifest(instance *operatorv1alpha1.Knative } resources = append(resources, sourceRBACProxy.Resources()...) resources = append(resources, r.rawKafkaSourceManifest.Resources()...) - resources = append(resources, r.rawKafkaSourcePostInstallManifest.Resources()...) } manifest, err := mf.ManifestFrom( diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml index ee5d88a4f3..ba136b82a0 100644 --- a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml +++ b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml @@ -452,29 +452,29 @@ spec: - name: "IMAGE_net-istio-webhook__webhook" value: "registry.ci.openshift.org/openshift/knative-v0.24.0:net-istio-webhook" - name: "IMAGE_eventing-controller__eventing-controller" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-controller" - name: "IMAGE_sugar-controller__controller" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-sugar-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-sugar-controller" - name: "IMAGE_eventing-webhook__eventing-webhook" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-webhook" - - name: "IMAGE_storage-version-migration-eventing-eventing-0.23.0__migrate" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-storage-version-migration" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-webhook" + - name: "IMAGE_storage-version-migration-eventing-eventing-0.24.0__migrate" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-storage-version-migration" - name: "IMAGE_mt-broker-controller__mt-broker-controller" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtchannel-broker" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtchannel-broker" - name: "IMAGE_mt-broker-filter__filter" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtbroker-filter" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtbroker-filter" - name: "IMAGE_mt-broker-ingress__ingress" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtbroker-ingress" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtbroker-ingress" - name: "IMAGE_imc-controller__controller" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-channel-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-channel-controller" - name: "IMAGE_imc-dispatcher__dispatcher" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-channel-dispatcher" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-channel-dispatcher" - name: "IMAGE_pingsource-mt-adapter__dispatcher" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtping" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtping" - name: "IMAGE_APISERVER_RA_IMAGE" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-apiserver-receive-adapter" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-apiserver-receive-adapter" - name: "IMAGE_DISPATCHER_IMAGE" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-channel-dispatcher" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-channel-dispatcher" - name: "IMAGE_KUBE_RBAC_PROXY" value: "registry.ci.openshift.org/origin/4.7:kube-rbac-proxy" securityContext: @@ -550,8 +550,6 @@ spec: value: deploy/resources/knativekafka/1-channel-consolidated.yaml - name: KAFKASOURCE_MANIFEST_PATH value: deploy/resources/knativekafka/2-source.yaml - - name: KAFKA_POST_INSTALL_MANIFEST_PATH - value: deploy/resources/knativekafka/3-eventing-kafka-post-install.yaml - name: QUICKSTART_MANIFEST_PATH value: "deploy/resources/quickstart/serverless-application-quickstart.yaml" - name: DASHBOARDS_ROOT_MANIFEST_PATH @@ -587,41 +585,41 @@ spec: - name: "IMAGE_net-istio-webhook__webhook" value: "registry.ci.openshift.org/openshift/knative-v0.24.0:net-istio-webhook" - name: "IMAGE_eventing-controller__eventing-controller" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-controller" - name: "IMAGE_sugar-controller__controller" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-sugar-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-sugar-controller" - name: "IMAGE_eventing-webhook__eventing-webhook" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-webhook" - - name: "IMAGE_storage-version-migration-eventing-eventing-0.23.0__migrate" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-storage-version-migration" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-webhook" + - name: "IMAGE_storage-version-migration-eventing-eventing-0.24.0__migrate" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-storage-version-migration" - name: "IMAGE_mt-broker-controller__mt-broker-controller" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtchannel-broker" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtchannel-broker" - name: "IMAGE_mt-broker-filter__filter" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtbroker-filter" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtbroker-filter" - name: "IMAGE_mt-broker-ingress__ingress" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtbroker-ingress" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtbroker-ingress" - name: "IMAGE_imc-controller__controller" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-channel-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-channel-controller" - name: "IMAGE_imc-dispatcher__dispatcher" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-channel-dispatcher" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-channel-dispatcher" - name: "IMAGE_pingsource-mt-adapter__dispatcher" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtping" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtping" - name: "IMAGE_APISERVER_RA_IMAGE" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-apiserver-receive-adapter" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-apiserver-receive-adapter" - name: "IMAGE_DISPATCHER_IMAGE" - value: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-channel-dispatcher" + value: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-channel-dispatcher" - name: "IMAGE_KUBE_RBAC_PROXY" value: "registry.ci.openshift.org/origin/4.7:kube-rbac-proxy" - name: "KAFKA_IMAGE_kafka-controller-manager__manager" - value: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-source-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-source-controller" - name: "KAFKA_IMAGE_KAFKA_RA_IMAGE" - value: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-receive-adapter" + value: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-receive-adapter" - name: "KAFKA_IMAGE_kafka-ch-controller__controller" - value: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-consolidated-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-consolidated-controller" - name: "KAFKA_IMAGE_DISPATCHER_IMAGE" - value: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-consolidated-dispatcher" + value: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-consolidated-dispatcher" - name: "KAFKA_IMAGE_kafka-webhook__kafka-webhook" - value: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-webhook" + value: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-webhook" securityContext: allowPrivilegeEscalation: false readOnlyRootFilesystem: true @@ -827,40 +825,40 @@ spec: - name: "IMAGE_net-istio-webhook__webhook" image: "registry.ci.openshift.org/openshift/knative-v0.24.0:net-istio-webhook" - name: "IMAGE_eventing-controller__eventing-controller" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-controller" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-controller" - name: "IMAGE_sugar-controller__controller" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-sugar-controller" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-sugar-controller" - name: "IMAGE_eventing-webhook__eventing-webhook" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-webhook" - - name: "IMAGE_storage-version-migration-eventing-eventing-0.23.0__migrate" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-storage-version-migration" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-webhook" + - name: "IMAGE_storage-version-migration-eventing-eventing-0.24.0__migrate" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-storage-version-migration" - name: "IMAGE_mt-broker-controller__mt-broker-controller" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtchannel-broker" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtchannel-broker" - name: "IMAGE_mt-broker-filter__filter" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtbroker-filter" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtbroker-filter" - name: "IMAGE_mt-broker-ingress__ingress" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtbroker-ingress" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtbroker-ingress" - name: "IMAGE_imc-controller__controller" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-channel-controller" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-channel-controller" - name: "IMAGE_imc-dispatcher__dispatcher" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-channel-dispatcher" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-channel-dispatcher" - name: "IMAGE_pingsource-mt-adapter__dispatcher" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-mtping" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-mtping" - name: "IMAGE_APISERVER_RA_IMAGE" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-apiserver-receive-adapter" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-apiserver-receive-adapter" - name: "IMAGE_DISPATCHER_IMAGE" - image: "registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-channel-dispatcher" + image: "registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-channel-dispatcher" - name: "IMAGE_KUBE_RBAC_PROXY" image: "registry.ci.openshift.org/origin/4.7:kube-rbac-proxy" - name: "KAFKA_IMAGE_kafka-controller-manager__manager" - image: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-source-controller" + image: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-source-controller" - name: "KAFKA_IMAGE_KAFKA_RA_IMAGE" - image: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-receive-adapter" + image: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-receive-adapter" - name: "KAFKA_IMAGE_kafka-ch-controller__controller" - image: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-consolidated-controller" + image: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-consolidated-controller" - name: "KAFKA_IMAGE_DISPATCHER_IMAGE" - image: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-consolidated-dispatcher" + image: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-consolidated-dispatcher" - name: "KAFKA_IMAGE_kafka-webhook__kafka-webhook" - image: "registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-webhook" + image: "registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-webhook" replaces: serverless-operator.v1.17.0 version: 1.18.0 diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml index 6f2ec35c83..a3fdeea716 100644 --- a/olm-catalog/serverless-operator/project.yaml +++ b/olm-catalog/serverless-operator/project.yaml @@ -26,7 +26,7 @@ dependencies: net_istio: 0.24.0 maistra: 2.0.0 - eventing: 0.23.0 - eventing_kafka: 0.23.5 + eventing: 0.24.0 + eventing_kafka: 0.24.3 cli: 0.23.2 operator: 0.23.2 diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/1-eventing-crds.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/1-eventing-crds.yaml similarity index 97% rename from openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/1-eventing-crds.yaml rename to openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/1-eventing-crds.yaml index 9e3257b926..2bc4806acf 100644 --- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/1-eventing-crds.yaml +++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/1-eventing-crds.yaml @@ -17,7 +17,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -231,7 +231,7 @@ kind: CustomResourceDefinition metadata: name: brokers.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" duck.knative.dev/addressable: "true" spec: @@ -304,6 +304,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout status: description: Status represents the current state of the Broker. This data may be out of date. type: object @@ -392,7 +393,7 @@ kind: CustomResourceDefinition metadata: name: channels.messaging.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" messaging.knative.dev/subscribable: "true" duck.knative.dev/addressable: "true" @@ -477,6 +478,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout subscribers: description: This is the list of subscriptions for this subscribable. type: array @@ -520,6 +522,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature generation: description: Generation of the origin of the subscriber with uid:UID. type: integer @@ -660,7 +663,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -812,7 +815,7 @@ kind: CustomResourceDefinition metadata: name: eventtypes.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" spec: group: eventing.knative.dev @@ -939,7 +942,7 @@ kind: CustomResourceDefinition metadata: name: parallels.flows.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" duck.knative.dev/addressable: "true" spec: @@ -1003,6 +1006,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout filter: description: Filter is the expression guarding the branch type: object @@ -1191,7 +1195,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -1208,7 +1212,7 @@ spec: - &version name: v1beta2 served: true - storage: true + storage: false subresources: status: {} schema: @@ -1341,7 +1345,7 @@ spec: - !!merge <<: *version name: v1 served: true - storage: false + storage: true # v1 schema is identical to the v1beta2 schema names: categories: @@ -1380,7 +1384,7 @@ kind: CustomResourceDefinition metadata: name: sequences.flows.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" duck.knative.dev/addressable: "true" spec: @@ -1479,6 +1483,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout ref: description: Ref points to an Addressable. type: object @@ -1698,7 +1703,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" duck.knative.dev/binding: "true" @@ -1888,7 +1893,7 @@ kind: CustomResourceDefinition metadata: name: subscriptions.messaging.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" spec: group: messaging.knative.dev @@ -1907,30 +1912,19 @@ spec: type: object properties: channel: - description: 'Reference to a channel that will be used to create the subscription You can specify only the following fields of the ObjectReference: - Kind - APIVersion - Name The resource pointed by this ObjectReference must meet the contract to the ChannelableSpec duck type. If the resource does not meet this contract it will be reflected in the Subscription''s status. This field is immutable. We have no good answer on what happens to the events that are currently in the channel being consumed from and what the semantics there should be. For now, you can always delete the Subscription and recreate it to point to a different channel, giving the user more control over what semantics should be used (drain the channel first, possibly have events dropped, etc.)' + description: 'Reference to a channel that will be used to create the subscription. You can specify only the following fields of the KReference: kind, apiVersion and name. The resource pointed by this KReference must meet the contract to the ChannelableSpec duck type. If the resource does not meet this contract it will be reflected in the Subscription''s status. This field is immutable. We have no good answer on what happens to the events that are currently in the channel being consumed from and what the semantics there should be. For now, you can always delete the Subscription and recreate it to point to a different channel, giving the user more control over what semantics should be used (drain the channel first, possibly have events dropped, etc.)' type: object properties: apiVersion: description: API version of the referent. type: string - fieldPath: - description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object.' - type: string kind: description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' type: string name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' type: string - namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' - type: string - resourceVersion: - description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' - type: string - uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' - type: string + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery: description: Delivery configuration type: object @@ -1968,6 +1962,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout reply: description: Reply specifies (optionally) how to handle events returned from the Subscriber target. type: object @@ -2011,6 +2006,7 @@ spec: namespace: description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/ This is optional field, it gets defaulted to the object holding it if left out.' type: string + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature uri: description: URI can be an absolute URL(non-empty scheme and non-empty host) pointing to the target or a relative URI. Relative URIs will be resolved using the base URI retrieved from Ref. type: string @@ -2107,7 +2103,7 @@ kind: CustomResourceDefinition metadata: name: triggers.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" spec: group: eventing.knative.dev diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml similarity index 96% rename from openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml rename to openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml index 8ac2f6d3ae..4e5c52efd6 100644 --- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml +++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml @@ -18,14 +18,14 @@ metadata: name: eventing-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: eventing-controller labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-controller @@ -40,7 +40,7 @@ kind: ClusterRoleBinding metadata: name: eventing-controller-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-controller @@ -55,7 +55,7 @@ kind: ClusterRoleBinding metadata: name: eventing-controller-source-observer labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-controller @@ -70,7 +70,7 @@ kind: ClusterRoleBinding metadata: name: eventing-controller-sources-controller labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-controller @@ -85,7 +85,7 @@ kind: ClusterRoleBinding metadata: name: eventing-controller-manipulator labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-controller @@ -116,14 +116,14 @@ metadata: name: pingsource-mt-adapter namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: knative-eventing-pingsource-mt-adapter labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: pingsource-mt-adapter @@ -154,14 +154,14 @@ metadata: name: eventing-webhook namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: eventing-webhook labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-webhook @@ -177,7 +177,7 @@ metadata: namespace: knative-eventing name: eventing-webhook labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-webhook @@ -192,7 +192,7 @@ kind: ClusterRoleBinding metadata: name: eventing-webhook-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-webhook @@ -207,7 +207,7 @@ kind: ClusterRoleBinding metadata: name: eventing-webhook-podspecable-binding labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-webhook @@ -238,7 +238,7 @@ metadata: name: config-br-default-channel namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" data: channelTemplateSpec: | apiVersion: messaging.knative.dev/v1 @@ -265,7 +265,7 @@ metadata: name: config-br-defaults namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" data: # Configuration for defaulting channels that do not specify CRD implementations. default-br-config: | @@ -297,7 +297,7 @@ metadata: name: default-ch-webhook namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" data: # Configuration for defaulting channels that do not specify CRD implementations. default-ch-config: | @@ -330,7 +330,7 @@ metadata: name: config-ping-defaults namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" annotations: knative.dev/example-checksum: "f8e5a744" data: @@ -354,6 +354,38 @@ data: # base64 decoding. Default is no limit set for data dataMaxSize: -1 +--- +# Copyright 2021 The Knative Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: v1 +kind: ConfigMap +metadata: + name: config-features + namespace: knative-eventing + labels: + eventing.knative.dev/release: "v0.24.0" + knative.dev/config-propagation: original + knative.dev/config-category: eventing +data: + # ALPHA feature: The kreference-group allows you to use the Group field in KReferences. + # For more details: https://github.com/knative/eventing/issues/5086 + kreference-group: "disabled" + # ALPHA feature: The delivery-timeout allows you to use the Timeout field in DeliverySpec. + # For more details: https://github.com/knative/eventing/issues/5148 + delivery-timeout: "disabled" + --- # Copyright 2018 The Knative Authors # @@ -375,7 +407,7 @@ metadata: name: config-leader-election namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" annotations: knative.dev/example-checksum: "96896b00" data: @@ -435,7 +467,7 @@ metadata: name: config-logging namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/config-propagation: original knative.dev/config-category: eventing data: @@ -487,7 +519,7 @@ metadata: name: config-observability namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/config-propagation: original knative.dev/config-category: eventing annotations: @@ -562,7 +594,7 @@ metadata: name: config-tracing namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/config-propagation: original knative.dev/config-category: eventing annotations: @@ -623,7 +655,7 @@ metadata: name: eventing-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/high-availability: "true" spec: selector: @@ -633,7 +665,7 @@ spec: metadata: labels: app: eventing-controller - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: # To avoid node becoming SPOF, spread our replicas to different nodes. affinity: @@ -712,21 +744,28 @@ metadata: name: pingsource-mt-adapter namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: # when set to 0 (and only 0) will be set to 1 when the first PingSource is created. replicas: 0 selector: - matchLabels: + matchLabels: &labels eventing.knative.dev/source: ping-source-controller sources.knative.dev/role: adapter template: metadata: labels: - eventing.knative.dev/source: ping-source-controller - sources.knative.dev/role: adapter - eventing.knative.dev/release: "v0.23.0" + !!merge <<: *labels + eventing.knative.dev/release: "v0.24.0" spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: *labels + topologyKey: kubernetes.io/hostname + weight: 100 enableServiceLinks: false containers: - name: dispatcher @@ -788,7 +827,7 @@ metadata: name: eventing-webhook namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: scaleTargetRef: apiVersion: apps/v1 @@ -811,7 +850,7 @@ metadata: name: eventing-webhook namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: minAvailable: 1 selector: @@ -839,7 +878,7 @@ metadata: name: eventing-webhook namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: selector: matchLabels: &labels @@ -930,7 +969,7 @@ apiVersion: v1 kind: Service metadata: labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" role: eventing-webhook name: eventing-webhook namespace: knative-eventing @@ -962,7 +1001,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -1176,7 +1215,7 @@ kind: CustomResourceDefinition metadata: name: brokers.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" duck.knative.dev/addressable: "true" spec: @@ -1249,6 +1288,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout status: description: Status represents the current state of the Broker. This data may be out of date. type: object @@ -1337,7 +1377,7 @@ kind: CustomResourceDefinition metadata: name: channels.messaging.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" messaging.knative.dev/subscribable: "true" duck.knative.dev/addressable: "true" @@ -1422,6 +1462,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout subscribers: description: This is the list of subscriptions for this subscribable. type: array @@ -1465,6 +1506,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature generation: description: Generation of the origin of the subscriber with uid:UID. type: integer @@ -1605,7 +1647,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -1757,7 +1799,7 @@ kind: CustomResourceDefinition metadata: name: eventtypes.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" spec: group: eventing.knative.dev @@ -1884,7 +1926,7 @@ kind: CustomResourceDefinition metadata: name: parallels.flows.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" duck.knative.dev/addressable: "true" spec: @@ -1948,6 +1990,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout filter: description: Filter is the expression guarding the branch type: object @@ -2136,7 +2179,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -2153,7 +2196,7 @@ spec: - &version name: v1beta2 served: true - storage: true + storage: false subresources: status: {} schema: @@ -2286,7 +2329,7 @@ spec: - !!merge <<: *version name: v1 served: true - storage: false + storage: true # v1 schema is identical to the v1beta2 schema names: categories: @@ -2325,7 +2368,7 @@ kind: CustomResourceDefinition metadata: name: sequences.flows.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" duck.knative.dev/addressable: "true" spec: @@ -2424,6 +2467,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout ref: description: Ref points to an Addressable. type: object @@ -2643,7 +2687,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" duck.knative.dev/binding: "true" @@ -2833,7 +2877,7 @@ kind: CustomResourceDefinition metadata: name: subscriptions.messaging.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" spec: group: messaging.knative.dev @@ -2852,30 +2896,19 @@ spec: type: object properties: channel: - description: 'Reference to a channel that will be used to create the subscription You can specify only the following fields of the ObjectReference: - Kind - APIVersion - Name The resource pointed by this ObjectReference must meet the contract to the ChannelableSpec duck type. If the resource does not meet this contract it will be reflected in the Subscription''s status. This field is immutable. We have no good answer on what happens to the events that are currently in the channel being consumed from and what the semantics there should be. For now, you can always delete the Subscription and recreate it to point to a different channel, giving the user more control over what semantics should be used (drain the channel first, possibly have events dropped, etc.)' + description: 'Reference to a channel that will be used to create the subscription. You can specify only the following fields of the KReference: kind, apiVersion and name. The resource pointed by this KReference must meet the contract to the ChannelableSpec duck type. If the resource does not meet this contract it will be reflected in the Subscription''s status. This field is immutable. We have no good answer on what happens to the events that are currently in the channel being consumed from and what the semantics there should be. For now, you can always delete the Subscription and recreate it to point to a different channel, giving the user more control over what semantics should be used (drain the channel first, possibly have events dropped, etc.)' type: object properties: apiVersion: description: API version of the referent. type: string - fieldPath: - description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object.' - type: string kind: description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' type: string name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' type: string - namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' - type: string - resourceVersion: - description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' - type: string - uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' - type: string + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery: description: Delivery configuration type: object @@ -2913,6 +2946,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout reply: description: Reply specifies (optionally) how to handle events returned from the Subscriber target. type: object @@ -2956,6 +2990,7 @@ spec: namespace: description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/ This is optional field, it gets defaulted to the object holding it if left out.' type: string + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature uri: description: URI can be an absolute URL(non-empty scheme and non-empty host) pointing to the target or a relative URI. Relative URIs will be resolved using the base URI retrieved from Ref. type: string @@ -3052,7 +3087,7 @@ kind: CustomResourceDefinition metadata: name: triggers.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" spec: group: eventing.knative.dev @@ -3231,7 +3266,7 @@ kind: ClusterRole metadata: name: addressable-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" aggregationRule: clusterRoleSelectors: - matchLabels: @@ -3243,7 +3278,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: service-addressable-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -3261,7 +3296,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: serving-addressable-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -3282,7 +3317,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: channel-addressable-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -3307,7 +3342,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: broker-addressable-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -3326,7 +3361,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: messaging-addressable-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -3347,7 +3382,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: flows-addressable-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -3383,7 +3418,7 @@ kind: ClusterRole metadata: name: eventing-broker-filter labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - "" @@ -3408,7 +3443,7 @@ kind: ClusterRole metadata: name: eventing-broker-ingress labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - "" @@ -3424,7 +3459,7 @@ kind: ClusterRole metadata: name: eventing-config-reader labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - "" @@ -3456,7 +3491,7 @@ kind: ClusterRole metadata: name: channelable-manipulator labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" aggregationRule: clusterRoleSelectors: - matchLabels: @@ -3468,7 +3503,7 @@ kind: ClusterRole metadata: name: meta-channelable-manipulator labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/channelable: "true" # Do not use this role directly. These rules will be added to the "channelable-manipulator" role. rules: @@ -3505,7 +3540,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-eventing-namespaced-admin labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: - apiGroups: ["eventing.knative.dev"] @@ -3517,7 +3552,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-messaging-namespaced-admin labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: - apiGroups: ["messaging.knative.dev"] @@ -3529,7 +3564,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-flows-namespaced-admin labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: - apiGroups: ["flows.knative.dev"] @@ -3541,7 +3576,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-sources-namespaced-admin labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: - apiGroups: ["sources.knative.dev"] @@ -3553,7 +3588,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-bindings-namespaced-admin labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: - apiGroups: ["bindings.knative.dev"] @@ -3566,7 +3601,7 @@ metadata: name: knative-eventing-namespaced-edit labels: rbac.authorization.k8s.io/aggregate-to-edit: "true" - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "sources.knative.dev", "flows.knative.dev", "bindings.knative.dev"] resources: ["*"] @@ -3578,7 +3613,7 @@ metadata: name: knative-eventing-namespaced-view labels: rbac.authorization.k8s.io/aggregate-to-view: "true" - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "sources.knative.dev", "flows.knative.dev", "bindings.knative.dev"] resources: ["*"] @@ -3604,7 +3639,7 @@ kind: ClusterRole metadata: name: knative-eventing-controller labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - "" @@ -3738,7 +3773,7 @@ kind: ClusterRole metadata: name: knative-eventing-pingsource-mt-adapter labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - "" @@ -3804,7 +3839,7 @@ kind: ClusterRole metadata: name: podspecable-binding labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" aggregationRule: clusterRoleSelectors: - matchLabels: @@ -3816,7 +3851,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: builtin-podspecable-binding labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/podspecable: "true" # Do not use this role directly. These rules will be added to the "podspecable-binding role. rules: @@ -3862,7 +3897,7 @@ kind: ClusterRole metadata: name: source-observer labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" aggregationRule: clusterRoleSelectors: - matchLabels: @@ -3874,7 +3909,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: eventing-sources-source-observer labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/source: "true" # Do not use this role directly. These rules will be added to the "source-observer" role. rules: @@ -3910,7 +3945,7 @@ kind: ClusterRole metadata: name: knative-eventing-sources-controller labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - "" @@ -3995,7 +4030,7 @@ kind: ClusterRole metadata: name: knative-eventing-webhook labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: # For watching logging configuration and getting certs. - apiGroups: @@ -4018,6 +4053,13 @@ rules: - "list" - "watch" - "patch" + # finalizers are needed for the owner reference of the webhook + - apiGroups: + - "" + resources: + - "namespaces/finalizers" + verbs: + - "update" # For getting our Deployment so we can decorate with ownerref. - apiGroups: - "apps" @@ -4086,7 +4128,7 @@ metadata: namespace: knative-eventing name: knative-eventing-webhook labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: # For manipulating certs into secrets. - apiGroups: @@ -4121,7 +4163,7 @@ kind: ValidatingWebhookConfiguration metadata: name: config.webhook.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -4157,7 +4199,7 @@ kind: MutatingWebhookConfiguration metadata: name: webhook.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -4189,7 +4231,7 @@ kind: ValidatingWebhookConfiguration metadata: name: validation.webhook.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: @@ -4222,7 +4264,7 @@ metadata: name: eventing-webhook-certs namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" # The data is populated at install time. --- @@ -4245,7 +4287,7 @@ kind: MutatingWebhookConfiguration metadata: name: sinkbindings.webhook.sources.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" webhooks: - admissionReviewVersions: ["v1", "v1beta1"] clientConfig: diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/3-in-memory-channel.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/3-in-memory-channel.yaml similarity index 95% rename from openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/3-in-memory-channel.yaml rename to openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/3-in-memory-channel.yaml index 1299bb9626..bf4621db3d 100644 --- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/3-in-memory-channel.yaml +++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/3-in-memory-channel.yaml @@ -17,7 +17,7 @@ kind: Namespace metadata: name: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" --- # Copyright 2021 The Knative Authors @@ -40,14 +40,14 @@ metadata: name: imc-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: imc-controller labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: imc-controller @@ -63,7 +63,7 @@ metadata: namespace: knative-eventing name: imc-controller labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: imc-controller @@ -94,14 +94,14 @@ metadata: name: imc-dispatcher namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: imc-dispatcher labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: imc-dispatcher @@ -132,7 +132,7 @@ metadata: name: config-imc-event-dispatcher namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" data: MaxIdleConnections: "1000" MaxIdleConnectionsPerHost: "100" @@ -158,7 +158,7 @@ metadata: name: config-observability namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/config-propagation: original knative.dev/config-category: eventing annotations: @@ -233,7 +233,7 @@ metadata: name: config-tracing namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/config-propagation: original knative.dev/config-category: eventing annotations: @@ -294,7 +294,7 @@ metadata: name: imc-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/high-availability: "true" spec: selector: @@ -305,6 +305,14 @@ spec: metadata: labels: *labels spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: *labels + topologyKey: kubernetes.io/hostname + weight: 100 serviceAccountName: imc-controller enableServiceLinks: false containers: @@ -359,7 +367,7 @@ apiVersion: v1 kind: Service metadata: labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" name: inmemorychannel-webhook namespace: knative-eventing spec: @@ -391,7 +399,7 @@ metadata: name: imc-dispatcher namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" messaging.knative.dev/channel: in-memory-channel messaging.knative.dev/role: dispatcher spec: @@ -425,7 +433,7 @@ metadata: name: imc-dispatcher namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/high-availability: "true" spec: selector: @@ -508,7 +516,7 @@ kind: CustomResourceDefinition metadata: name: inmemorychannels.messaging.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" knative.dev/crd-install: "true" messaging.knative.dev/subscribable: "true" duck.knative.dev/addressable: "true" @@ -566,6 +574,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature delivery-timeout subscribers: description: This is the list of subscriptions for this subscribable. type: array @@ -609,6 +618,7 @@ spec: description: Retry is the minimum number of retries the sender should attempt when sending an event before moving it to the dead letter sink. type: integer format: int32 + x-kubernetes-preserve-unknown-fields: true # This is necessary to enable the experimental feature generation: description: Generation of the origin of the subscriber with uid:UID. type: integer @@ -747,7 +757,7 @@ kind: ClusterRole metadata: name: imc-addressable-resolver labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -781,7 +791,7 @@ kind: ClusterRole metadata: name: imc-channelable-manipulator labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" duck.knative.dev/channelable: "true" # Do not use this role directly. These rules will be added to the "channelable-manipulator" role. rules: @@ -818,7 +828,7 @@ kind: ClusterRole metadata: name: imc-controller labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - messaging.knative.dev @@ -928,6 +938,13 @@ rules: - "list" - "watch" - "patch" + # finalizers are needed for the owner reference of the webhook + - apiGroups: + - "" + resources: + - "namespaces/finalizers" + verbs: + - "update" --- # Copyright 2019 The Knative Authors @@ -948,7 +965,7 @@ kind: ClusterRole metadata: name: imc-dispatcher labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - messaging.knative.dev @@ -1018,7 +1035,7 @@ metadata: namespace: knative-eventing name: knative-inmemorychannel-webhook labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: # For manipulating certs into secrets. - apiGroups: @@ -1053,7 +1070,7 @@ kind: MutatingWebhookConfiguration metadata: name: inmemorychannel.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" webhooks: - admissionReviewVersions: ["v1"] clientConfig: @@ -1085,7 +1102,7 @@ kind: ValidatingWebhookConfiguration metadata: name: validation.inmemorychannel.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" webhooks: - admissionReviewVersions: ["v1"] clientConfig: @@ -1118,7 +1135,7 @@ metadata: name: inmemorychannel-webhook-certs namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" # The data is populated at install time. --- diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/4-mt-channel-broker.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/4-mt-channel-broker.yaml similarity index 95% rename from openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/4-mt-channel-broker.yaml rename to openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/4-mt-channel-broker.yaml index b623c89ce8..0ee3f67bda 100644 --- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/4-mt-channel-broker.yaml +++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/4-mt-channel-broker.yaml @@ -16,7 +16,7 @@ kind: ClusterRole metadata: name: knative-eventing-mt-channel-broker-controller labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: # Configs resources and status we care about. - apiGroups: @@ -57,7 +57,7 @@ kind: ClusterRole metadata: name: knative-eventing-mt-broker-filter labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - eventing.knative.dev @@ -97,7 +97,7 @@ metadata: name: mt-broker-filter namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" --- # Copyright 2020 The Knative Authors @@ -118,7 +118,7 @@ kind: ClusterRole metadata: name: knative-eventing-mt-broker-ingress labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" rules: - apiGroups: - eventing.knative.dev @@ -157,7 +157,7 @@ metadata: name: mt-broker-ingress namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" --- # Copyright 2020 The Knative Authors @@ -179,7 +179,7 @@ kind: ClusterRoleBinding metadata: name: eventing-mt-channel-broker-controller labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: eventing-controller @@ -209,7 +209,7 @@ kind: ClusterRoleBinding metadata: name: knative-eventing-mt-broker-filter labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: mt-broker-filter @@ -239,7 +239,7 @@ kind: ClusterRoleBinding metadata: name: knative-eventing-mt-broker-ingress labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount name: mt-broker-ingress @@ -270,7 +270,7 @@ metadata: name: mt-broker-filter namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: selector: matchLabels: @@ -279,7 +279,7 @@ spec: metadata: labels: eventing.knative.dev/brokerRole: filter - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: serviceAccountName: mt-broker-filter enableServiceLinks: false @@ -344,7 +344,7 @@ kind: Service metadata: labels: eventing.knative.dev/brokerRole: filter - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" name: broker-filter namespace: knative-eventing spec: @@ -381,7 +381,7 @@ metadata: name: mt-broker-ingress namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: selector: matchLabels: @@ -390,7 +390,7 @@ spec: metadata: labels: eventing.knative.dev/brokerRole: ingress - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: serviceAccountName: mt-broker-ingress enableServiceLinks: false @@ -455,7 +455,7 @@ kind: Service metadata: labels: eventing.knative.dev/brokerRole: ingress - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" name: broker-ingress namespace: knative-eventing spec: @@ -492,7 +492,7 @@ metadata: name: mt-broker-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: selector: matchLabels: @@ -501,7 +501,7 @@ spec: metadata: labels: app: mt-broker-controller - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: # To avoid node becoming SPOF, spread our replicas to different nodes. affinity: @@ -574,7 +574,7 @@ metadata: name: broker-ingress-hpa namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: scaleTargetRef: apiVersion: apps/v1 @@ -596,7 +596,7 @@ metadata: name: broker-filter-hpa namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/5-eventing-sugar-controller.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/5-eventing-sugar-controller.yaml similarity index 84% rename from openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/5-eventing-sugar-controller.yaml rename to openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/5-eventing-sugar-controller.yaml index f661539a36..cc27b43963 100644 --- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/5-eventing-sugar-controller.yaml +++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/5-eventing-sugar-controller.yaml @@ -18,7 +18,7 @@ metadata: name: sugar-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: selector: matchLabels: &labels @@ -27,6 +27,14 @@ spec: metadata: labels: *labels spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: *labels + topologyKey: kubernetes.io/hostname + weight: 100 serviceAccountName: eventing-controller enableServiceLinks: false containers: diff --git a/knative-operator/deploy/resources/knativekafka/3-eventing-kafka-post-install.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/6-eventing-post-install.yaml similarity index 72% rename from knative-operator/deploy/resources/knativekafka/3-eventing-kafka-post-install.yaml rename to openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/6-eventing-post-install.yaml index 1bf73a818d..8ff93a3323 100644 --- a/knative-operator/deploy/resources/knativekafka/3-eventing-kafka-post-install.yaml +++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/6-eventing-post-install.yaml @@ -1,4 +1,4 @@ -# Copyright 2021 The Knative Authors +# Copyright 2020 The Knative Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,9 +15,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: knative-kafka-eventing-post-install-job-role + name: knative-eventing-post-install-job-role labels: - eventing.knative.dev/release: devel + eventing.knative.dev/release: "v0.24.0" rules: # Storage version upgrader needs to be able to patch CRDs. - apiGroups: @@ -35,19 +35,7 @@ rules: - apiGroups: - "sources.knative.dev" resources: - - "kafkasources" - verbs: - - "get" - - "list" - - "create" - - "update" - - "delete" - - "patch" - - "watch" - - apiGroups: - - "bindings.knative.dev" - resources: - - "kafkabindings" + - "pingsources" verbs: - "get" - "list" @@ -63,8 +51,9 @@ rules: verbs: - "get" - "list" + --- -# Copyright 2021 The Knative Authors +# Copyright 2020 The Knative Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -81,29 +70,28 @@ rules: apiVersion: v1 kind: ServiceAccount metadata: - name: knative-kafka-eventing-post-install-job + name: knative-eventing-post-install-job namespace: knative-eventing labels: - kafka.eventing.knative.dev/release: devel - + eventing.knative.dev/release: "v0.24.0" --- - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: knative-kafka-eventing-post-install-job-role-binding + name: knative-eventing-post-install-job-role-binding labels: - kafka.eventing.knative.dev/release: devel + eventing.knative.dev/release: "v0.24.0" subjects: - kind: ServiceAccount - name: knative-kafka-eventing-post-install-job + name: knative-eventing-post-install-job namespace: knative-eventing roleRef: kind: ClusterRole - name: knative-kafka-eventing-post-install-job-role + name: knative-eventing-post-install-job-role apiGroup: rbac.authorization.k8s.io + --- -# Copyright 2021 The Knative Authors +# Copyright 2020 The Knative Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -125,27 +113,28 @@ metadata: # # If `ttlSecondsAfterFinished` feature gate becomes generally available in the future, # we can rely on that and keep using the same Job name. - name: v0.23-kafka-storage-version-migration + generateName: storage-version-migration-eventing- namespace: knative-eventing labels: - app: "storage-version-migration" - kafka.eventing.knative.dev/release: devel + app: "storage-version-migration-eventing" + eventing.knative.dev/release: "v0.24.0" spec: ttlSecondsAfterFinished: 600 backoffLimit: 10 template: metadata: labels: - app: "storage-version-migration" - eventing.knative.dev/release: devel + app: "storage-version-migration-eventing" + eventing.knative.dev/release: "v0.24.0" annotations: sidecar.istio.io/inject: "false" spec: - serviceAccountName: knative-kafka-eventing-post-install-job + serviceAccountName: knative-eventing-post-install-job restartPolicy: OnFailure containers: - name: migrate - image: registry.ci.openshift.org/openshift/knative-v0.23.3:knative-eventing-kafka-storage-version-migration + image: TO_BE_REPLACED args: - - "kafkasources.sources.knative.dev" - - "kafkabindings.bindings.knative.dev" + - "pingsources.sources.knative.dev" + +--- diff --git a/openshift-knative-operator/hack/001-eventing-namespace-deletion.patch b/openshift-knative-operator/hack/001-eventing-namespace-deletion.patch index c475bc88a3..bb4ec79a9a 100644 --- a/openshift-knative-operator/hack/001-eventing-namespace-deletion.patch +++ b/openshift-knative-operator/hack/001-eventing-namespace-deletion.patch @@ -1,7 +1,7 @@ -diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml +diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml index 08010cff..8373873c 100644 ---- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml -+++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml +--- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml ++++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml @@ -11,27 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and @@ -11,7 +11,7 @@ index 08010cff..8373873c 100644 -metadata: - name: knative-eventing - labels: -- eventing.knative.dev/release: "v0.23.0" +- eventing.knative.dev/release: "v0.24.0" - ---- -# Copyright 2018 The Knative Authors diff --git a/openshift-knative-operator/hack/002-openshift-eventing-role.patch b/openshift-knative-operator/hack/002-openshift-eventing-role.patch index 1f7a9a9247..e1fa4d8f66 100644 --- a/openshift-knative-operator/hack/002-openshift-eventing-role.patch +++ b/openshift-knative-operator/hack/002-openshift-eventing-role.patch @@ -1,7 +1,7 @@ -diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml +diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml index 674c9463..3eaa0fd3 100644 ---- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml -+++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml +--- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml ++++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml @@ -4938,3 +4938,31 @@ webhooks: timeoutSeconds: 10 diff --git a/openshift-knative-operator/hack/006-eventing-pdb.patch b/openshift-knative-operator/hack/006-eventing-pdb.patch index 664b9ece4d..592fd41b92 100644 --- a/openshift-knative-operator/hack/006-eventing-pdb.patch +++ b/openshift-knative-operator/hack/006-eventing-pdb.patch @@ -1,10 +1,10 @@ -diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml +diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml index b51c50a7..7ed34c73 100644 ---- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml -+++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.23.0/2-eventing-core.yaml +--- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml ++++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/2-eventing-core.yaml @@ -827,7 +827,7 @@ metadata: labels: - eventing.knative.dev/release: "v0.23.0" + eventing.knative.dev/release: "v0.24.0" spec: - minAvailable: 80% + minAvailable: 1 diff --git a/openshift-knative-operator/hack/008-fix-post-install-names.patch b/openshift-knative-operator/hack/008-fix-post-install-names.patch new file mode 100644 index 0000000000..bb54ca9769 --- /dev/null +++ b/openshift-knative-operator/hack/008-fix-post-install-names.patch @@ -0,0 +1,26 @@ +diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/6-eventing-post-install.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/6-eventing-post-install.yaml +index 738062f9..8ff93a33 100644 +--- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/6-eventing-post-install.yaml ++++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.24.0/6-eventing-post-install.yaml +@@ -113,10 +113,10 @@ metadata: + # + # If `ttlSecondsAfterFinished` feature gate becomes generally available in the future, + # we can rely on that and keep using the same Job name. +- name: v0.23-storage-version-migration ++ generateName: storage-version-migration-eventing- + namespace: knative-eventing + labels: +- app: "storage-version-migration" ++ app: "storage-version-migration-eventing" + eventing.knative.dev/release: "v0.24.0" + spec: + ttlSecondsAfterFinished: 600 +@@ -124,7 +124,7 @@ spec: + template: + metadata: + labels: +- app: "storage-version-migration" ++ app: "storage-version-migration-eventing" + eventing.knative.dev/release: "v0.24.0" + annotations: + sidecar.istio.io/inject: "false" diff --git a/openshift-knative-operator/hack/update-manifests.sh b/openshift-knative-operator/hack/update-manifests.sh index 339114a13d..47ab98c238 100755 --- a/openshift-knative-operator/hack/update-manifests.sh +++ b/openshift-knative-operator/hack/update-manifests.sh @@ -11,7 +11,7 @@ source "$root/hack/lib/__sources__.bash" # These files could in theory change from release to release, though their names should # be fairly stable. serving_files=(serving-crds serving-core serving-hpa serving-post-install-jobs) -eventing_files=(eventing-crds eventing-core in-memory-channel mt-channel-broker eventing-sugar-controller) +eventing_files=(eventing-crds eventing-core in-memory-channel mt-channel-broker eventing-sugar-controller eventing-post-install) # This excludes the gateways and peerauthentication settings as we want customers to do # manipulate those. @@ -116,3 +116,6 @@ git apply "$root/openshift-knative-operator/hack/006-eventing-pdb.patch" # Add networkpolicy for webhook when net-istio is enabled. git apply "$root/openshift-knative-operator/hack/007-networkpolicy-mesh.patch" + +# Correct names of the batch jobs, to be generated (upstream will fix this) +git apply "$root/openshift-knative-operator/hack/008-fix-post-install-names.patch" diff --git a/openshift/ci-operator/source-image/Dockerfile b/openshift/ci-operator/source-image/Dockerfile index 2286e87be5..8f2f10a3fc 100644 --- a/openshift/ci-operator/source-image/Dockerfile +++ b/openshift/ci-operator/source-image/Dockerfile @@ -2,7 +2,7 @@ FROM src COPY oc /usr/bin/oc COPY --from=registry.ci.openshift.org/openshift/knative-v0.24.0:knative-serving-src /go/src/knative.dev/serving/ /go/src/knative.dev/serving/ -COPY --from=registry.ci.openshift.org/openshift/knative-v0.23.0:knative-eventing-src /go/src/knative.dev/eventing/ /go/src/knative.dev/eventing/ -COPY --from=registry.ci.openshift.org/openshift/knative-v0.23.5:knative-eventing-kafka-src /go/src/knative.dev/eventing-kafka/ /go/src/knative.dev/eventing-kafka/ +COPY --from=registry.ci.openshift.org/openshift/knative-v0.24.0:knative-eventing-src /go/src/knative.dev/eventing/ /go/src/knative.dev/eventing/ +COPY --from=registry.ci.openshift.org/openshift/knative-v0.24.3:knative-eventing-kafka-src /go/src/knative.dev/eventing-kafka/ /go/src/knative.dev/eventing-kafka/ RUN chmod g+w /go/src/knative.dev/serving/ && chmod g+w /go/src/knative.dev/eventing/ && chmod g+w /go/src/knative.dev/eventing-kafka/ diff --git a/templates/csv.yaml b/templates/csv.yaml index 3c6669c92f..2e9469c112 100644 --- a/templates/csv.yaml +++ b/templates/csv.yaml @@ -512,8 +512,6 @@ spec: value: deploy/resources/knativekafka/1-channel-consolidated.yaml - name: KAFKASOURCE_MANIFEST_PATH value: deploy/resources/knativekafka/2-source.yaml - - name: KAFKA_POST_INSTALL_MANIFEST_PATH - value: deploy/resources/knativekafka/3-eventing-kafka-post-install.yaml - name: QUICKSTART_MANIFEST_PATH value: "deploy/resources/quickstart/serverless-application-quickstart.yaml" - name: DASHBOARDS_ROOT_MANIFEST_PATH