From 8558bcada43a6985368d602fe46e68e02c7bdf13 Mon Sep 17 00:00:00 2001 From: Vincent Hou Date: Mon, 30 Mar 2020 10:57:30 -0400 Subject: [PATCH] Update the manifest of eventing to the latest nightly built one --- .../{0.13.3.yaml => eventing.yaml} | 1561 ++++++----------- .../knativeeventing/knativeeventing.go | 53 +- test/e2e-upgrade-tests.sh | 1 - version/version.go | 2 +- 4 files changed, 623 insertions(+), 994 deletions(-) rename cmd/manager/kodata/knative-eventing/{0.13.3.yaml => eventing.yaml} (80%) diff --git a/cmd/manager/kodata/knative-eventing/0.13.3.yaml b/cmd/manager/kodata/knative-eventing/eventing.yaml similarity index 80% rename from cmd/manager/kodata/knative-eventing/0.13.3.yaml rename to cmd/manager/kodata/knative-eventing/eventing.yaml index c1c8f498..5b41b87b 100644 --- a/cmd/manager/kodata/knative-eventing/0.13.3.yaml +++ b/cmd/manager/kodata/knative-eventing/eventing.yaml @@ -19,7 +19,7 @@ kind: Namespace metadata: name: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" --- # Copyright 2018 The Knative Authors @@ -42,14 +42,14 @@ metadata: name: eventing-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: eventing-controller labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: eventing-controller @@ -64,7 +64,7 @@ kind: ClusterRoleBinding metadata: name: eventing-controller-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: eventing-controller @@ -79,7 +79,7 @@ kind: ClusterRoleBinding metadata: name: eventing-controller-source-observer labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: eventing-controller @@ -94,7 +94,7 @@ kind: ClusterRoleBinding metadata: name: eventing-controller-sources-controller labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: eventing-controller @@ -109,7 +109,7 @@ kind: ClusterRoleBinding metadata: name: eventing-controller-manipulator labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: eventing-controller @@ -140,14 +140,14 @@ metadata: name: eventing-webhook namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: eventing-webhook labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: eventing-webhook @@ -162,7 +162,7 @@ kind: ClusterRoleBinding metadata: name: eventing-webhook-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: eventing-webhook @@ -177,7 +177,7 @@ kind: ClusterRoleBinding metadata: name: eventing-webhook-podspecable-binding labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: eventing-webhook @@ -187,35 +187,6 @@ roleRef: name: podspecable-binding apiGroup: rbac.authorization.k8s.io ---- -# 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. -# 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-br-defaults - namespace: knative-eventing -data: - # Configuration for defaulting channels that do not specify CRD implementations. - default-br-config: | - clusterDefault: - apiVersion: v1 - kind: ConfigMap - name: config-br-default-channel - namespace: knative-eventing - --- # Copyright 2018 The Knative Authors # @@ -240,38 +211,13 @@ data: # Configuration for defaulting channels that do not specify CRD implementations. default-ch-config: | clusterDefault: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel namespaceDefaults: some-namespace: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel ---- -# 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. -# 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-br-default-channel - namespace: knative-eventing -data: - channelTemplateSpec: | - apiVersion: messaging.knative.dev/v1alpha1 - kind: InMemoryChannel - --- # Copyright 2018 The Knative Authors # @@ -293,7 +239,7 @@ metadata: name: config-leader-election namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" data: # An inactive but valid configuration follows; see example. resourceLock: "leases" @@ -363,7 +309,7 @@ metadata: name: config-logging namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/config-propagation: original knative.dev/config-category: eventing data: @@ -415,7 +361,7 @@ metadata: name: config-observability namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/config-propagation: original knative.dev/config-category: eventing data: @@ -484,7 +430,7 @@ metadata: name: config-tracing namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/config-propagation: original knative.dev/config-category: eventing data: @@ -543,7 +489,7 @@ metadata: name: eventing-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" spec: replicas: 1 selector: @@ -553,13 +499,13 @@ spec: metadata: labels: app: eventing-controller - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" spec: serviceAccountName: eventing-controller containers: - name: eventing-controller terminationMessagePolicy: FallbackToLogsOnError - image: gcr.io/knative-releases/knative.dev/eventing/cmd/controller@sha256:58e64d346c696096441714abb3cd2792ea3498db1325ed5ceb5551ef544d4df7 + image: gcr.io/knative-nightly/knative.dev/eventing/cmd/controller@sha256:75eaa7fd309f3c3fe876ed8206df4fa93805b170c7b601db6c957f6e71fe6e9e resources: requests: cpu: 100m @@ -575,15 +521,14 @@ spec: value: config-observability - name: METRICS_DOMAIN value: knative.dev/eventing - - # Legacy CronJobSource - name: CRONJOB_RA_IMAGE - value: gcr.io/knative-releases/knative.dev/eventing/cmd/cronjob_receive_adapter@sha256:aa0982d31b9c20d6ab107cd3cf0c9a7ec2015826895285710d097d7f186aa978 - # PingSource name: PING_IMAGE - value: gcr.io/knative-releases/knative.dev/eventing/cmd/ping@sha256:a987395ee70a04ccf259bcc38509c6ba6510ea1c8d2d92ddc58a0fcaaf965994 + value: gcr.io/knative-nightly/knative.dev/eventing/cmd/ping/adapter@sha256:df91d1b268b5964defd8904d221a384922ab2a9f35bd693f8fd1415722180494 + - name: JOB_RUNNER_IMAGE + value: gcr.io/knative-nightly/knative.dev/eventing/cmd/ping/jobrunner@sha256:11319a67120bddf8f1af22feed2a2a7d2d5dbe050b77c87d0f2d2e95919fc574 - # APIServerSource name: APISERVER_RA_IMAGE - value: gcr.io/knative-releases/knative.dev/eventing/cmd/apiserver_receive_adapter@sha256:e8ce974ce451b5e91328d568426971c8d2322dc311449e0448a153555ccb2582 + value: gcr.io/knative-nightly/knative.dev/eventing/cmd/apiserver_receive_adapter@sha256:795a4af7b2e1ba335fdaba3a2095a0b117945a097b60b30a6f10d442237d09da securityContext: allowPrivilegeEscalation: false ports: @@ -592,48 +537,6 @@ spec: - name: profiling containerPort: 8008 ---- -# Copyright 2019 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 -# -# http://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. - -# TODO(n3wscott): DELETE THIS FILE AFTER v0.13 CUTS - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: sources-controller - namespace: knative-eventing - labels: - eventing.knative.dev/release: "v0.13.3" -spec: - replicas: 0 - selector: - matchLabels: - app: sources-controller - template: - metadata: - annotations: - sidecar.istio.io/inject: "false" - labels: - app: sources-controller - spec: - containers: - - name: controller - # This is the Go import path for the binary that is containerized - # and substituted here. - image: knative.dev/eventing/cmd/sources_controller - --- # Copyright 2018 The Knative Authors # @@ -655,7 +558,7 @@ metadata: name: eventing-webhook namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" spec: replicas: 1 selector: @@ -672,7 +575,7 @@ spec: terminationMessagePolicy: FallbackToLogsOnError # This is the Go import path for the binary that is containerized # and substituted here. - image: gcr.io/knative-releases/knative.dev/eventing/cmd/webhook@sha256:d1e5538a8a0ebda46495398b1d268c81567a216e974edd8871364cd2543a3e07 + image: gcr.io/knative-nightly/knative.dev/eventing/cmd/webhook@sha256:acc7a92d2f4d596f4c82627b20b7edd51bc139ca7ef7c4b7b1e0feabb290670a resources: requests: # taken from serving. @@ -716,7 +619,7 @@ apiVersion: v1 kind: Service metadata: labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" role: eventing-webhook name: eventing-webhook namespace: knative-eventing @@ -748,7 +651,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -833,12 +736,22 @@ kind: CustomResourceDefinition metadata: name: brokers.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/crd-install: "true" duck.knative.dev/addressable: "true" spec: group: eventing.knative.dev preserveUnknownFields: false + validation: + openAPIV3Schema: + type: object + # this is a work around so we don't need to flush out the + # schema for each version at this time as well as ensure + # that different Broker Classes that might have different + # fields that are not in the Broker Spec will work. + # + # see issue: https://github.com/knative/serving/issues/912 + x-kubernetes-preserve-unknown-fields: true names: kind: Broker plural: brokers @@ -873,105 +786,9 @@ spec: - name: v1alpha1 served: true storage: true - schema: - openAPIV3Schema: - type: object - properties: - spec: - type: object - properties: - config: - type: object - description: "Reference to the configuration for the Broker." - required: - - apiVersion - - kind - - name - properties: - apiVersion: - type: string - description: "API version of the configuration." - minLength: 1 - kind: - type: string - description: "Kind of the configuration." - minLength: 1 - name: - type: string - description: "Name of the configuration." - minLength: 1 - namespace: - type: string - description: "Namespace of the configuration." - minLength: 1 - channelTemplateSpec: - type: object - description: "Channel implementation which dictates the durability - guarantees of events to the Broker. If not specified then the default - channel is used. More information: https://knative.dev/docs/eventing/channels/default-channels." - required: - - apiVersion - - kind - properties: - apiVersion: - type: string - description: "API version of the channel implementation." - minLength: 1 - kind: - type: string - description: "Kind of the channel implementation to use (InMemoryChannel, - KafkaChannel, etc.)." - minLength: 1 - spec: - type: object - delivery: - description: "Broker delivery options. More information: https://knative.dev/docs/eventing/event-delivery." - type: object - x-kubernetes-preserve-unknown-fields: true - status: - type: object - x-kubernetes-preserve-unknown-fields: true - name: v1beta1 served: true storage: false - schema: - openAPIV3Schema: - type: object - properties: - spec: - type: object - properties: - config: - type: object - description: "Reference to the configuration for the Broker." - required: - - apiVersion - - kind - - name - properties: - apiVersion: - type: string - description: "API version of the configuration." - minLength: 1 - kind: - type: string - description: "Kind of the configuration." - minLength: 1 - name: - type: string - description: "Name of the configuration." - minLength: 1 - namespace: - type: string - description: "Namespace of the configuration." - minLength: 1 - delivery: - description: "Broker delivery options. More information: https://knative.dev/docs/eventing/event-delivery." - type: object - x-kubernetes-preserve-unknown-fields: true - status: - type: object - x-kubernetes-preserve-unknown-fields: true --- # Copyright 2019 The Knative Authors @@ -993,7 +810,7 @@ kind: CustomResourceDefinition metadata: name: channels.messaging.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/crd-install: "true" messaging.knative.dev/subscribable: "true" duck.knative.dev/addressable: "true" @@ -1129,6 +946,70 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true +--- +# 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. +# You may obtain a copy of the License at +# +# http://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: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + labels: + eventing.knative.dev/release: "v20200330-a1b2fcf5" + eventing.knative.dev/source: "true" + duck.knative.dev/source: "true" + knative.dev/crd-install: "true" + name: containersources.sources.knative.dev +spec: + group: sources.knative.dev + names: + categories: + - all + - knative + - eventing + - sources + kind: ContainerSource + plural: containersources + scope: Namespaced + subresources: + status: {} + preserveUnknownFields: false + validation: + openAPIV3Schema: + type: object + # this is a work around so we don't need to flesh out the + # schema for each version at this time + # + # see issue: https://github.com/knative/serving/issues/912 + x-kubernetes-preserve-unknown-fields: true + additionalPrinterColumns: + - name: Ready + type: string + JSONPath: ".status.conditions[?(@.type==\"Ready\")].status" + - name: Reason + type: string + JSONPath: ".status.conditions[?(@.type=='Ready')].reason" + - name: Sink + type: string + JSONPath: ".status.sinkUri" + - name: Age + type: date + JSONPath: .metadata.creationTimestamp + versions: + - name: v1alpha2 + served: true + storage: true + --- # Copyright 2019 The Knative Authors # @@ -1148,7 +1029,7 @@ kind: CustomResourceDefinition metadata: name: eventtypes.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/crd-install: "true" spec: group: eventing.knative.dev @@ -1188,7 +1069,8 @@ spec: - name: Description type: string JSONPath: ".spec.description" - - name: Ready + - # TODO remove Status https://github.com/knative/eventing/issues/2750 + name: Ready type: string JSONPath: ".status.conditions[?(@.type==\"Ready\")].status" - name: Reason @@ -1216,553 +1098,29 @@ spec: # 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: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - creationTimestamp: null + name: parallels.flows.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" - eventing.knative.dev/source: "true" - duck.knative.dev/source: "true" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/crd-install: "true" - annotations: - # TODO add schemas and descriptions - registry.knative.dev/eventTypes: | - [ - { "type": "dev.knative.apiserver.resource.add" }, - { "type": "dev.knative.apiserver.resource.delete" }, - { "type": "dev.knative.apiserver.resource.update" }, - { "type": "dev.knative.apiserver.ref.add" }, - { "type": "dev.knative.apiserver.ref.delete" }, - { "type": "dev.knative.apiserver.ref.update" } - ] - name: apiserversources.sources.eventing.knative.dev + duck.knative.dev/addressable: "true" spec: - group: sources.eventing.knative.dev + group: flows.knative.dev + preserveUnknownFields: false + validation: + openAPIV3Schema: + type: object + # this is a work around so we don't need to flush out the + # schema for each version at this time + # + # see issue: https://github.com/knative/serving/issues/912 + x-kubernetes-preserve-unknown-fields: true names: - categories: - - all - - knative - - eventing - - sources - kind: ApiServerSource - plural: apiserversources - scope: Namespaced - subresources: - status: {} - additionalPrinterColumns: - - name: Ready - type: string - JSONPath: ".status.conditions[?(@.type==\"Ready\")].status" - - name: Age - type: date - JSONPath: .metadata.creationTimestamp - validation: - openAPIV3Schema: - properties: - spec: - properties: - serviceAccountName: - type: string - description: "name of the ServiceAccount to use to run the receive adapter. - More info: https://kubernetes.io/docs/reference/access-authn-authz/service-accounts-admin/." - sink: - anyOf: - - type: object - description: "the destination that should receive events." - properties: - ref: - type: object - description: "a reference to a Kubernetes object from which to - retrieve the target URI." - required: - - apiVersion - - kind - - name - properties: - apiVersion: - type: string - minLength: 1 - kind: - type: string - minLength: 1 - name: - type: string - minLength: 1 - uri: - type: string - description: "the target URI. If ref is provided, this must be - relative URI reference." - - type: object - description: "DEPRECATED: a reference to a Kubernetes object from - which to retrieve the target URI." - required: - - apiVersion - - kind - - name - properties: - apiVersion: - type: string - minLength: 1 - kind: - type: string - minLength: 1 - name: - type: string - minLength: 1 - mode: - type: string - description: "Mode controls the content of the event payload. One of: - 'Ref' (only references of resources), 'Resource' (full resource)." - resources: - items: - properties: - apiVersion: - type: string - description: "API version of the objects to watch." - kind: - type: string - description: "Kind of the objects to watch." - controller: - type: boolean - description: "If true, emits the managing controller ref. Only - supported for mode=Ref. More info: https://kubernetes.io/docs/concepts/workloads/controllers/garbage-collection/" - labelSelector: - type: object - description: "Label selector restricting this list of objects - to watch by their labels. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/" - controllerSelector: - type: object - description: "Controller selector restricting the list of objects - to watch by a controlling owner reference of the specified kind." - properties: - apiVersion: - type: string - description: "API version of the controlling owner reference." - kind: - type: string - description: "Kind of the controlling owner reference." - type: array - required: - - resources - - sink - type: object - status: - properties: - conditions: - items: - properties: - lastTransitionTime: - type: string - message: - type: string - reason: - type: string - severity: - type: string - status: - type: string - type: - type: string - required: - - type - - status - type: object - type: array - sinkUri: - type: string - type: object - versions: - - name: v1alpha1 - served: true - storage: true - ---- -# Copyright 2019 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 -# -# http://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: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - labels: - eventing.knative.dev/release: "v0.13.3" - eventing.knative.dev/source: "true" - duck.knative.dev/source: "true" - knative.dev/crd-install: "true" - name: containersources.sources.eventing.knative.dev -spec: - group: sources.eventing.knative.dev - names: - categories: - - all - - knative - - eventing - - sources - kind: ContainerSource - plural: containersources - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - type: string - kind: - type: string - metadata: - type: object - spec: - properties: - args: - items: - type: string - type: array - env: - items: - type: object - type: array - image: - minLength: 1 - type: string - serviceAccountName: - type: string - template: - type: object - sink: - anyOf: - - type: object - description: "the destination that should receive events." - properties: - ref: - type: object - description: "a reference to a Kubernetes object from which to - retrieve the target URI." - required: - - apiVersion - - kind - - name - properties: - apiVersion: - type: string - minLength: 1 - kind: - type: string - minLength: 1 - name: - type: string - minLength: 1 - uri: - type: string - description: "the target URI. If ref is provided, this must be - relative URI reference." - - type: object - description: "DEPRECATED: a reference to a Kubernetes object from - which to retrieve the target URI." - required: - - apiVersion - - kind - - name - properties: - apiVersion: - type: string - minLength: 1 - kind: - type: string - minLength: 1 - name: - type: string - minLength: 1 - type: object - status: - properties: - conditions: - items: - properties: - lastTransitionTime: - # we use a string in the stored object but a wrapper object - # at runtime. - type: string - message: - type: string - reason: - type: string - severity: - type: string - status: - type: string - type: - type: string - required: - - type - - status - type: object - type: array - sinkUri: - type: string - type: object - versions: - - name: v1alpha1 - served: true - storage: true - ---- -# Copyright 2019 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 -# -# http://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: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - labels: - eventing.knative.dev/release: "v0.13.3" - eventing.knative.dev/source: "true" - duck.knative.dev/source: "true" - knative.dev/crd-install: "true" - annotations: - # TODO add schemas and descriptions - registry.knative.dev/eventTypes: | - [ - { "type": "dev.knative.cronjob.event" } - ] - name: cronjobsources.sources.eventing.knative.dev -spec: - group: sources.eventing.knative.dev - names: - categories: - - all - - knative - - eventing - - sources - kind: CronJobSource - plural: cronjobsources - scope: Namespaced - subresources: - status: {} - additionalPrinterColumns: - - name: Ready - type: string - JSONPath: ".status.conditions[?(@.type==\"Ready\")].status" - - name: Age - type: date - JSONPath: .metadata.creationTimestamp - validation: - openAPIV3Schema: - properties: - spec: - properties: - data: - type: string - schedule: - type: string - serviceAccountName: - type: string - sink: - anyOf: - - type: object - description: "the destination that should receive events." - properties: - ref: - type: object - description: "a reference to a Kubernetes object from which to - retrieve the target URI." - required: - - apiVersion - - kind - - name - properties: - apiVersion: - type: string - minLength: 1 - kind: - type: string - minLength: 1 - name: - type: string - minLength: 1 - uri: - type: string - description: "the target URI. If ref is provided, this must be - relative URI reference." - - type: object - description: "DEPRECATED: a reference to a Kubernetes object from - which to retrieve the target URI." - required: - - apiVersion - - kind - - name - properties: - apiVersion: - type: string - minLength: 1 - kind: - type: string - minLength: 1 - name: - type: string - minLength: 1 - resources: - properties: - limits: - properties: - cpu: - type: string - memory: - type: string - type: object - requests: - properties: - cpu: - type: string - memory: - type: string - type: object - type: object - required: - - schedule - type: object - status: - properties: - conditions: - items: - properties: - lastTransitionTime: - # we use a string in the stored object but a wrapper object - # at runtime. - type: string - message: - type: string - reason: - type: string - severity: - type: string - status: - type: string - type: - type: string - required: - - type - - status - type: object - type: array - sinkUri: - type: string - type: object - versions: - - name: v1alpha1 - served: true - storage: true - ---- -# Copyright 2019 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 -# -# http://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: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - labels: - eventing.knative.dev/release: "v0.13.3" - eventing.knative.dev/source: "true" - duck.knative.dev/source: "true" - duck.knative.dev/binding: "true" - knative.dev/crd-install: "true" - name: sinkbindings.sources.eventing.knative.dev -spec: - group: sources.eventing.knative.dev - names: - categories: - - all - - knative - - eventing - - sources - - bindings - kind: SinkBinding - plural: sinkbindings - scope: Namespaced - subresources: - status: {} - versions: - - name: v1alpha1 - served: true - storage: true - additionalPrinterColumns: - - name: Ready - type: string - JSONPath: ".status.conditions[?(@.type=='Ready')].status" - - name: Reason - type: string - JSONPath: ".status.conditions[?(@.type=='Ready')].reason" - ---- -# Copyright 2019 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 -# -# http://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: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: parallels.flows.knative.dev - labels: - eventing.knative.dev/release: "v0.13.3" - knative.dev/crd-install: "true" - duck.knative.dev/addressable: "true" -spec: - group: flows.knative.dev - preserveUnknownFields: false - validation: - openAPIV3Schema: - type: object - # this is a work around so we don't need to flush out the - # schema for each version at this time - # - # see issue: https://github.com/knative/serving/issues/912 - x-kubernetes-preserve-unknown-fields: true - names: - kind: Parallel - plural: parallels - singular: parallel + kind: Parallel + plural: parallels + singular: parallel categories: - all - knative @@ -1817,7 +1175,7 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" knative.dev/crd-install: "true" @@ -1896,7 +1254,7 @@ kind: CustomResourceDefinition metadata: name: sequences.flows.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/crd-install: "true" duck.knative.dev/addressable: "true" spec: @@ -1968,7 +1326,7 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" eventing.knative.dev/source: "true" duck.knative.dev/source: "true" duck.knative.dev/binding: "true" @@ -2043,7 +1401,7 @@ kind: CustomResourceDefinition metadata: name: subscriptions.messaging.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/crd-install: "true" spec: group: messaging.knative.dev @@ -2200,7 +1558,7 @@ kind: CustomResourceDefinition metadata: name: triggers.eventing.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/crd-install: "true" spec: group: eventing.knative.dev @@ -2378,7 +1736,7 @@ kind: ClusterRole metadata: name: addressable-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" aggregationRule: clusterRoleSelectors: - matchLabels: @@ -2390,7 +1748,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: service-addressable-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -2408,7 +1766,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: serving-addressable-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -2429,7 +1787,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: channel-addressable-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -2448,7 +1806,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: broker-addressable-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -2467,7 +1825,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: messaging-addressable-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -2488,7 +1846,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: flows-addressable-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -2524,7 +1882,7 @@ kind: ClusterRole metadata: name: eventing-broker-filter labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: - apiGroups: - "" @@ -2549,7 +1907,7 @@ kind: ClusterRole metadata: name: eventing-broker-ingress labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: - apiGroups: - "" @@ -2565,7 +1923,7 @@ kind: ClusterRole metadata: name: eventing-config-reader labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: - apiGroups: - "" @@ -2597,7 +1955,7 @@ kind: ClusterRole metadata: name: channelable-manipulator labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" aggregationRule: clusterRoleSelectors: - matchLabels: @@ -2624,7 +1982,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-eventing-namespaced-admin labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: - apiGroups: ["eventing.knative.dev"] @@ -2636,34 +1994,22 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-messaging-namespaced-admin labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: -- apiGroups: ["messaging.knative.dev"] - resources: ["*"] - verbs: ["*"] ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: knative-flows-namespaced-admin - labels: - eventing.knative.dev/release: "v0.13.3" - rbac.authorization.k8s.io/aggregate-to-admin: "true" -rules: -- apiGroups: ["flows.knative.dev"] +- apiGroups: ["messaging.knative.dev"] resources: ["*"] verbs: ["*"] --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: knative-eventing-sources-namespaced-admin + name: knative-flows-namespaced-admin labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: -- apiGroups: ["sources.eventing.knative.dev"] +- apiGroups: ["flows.knative.dev"] resources: ["*"] verbs: ["*"] --- @@ -2672,7 +2018,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: knative-sources-namespaced-admin labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: - apiGroups: ["sources.knative.dev"] @@ -2685,10 +2031,9 @@ metadata: name: knative-eventing-namespaced-edit labels: rbac.authorization.k8s.io/aggregate-to-edit: "true" - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: -- apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "sources.eventing.knative.dev", - "sources.knative.dev", "flows.knative.dev"] +- apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "flows.knative.dev"] resources: ["*"] verbs: ["create", "update", "patch", "delete"] --- @@ -2698,10 +2043,10 @@ metadata: name: knative-eventing-namespaced-view labels: rbac.authorization.k8s.io/aggregate-to-view: "true" - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: -- apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "sources.eventing.knative.dev", - "sources.knative.dev", flows.knative.dev] +- apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "sources.knative.dev", + flows.knative.dev] resources: ["*"] verbs: ["get", "list", "watch"] @@ -2725,7 +2070,7 @@ kind: ClusterRole metadata: name: knative-eventing-controller labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: - apiGroups: - "" @@ -2734,6 +2079,7 @@ rules: - "secrets" - "configmaps" - "services" + - "endpoints" - "events" - "serviceaccounts" verbs: &everything @@ -2845,7 +2191,7 @@ kind: ClusterRole metadata: name: podspecable-binding labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" aggregationRule: clusterRoleSelectors: - matchLabels: @@ -2857,7 +2203,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: builtin-podspecable-binding labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "podspecable-binding role. rules: @@ -2903,7 +2249,7 @@ kind: ClusterRole metadata: name: source-observer labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" aggregationRule: clusterRoleSelectors: - matchLabels: @@ -2915,7 +2261,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: eventing-sources-source-observer labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/source: "true" # Do not use this role directly. These rules will be added to the "source-observer" role. rules: @@ -2924,16 +2270,8 @@ rules: resources: - apiserversources - pingsources - verbs: - - get - - list - - watch -- apiGroups: - - sources.eventing.knative.dev - resources: + - sinkbindings - containersources - - cronjobsources - - apiserversources verbs: - get - list @@ -2959,7 +2297,7 @@ kind: ClusterRole metadata: name: knative-eventing-sources-controller labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: - apiGroups: - "" @@ -2994,23 +2332,9 @@ rules: - "pingsources" - "pingsources/status" - "pingsources/finalizers" - verbs: *everything -- # Legacy Source resources and statuses we care about. - apiGroups: - - "sources.eventing.knative.dev" - resources: - - "cronjobsources" - - "cronjobsources/status" - - "cronjobsources/finalizers" - "containersources" - "containersources/status" - "containersources/finalizers" - - "sinkbindings" - - "sinkbindings/status" - - "sinkbindings/finalizers" - - "apiserversources" - - "apiserversources/status" - - "apiserversources/finalizers" verbs: *everything - # Knative Services admin apiGroups: @@ -3058,7 +2382,7 @@ kind: ClusterRole metadata: name: knative-eventing-webhook labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: - # For watching logging configuration and getting certs. apiGroups: @@ -3107,15 +2431,6 @@ rules: - "delete" - "patch" - "watch" -- # For running the SinkBinding reconciler. - # TODO(#2312): Remove this after v0.13. - apiGroups: - - "sources.eventing.knative.dev" - resources: - - "sinkbindings" - - "sinkbindings/status" - - "sinkbindings/finalizers" - verbs: *everything - # For running the SinkBinding reconciler. apiGroups: - "sources.knative.dev" @@ -3131,13 +2446,262 @@ rules: verbs: ["get", "list", "create", "update", "delete", "patch", "watch"] --- -# Copyright 2018 The Knative Authors +# Copyright 2018 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: admissionregistration.k8s.io/v1beta1 +kind: ValidatingWebhookConfiguration +metadata: + name: config.webhook.eventing.knative.dev + labels: + eventing.knative.dev/release: "v20200330-a1b2fcf5" +webhooks: +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: eventing-webhook + namespace: knative-eventing + sideEffects: None + failurePolicy: Fail + name: config.webhook.eventing.knative.dev + namespaceSelector: + matchExpressions: + - key: eventing.knative.dev/release + operator: Exists + +--- +# Copyright 2018 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: admissionregistration.k8s.io/v1beta1 +kind: MutatingWebhookConfiguration +metadata: + name: webhook.eventing.knative.dev + labels: + eventing.knative.dev/release: "v20200330-a1b2fcf5" +webhooks: +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: eventing-webhook + namespace: knative-eventing + sideEffects: None + failurePolicy: Fail + name: webhook.eventing.knative.dev + +--- +# Copyright 2018 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: admissionregistration.k8s.io/v1beta1 +kind: ValidatingWebhookConfiguration +metadata: + name: validation.webhook.eventing.knative.dev + labels: + eventing.knative.dev/release: "v20200330-a1b2fcf5" +webhooks: +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: eventing-webhook + namespace: knative-eventing + sideEffects: None + failurePolicy: Fail + name: validation.webhook.eventing.knative.dev + +--- +# Copyright 2018 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: Secret +metadata: + name: eventing-webhook-certs + namespace: knative-eventing + labels: + eventing.knative.dev/release: "v20200330-a1b2fcf5" +# The data is populated at install time. + +--- +# Copyright 2018 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: admissionregistration.k8s.io/v1beta1 +kind: MutatingWebhookConfiguration +metadata: + name: sinkbindings.webhook.sources.knative.dev + labels: + eventing.knative.dev/release: "v20200330-a1b2fcf5" +webhooks: +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: eventing-webhook + namespace: knative-eventing + failurePolicy: Fail + sideEffects: None + name: sinkbindings.webhook.sources.knative.dev + +--- +--- +# channel-broker.yaml +# 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. +# You may obtain a copy of the License at +# +# http://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: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: eventing-channel-broker-controller + labels: + eventing.knative.dev/release: "v20200330-a1b2fcf5" +subjects: +- kind: ServiceAccount + name: eventing-controller + namespace: knative-eventing +roleRef: + kind: ClusterRole + name: knative-eventing-channel-broker-controller + apiGroup: rbac.authorization.k8s.io + +--- +# 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. +# You may obtain a copy of the License at +# +# http://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: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: knative-eventing-channel-broker-controller + labels: + eventing.knative.dev/release: "v20200330-a1b2fcf5" +rules: +- # Configs resources and status we care about. + apiGroups: + - "configs.internal.knative.dev" + resources: + - "configmappropagations" + - "configmappropagations/status" + verbs: + - "get" + - "list" + - "create" + - "update" + - "delete" + - "patch" + - "watch" +- apiGroups: + - "configs.internal.knative.dev" + resources: + - "configmappropagations/finalizers" + verbs: + - "update" +- apiGroups: + - "" + resources: + - "namespaces/finalizers" + verbs: + - "update" +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - "get" + - "list" + - "create" + - "update" + - "delete" + - "patch" + - "watch" + +--- +# 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. # You may obtain a copy of the License at # -# https://www.apache.org/licenses/LICENSE-2.0 +# http://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, @@ -3145,29 +2709,56 @@ rules: # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: admissionregistration.k8s.io/v1beta1 -kind: ValidatingWebhookConfiguration +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition metadata: - name: config.webhook.eventing.knative.dev + name: configmappropagations.configs.internal.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" -webhooks: -- admissionReviewVersions: - - v1beta1 - clientConfig: - service: - name: eventing-webhook - namespace: knative-eventing - sideEffects: None - failurePolicy: Fail - name: config.webhook.eventing.knative.dev - namespaceSelector: - matchExpressions: - - key: eventing.knative.dev/release - operator: Exists + eventing.knative.dev/release: "v20200330-a1b2fcf5" + knative.dev/crd-install: "true" +spec: + group: configs.internal.knative.dev + versions: + - name: v1alpha1 + served: true + storage: true + names: + kind: ConfigMapPropagation + plural: configmappropagations + singular: configmappropagation + categories: + - all + - knative + - eventing + shortNames: + - kcmp + - cmp + scope: Namespaced + subresources: + status: {} + additionalPrinterColumns: + - name: Ready + type: string + JSONPath: ".status.conditions[?(@.type==\"Ready\")].status" + - name: Reason + type: string + JSONPath: ".status.conditions[?(@.type==\"Ready\")].reason" + - name: OriginalNamespace + type: string + JSONPath: ".spec.originalNamespace" + validation: + openAPIV3Schema: + properties: + spec: + required: + - originalNamespace + properties: + originalNamespace: + type: string + description: "The namespace where original ConfigMaps exist in." --- -# Copyright 2018 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. @@ -3181,25 +2772,18 @@ webhooks: # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: admissionregistration.k8s.io/v1beta1 -kind: MutatingWebhookConfiguration +apiVersion: v1 +kind: ConfigMap metadata: - name: webhook.eventing.knative.dev - labels: - eventing.knative.dev/release: "v0.13.3" -webhooks: -- admissionReviewVersions: - - v1beta1 - clientConfig: - service: - name: eventing-webhook - namespace: knative-eventing - sideEffects: None - failurePolicy: Fail - name: webhook.eventing.knative.dev + name: config-br-default-channel + namespace: knative-eventing +data: + channelTemplateSpec: | + apiVersion: messaging.knative.dev/v1alpha1 + kind: InMemoryChannel --- -# Copyright 2018 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. @@ -3213,22 +2797,20 @@ webhooks: # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: admissionregistration.k8s.io/v1beta1 -kind: MutatingWebhookConfiguration +apiVersion: v1 +kind: ConfigMap metadata: - name: legacysinkbindings.webhook.sources.knative.dev - labels: - eventing.knative.dev/release: "v0.13.3" -webhooks: -- admissionReviewVersions: - - v1beta1 - clientConfig: - service: - name: eventing-webhook + name: config-br-defaults + namespace: knative-eventing +data: + # Configuration for defaulting channels that do not specify CRD implementations. + default-br-config: | + clusterDefault: + brokerClass: ChannelBasedBroker + apiVersion: v1 + kind: ConfigMap + name: config-br-default-channel namespace: knative-eventing - failurePolicy: Fail - sideEffects: None - name: legacysinkbindings.webhook.sources.knative.dev --- # Copyright 2018 The Knative Authors @@ -3237,7 +2819,7 @@ webhooks: # 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 +# http://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, @@ -3245,25 +2827,65 @@ webhooks: # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: admissionregistration.k8s.io/v1beta1 -kind: ValidatingWebhookConfiguration +apiVersion: apps/v1 +kind: Deployment metadata: - name: validation.webhook.eventing.knative.dev + name: broker-controller + namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" -webhooks: -- admissionReviewVersions: - - v1beta1 - clientConfig: - service: - name: eventing-webhook - namespace: knative-eventing - sideEffects: None - failurePolicy: Fail - name: validation.webhook.eventing.knative.dev + eventing.knative.dev/release: "v20200330-a1b2fcf5" +spec: + replicas: 1 + selector: + matchLabels: + app: broker-controller + template: + metadata: + labels: + app: broker-controller + eventing.knative.dev/release: "v20200330-a1b2fcf5" + spec: + serviceAccountName: eventing-controller + containers: + - name: eventing-controller + terminationMessagePolicy: FallbackToLogsOnError + image: gcr.io/knative-nightly/knative.dev/eventing/cmd/channel_broker@sha256:feece581ca417fe5a2505087fdb74530bf2347478efac34e6796a6651e4796c5 + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: SYSTEM_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: CONFIG_LOGGING_NAME + value: config-logging + - name: CONFIG_OBSERVABILITY_NAME + value: config-observability + - name: METRICS_DOMAIN + value: knative.dev/eventing + - # Broker + name: BROKER_INGRESS_IMAGE + value: gcr.io/knative-nightly/knative.dev/eventing/cmd/broker/ingress@sha256:555133f9b3a167530aeabc76d1fb7571e66a694a8988d82cb0f5c86ce8ef652e + - name: BROKER_INGRESS_SERVICE_ACCOUNT + value: eventing-broker-ingress + - name: BROKER_FILTER_IMAGE + value: gcr.io/knative-nightly/knative.dev/eventing/cmd/broker/filter@sha256:c776fdb67676b6417ac0257d8806f6638ae02a8c86a11c8cd02d0df151266c15 + - name: BROKER_FILTER_SERVICE_ACCOUNT + value: eventing-broker-filter + - name: BROKER_IMAGE_PULL_SECRET_NAME + value: + securityContext: + allowPrivilegeEscalation: false + ports: + - name: metrics + containerPort: 9090 + - name: profiling + containerPort: 8008 --- -# Copyright 2018 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. @@ -3278,56 +2900,28 @@ webhooks: # limitations under the License. apiVersion: v1 -kind: Secret +kind: ConfigMap metadata: - name: eventing-webhook-certs + name: config-br-defaults namespace: knative-eventing - labels: - eventing.knative.dev/release: "v0.13.3" -# The data is populated at install time. - ---- -# Copyright 2018 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: admissionregistration.k8s.io/v1beta1 -kind: MutatingWebhookConfiguration -metadata: - name: sinkbindings.webhook.sources.knative.dev - labels: - eventing.knative.dev/release: "v0.13.3" -webhooks: -- admissionReviewVersions: - - v1beta1 - clientConfig: - service: - name: eventing-webhook +data: + # Configuration for defaulting channels that do not specify CRD implementations. + default-br-config: | + clusterDefault: + brokerClass: ChannelBasedBroker + apiVersion: v1 + kind: ConfigMap + name: config-br-default-channel namespace: knative-eventing - failurePolicy: Fail - sideEffects: None - name: sinkbindings.webhook.sources.knative.dev --- ---- -# channel-broker.yaml # 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. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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, @@ -3335,20 +2929,15 @@ webhooks: # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding +apiVersion: v1 +kind: ConfigMap metadata: - name: eventing-channel-broker-controller - labels: - eventing.knative.dev/release: "v0.13.3" -subjects: -- kind: ServiceAccount - name: eventing-controller + name: config-br-default-channel namespace: knative-eventing -roleRef: - kind: ClusterRole - name: knative-eventing-channel-broker-controller - apiGroup: rbac.authorization.k8s.io +data: + channelTemplateSpec: | + apiVersion: messaging.knative.dev/v1alpha1 + kind: InMemoryChannel --- # Copyright 2018 The Knative Authors @@ -3371,7 +2960,7 @@ metadata: name: broker-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" spec: replicas: 1 selector: @@ -3381,13 +2970,13 @@ spec: metadata: labels: app: broker-controller - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" spec: serviceAccountName: eventing-controller containers: - name: eventing-controller terminationMessagePolicy: FallbackToLogsOnError - image: gcr.io/knative-releases/knative.dev/eventing/cmd/channel_broker@sha256:853e0d194223da4356af7c9a17c79afa0ef96b93fd956d5febb2b1f2be78c717 + image: gcr.io/knative-nightly/knative.dev/eventing/cmd/channel_broker@sha256:feece581ca417fe5a2505087fdb74530bf2347478efac34e6796a6651e4796c5 resources: requests: cpu: 100m @@ -3405,11 +2994,11 @@ spec: value: knative.dev/eventing - # Broker name: BROKER_INGRESS_IMAGE - value: gcr.io/knative-releases/knative.dev/eventing/cmd/broker/ingress@sha256:d080653ce0792a304ba388dcb1e360dc427d8556503e0a2603da26d261ac21e4 + value: gcr.io/knative-nightly/knative.dev/eventing/cmd/broker/ingress@sha256:555133f9b3a167530aeabc76d1fb7571e66a694a8988d82cb0f5c86ce8ef652e - name: BROKER_INGRESS_SERVICE_ACCOUNT value: eventing-broker-ingress - name: BROKER_FILTER_IMAGE - value: gcr.io/knative-releases/knative.dev/eventing/cmd/broker/filter@sha256:8858a3144b1911090b70ca7e12da43963fedb74fdc98c76b4cfbbbaa3ee3fd56 + value: gcr.io/knative-nightly/knative.dev/eventing/cmd/broker/filter@sha256:c776fdb67676b6417ac0257d8806f6638ae02a8c86a11c8cd02d0df151266c15 - name: BROKER_FILTER_SERVICE_ACCOUNT value: eventing-broker-filter - name: BROKER_IMAGE_PULL_SECRET_NAME @@ -3442,7 +3031,7 @@ kind: CustomResourceDefinition metadata: name: configmappropagations.configs.internal.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/crd-install: "true" spec: group: configs.internal.knative.dev @@ -3505,7 +3094,7 @@ kind: ClusterRole metadata: name: knative-eventing-channel-broker-controller labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: - # Configs resources and status we care about. apiGroups: @@ -3569,7 +3158,7 @@ metadata: name: config-imc-event-dispatcher namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" data: MaxIdleConnections: "1000" MaxIdleConnectionsPerHost: "100" @@ -3594,7 +3183,7 @@ kind: ClusterRole metadata: name: imc-addressable-resolver labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/addressable: "true" # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: @@ -3628,7 +3217,7 @@ kind: ClusterRole metadata: name: imc-channelable-manipulator labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" duck.knative.dev/channelable: "true" # Do not use this role directly. These rules will be added to the "channelable-manipulator" role. rules: @@ -3665,7 +3254,7 @@ kind: ClusterRole metadata: name: imc-controller labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: - apiGroups: - messaging.knative.dev @@ -3761,7 +3350,7 @@ kind: ClusterRole metadata: name: imc-dispatcher labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" rules: - apiGroups: - messaging.knative.dev @@ -3819,7 +3408,7 @@ metadata: name: imc-dispatcher namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" messaging.knative.dev/channel: in-memory-channel messaging.knative.dev/role: dispatcher spec: @@ -3853,7 +3442,7 @@ metadata: name: imc-dispatcher namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" --- # Copyright 2019 The Knative Authors @@ -3875,7 +3464,7 @@ metadata: name: imc-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" --- # Copyright 2019 The Knative Authors @@ -3896,7 +3485,7 @@ kind: ClusterRoleBinding metadata: name: imc-controller labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: imc-controller @@ -3926,7 +3515,7 @@ kind: ClusterRoleBinding metadata: name: imc-dispatcher labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" subjects: - kind: ServiceAccount name: imc-dispatcher @@ -3955,7 +3544,7 @@ kind: CustomResourceDefinition metadata: name: inmemorychannels.messaging.knative.dev labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" knative.dev/crd-install: "true" messaging.knative.dev/subscribable: "true" duck.knative.dev/addressable: "true" @@ -4032,7 +3621,7 @@ metadata: name: imc-controller namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" spec: replicas: 1 selector: @@ -4046,7 +3635,7 @@ spec: serviceAccountName: imc-controller containers: - name: controller - image: gcr.io/knative-releases/knative.dev/eventing/cmd/in_memory/channel_controller@sha256:68d8ea6569e3f5afbf2fabe4f897b6331cc767cc994b7279feb9128a2331bb1a + image: gcr.io/knative-nightly/knative.dev/eventing/cmd/in_memory/channel_controller@sha256:09cc75bcced8a3d02d59377b9da096d56a18edd22dec0b0e4e8bae4bbf01344c env: - name: CONFIG_LOGGING_NAME value: config-logging @@ -4059,7 +3648,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: DISPATCHER_IMAGE - value: gcr.io/knative-releases/knative.dev/eventing/cmd/in_memory/channel_dispatcher@sha256:4c50fe6179dbead67a72606d771c2d64cf87e5676bac0a54e967c80ec730edaa + value: gcr.io/knative-nightly/knative.dev/eventing/cmd/in_memory/channel_dispatcher@sha256:1bbfb35e172e5f976f7fe22b6a6322998ef6fb109fe09c7b2cbe1d51a98119e7 securityContext: allowPrivilegeEscalation: false ports: @@ -4089,7 +3678,7 @@ metadata: name: imc-dispatcher namespace: knative-eventing labels: - eventing.knative.dev/release: "v0.13.3" + eventing.knative.dev/release: "v20200330-a1b2fcf5" spec: replicas: 1 selector: @@ -4103,7 +3692,7 @@ spec: serviceAccountName: imc-dispatcher containers: - name: dispatcher - image: gcr.io/knative-releases/knative.dev/eventing/cmd/in_memory/channel_dispatcher@sha256:4c50fe6179dbead67a72606d771c2d64cf87e5676bac0a54e967c80ec730edaa + image: gcr.io/knative-nightly/knative.dev/eventing/cmd/in_memory/channel_dispatcher@sha256:1bbfb35e172e5f976f7fe22b6a6322998ef6fb109fe09c7b2cbe1d51a98119e7 env: - name: CONFIG_LOGGING_NAME value: config-logging diff --git a/pkg/reconciler/knativeeventing/knativeeventing.go b/pkg/reconciler/knativeeventing/knativeeventing.go index 907ee74d..3e3e410b 100644 --- a/pkg/reconciler/knativeeventing/knativeeventing.go +++ b/pkg/reconciler/knativeeventing/knativeeventing.go @@ -267,11 +267,52 @@ func (r *Reconciler) deleteObsoleteResources(manifest *mf.Manifest, instance *ev } // Remove the legacysinkbindings webhook at 0.13 - //resource.SetAPIVersion("admissionregistration.k8s.io/v1beta1") - //resource.SetKind("MutatingWebhookConfiguration") - //resource.SetName("legacysinkbindings.webhook.sources.knative.dev") - //if err := manifest.Client.Delete(resource); err != nil { - // return err - //} + resource.SetAPIVersion("admissionregistration.k8s.io/v1beta1") + resource.SetKind("MutatingWebhookConfiguration") + resource.SetName("legacysinkbindings.webhook.sources.knative.dev") + if err := manifest.Client.Delete(resource); err != nil { + return err + } + + // Remove the knative-eventing-sources-namespaced-admin ClusterRole at 0.13 + resource.SetAPIVersion("rbac.authorization.k8s.io/v1") + resource.SetKind("ClusterRole") + resource.SetName("knative-eventing-sources-namespaced-admin") + if err := manifest.Client.Delete(resource); err != nil { + return err + } + + // Remove the apiserversources.sources.eventing.knative.dev CRD at 0.13 + resource.SetAPIVersion("apiextensions.k8s.io/v1beta1") + resource.SetKind("CustomResourceDefinition") + resource.SetName("apiserversources.sources.eventing.knative.dev") + if err := manifest.Client.Delete(resource); err != nil { + return err + } + + // Remove the containersources.sources.eventing.knative.dev CRD at 0.13 + resource.SetAPIVersion("apiextensions.k8s.io/v1beta1") + resource.SetKind("CustomResourceDefinition") + resource.SetName("containersources.sources.eventing.knative.dev ") + if err := manifest.Client.Delete(resource); err != nil { + return err + } + + // Remove the cronjobsources.sources.eventing.knative.dev CRD at 0.13 + resource.SetAPIVersion("apiextensions.k8s.io/v1beta1") + resource.SetKind("CustomResourceDefinition") + resource.SetName("cronjobsources.sources.eventing.knative.dev") + if err := manifest.Client.Delete(resource); err != nil { + return err + } + + // Remove the sinkbindings.sources.eventing.knative.dev CRD at 0.13 + resource.SetAPIVersion("apiextensions.k8s.io/v1beta1") + resource.SetKind("CustomResourceDefinition") + resource.SetName("sinkbindings.sources.eventing.knative.dev") + if err := manifest.Client.Delete(resource); err != nil { + return err + } + return nil } diff --git a/test/e2e-upgrade-tests.sh b/test/e2e-upgrade-tests.sh index 5668e695..64e3e111 100755 --- a/test/e2e-upgrade-tests.sh +++ b/test/e2e-upgrade-tests.sh @@ -83,7 +83,6 @@ function knative_setup() { } function install_head() { - generate_latest_eventing_manifest install_eventing_operator } diff --git a/version/version.go b/version/version.go index fc7b7c6e..f86052d3 100644 --- a/version/version.go +++ b/version/version.go @@ -2,5 +2,5 @@ package version var ( // Version is the version that will be applied to the KnativeServing resource. - Version = "0.13.3" + Version = "20200330-a1b2fcf5" )