Revert namespace update on release 0.20 (#2161)

* Remove namespace transition instructions

* Rename events-system-example from docs to broker-example

* Revert namespace rename back to cloud-run-events

* Always pass upgrade tests

Temporary change for namespace transition.

cmd/broker/fanout/main.go

@@ -42,7 +42,7 @@ const (
 
 type envConfig struct {
 	PodName                string `envconfig:"POD_NAME" required:"true"`
-	TargetsConfigPath      string `envconfig:"TARGETS_CONFIG_PATH" default:"/var/run/events-system/broker/targets"`
+	TargetsConfigPath      string `envconfig:"TARGETS_CONFIG_PATH" default:"/var/run/cloud-run-events/broker/targets"`
 	HandlerConcurrency     int    `envconfig:"HANDLER_CONCURRENCY"`
 	MaxConcurrencyPerEvent int    `envconfig:"MAX_CONCURRENCY_PER_EVENT"`
 

cmd/broker/ingress/main.go

@@ -48,7 +48,7 @@ const (
 // 1. It listens on port specified by "PORT" env var, or default 8080 if env var is not set
 // 2. It reads "PROJECT_ID" env var for pubsub project. If the env var is empty, it retrieves project ID from
 //    GCE metadata.
-// 3. It expects broker configmap mounted at "/var/run/events-system/broker/targets"
+// 3. It expects broker configmap mounted at "/var/run/cloud-run-events/broker/targets"
 func main() {
 	appcredentials.MustExistOrUnsetEnv()
 

cmd/broker/retry/main.go

@@ -42,7 +42,7 @@ const (
 
 type envConfig struct {
 	PodName            string `envconfig:"POD_NAME" required:"true"`
-	TargetsConfigPath  string `envconfig:"TARGETS_CONFIG_PATH" default:"/var/run/events-system/broker/targets"`
+	TargetsConfigPath  string `envconfig:"TARGETS_CONFIG_PATH" default:"/var/run/cloud-run-events/broker/targets"`
 	HandlerConcurrency int    `envconfig:"HANDLER_CONCURRENCY"`
 
 	// Environment variable containing the authType, which represents the authentication configuration mode the Pod is using.

config/core/100-namespace.yaml

@@ -15,6 +15,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: events-system
+  name: cloud-run-events
   labels:
     events.cloud.google.com/release: devel

config/core/200-serviceaccount.yaml

@@ -16,7 +16,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: controller
-  namespace: events-system
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
 
@@ -26,7 +26,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: webhook
-  namespace: events-system
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
 
@@ -37,6 +37,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: broker
-  namespace: events-system
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel

config/core/configmaps/br-default-channel.yaml

@@ -16,7 +16,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-br-default-channel
-  namespace: events-system
+  namespace: cloud-run-events
 data:
   channelTemplateSpec: |
     apiVersion: messaging.cloud.google.com/v1beta1

config/core/configmaps/br-delivery.yaml

@@ -16,7 +16,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-br-delivery
-  namespace: events-system
+  namespace: cloud-run-events
   annotations:
     knative.dev/example-checksum: "a7f41751"
 data:

config/core/configmaps/data-residency.yaml

@@ -16,7 +16,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-dataresidency
-  namespace: events-system
+  namespace: cloud-run-events
   annotations:
     knative.dev/example-checksum: "809e8f92"
 data:

config/core/configmaps/gcp-auth.yaml

@@ -16,7 +16,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-gcp-auth
-  namespace: events-system
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
   annotations:

config/core/configmaps/leader-election.yaml

@@ -16,7 +16,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-leader-election
-  namespace: events-system
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
   annotations:

config/core/configmaps/logging.yaml

@@ -16,7 +16,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-logging
-  namespace: events-system
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
   annotations:

config/core/configmaps/observability.yaml

@@ -16,7 +16,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-observability
-  namespace: events-system
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
   annotations:

config/core/configmaps/tracing.yaml

@@ -16,7 +16,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-tracing
-  namespace: events-system
+  namespace: cloud-run-events
   annotations:
     knative.dev/example-checksum: 4002b4c2
 data:

config/core/deployments/controller.yaml

@@ -16,19 +16,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: controller
-  namespace: events-system
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: events-system
+      app: cloud-run-events
       role: controller
   template:
     metadata:
       labels:
-        app: events-system
+        app: cloud-run-events
         role: controller
       annotations:
         sidecar.istio.io/inject: "false"

config/core/deployments/webhook.yaml

@@ -16,19 +16,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: webhook
-  namespace: events-system
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: events-system
+      app: cloud-run-events
       role: webhook
   template:
     metadata:
       labels:
-        app: events-system
+        app: cloud-run-events
         role: webhook
         events.cloud.google.com/release: devel
       annotations:

config/core/resources/brokercell.yaml

@@ -39,7 +39,7 @@ spec:
       clientConfig:
         service:
           name: webhook
-          namespace: events-system
+          namespace: cloud-run-events
   versions:
   - &version
     name: v1alpha1

config/core/resources/channel.yaml

@@ -47,7 +47,7 @@ spec:
       clientConfig:
         service:
           name: webhook
-          namespace: events-system
+          namespace: cloud-run-events
   versions:
     - &version
       name: v1beta1

config/core/resources/cloudauditlogssource.yaml

@@ -47,7 +47,7 @@ spec:
       clientConfig:
         service:
           name: webhook
-          namespace: events-system
+          namespace: cloud-run-events
   versions:
   - &version
     name: v1

config/core/resources/cloudbuildsource.yaml

@@ -51,7 +51,7 @@ spec:
       clientConfig:
         service:
           name: webhook
-          namespace: events-system
+          namespace: cloud-run-events
   versions:
     - &version
       name: v1

config/core/resources/cloudpubsubsource.yaml

@@ -47,7 +47,7 @@ spec:
       clientConfig:
         service:
           name: webhook
-          namespace: events-system
+          namespace: cloud-run-events
   versions:
   - &version
     name: v1

config/core/resources/cloudschedulersource.yaml

@@ -47,7 +47,7 @@ spec:
       clientConfig:
         service:
           name: webhook
-          namespace: events-system
+          namespace: cloud-run-events
   versions:
   - &version
     name: v1

config/core/resources/cloudstoragesource.yaml

@@ -50,7 +50,7 @@ spec:
       clientConfig:
         service:
           name: webhook
-          namespace: events-system
+          namespace: cloud-run-events
   versions:
   - &version
     name: v1

config/core/resources/pullsubscription.yaml

@@ -40,7 +40,7 @@ spec:
       clientConfig:
         service:
           name: webhook
-          namespace: events-system
+          namespace: cloud-run-events
   versions:
   - &version
     name: v1

config/core/resources/topic.yaml

@@ -41,7 +41,7 @@ spec:
       clientConfig:
         service:
           name: webhook
-          namespace: events-system
+          namespace: cloud-run-events
   versions:
   - &version
     name: v1

config/core/roles/addressable-resolvers-clusterrole.yaml

@@ -17,7 +17,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: events-system-addressable-resolver
+  name: cloud-run-events-addressable-resolver
   labels:
     events.cloud.google.com/release: devel
 aggregationRule:
@@ -31,7 +31,7 @@ rules: []
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: events-system-service-addressable-resolver
+  name: cloud-run-events-service-addressable-resolver
   labels:
     events.cloud.google.com/release: devel
     duck.knative.dev/addressable: "true"

config/core/roles/clusterrole.yaml

@@ -15,7 +15,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: events-system-controller
+  name: cloud-run-events-controller
   labels:
     events.cloud.google.com/release: devel
 rules:

config/core/roles/clusterrolebinding.yaml

@@ -15,66 +15,66 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: events-system-controller
+  name: cloud-run-events-controller
   labels:
     events.cloud.google.com/release: devel
 subjects:
 - kind: ServiceAccount
   name: controller
-  namespace: events-system
+  namespace: cloud-run-events
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: events-system-controller
+  name: cloud-run-events-controller
 
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: events-system-controller-resolver
+  name: cloud-run-events-controller-resolver
   labels:
     events.cloud.google.com/release: devel
 subjects:
 - kind: ServiceAccount
   name: controller
-  namespace: events-system
+  namespace: cloud-run-events
 # An aggregated ClusterRole for all Addressable CRDs. 
 # Ref: https://github.com/knative/eventing/blob/master/config/200-addressable-resolvers-clusterrole.yaml
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: events-system-addressable-resolver
+  name: cloud-run-events-addressable-resolver
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: events-system-controller-source-observer
+  name: cloud-run-events-controller-source-observer
   labels:
    events.cloud.google.com/release: devel
 subjects:
   - kind: ServiceAccount
     name: controller
-    namespace: events-system
+    namespace: cloud-run-events
 roleRef:
   kind: ClusterRole
-  name: events-system-source-observer
+  name: cloud-run-events-source-observer
   apiGroup: rbac.authorization.k8s.io
 
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: events-system-webhook
+  name: cloud-run-events-webhook
   labels:
     events.cloud.google.com/release: devel
 subjects:
   - kind: ServiceAccount
     name: webhook
-    namespace: events-system
+    namespace: cloud-run-events
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: events-system-webhook
+  name: cloud-run-events-webhook

config/core/roles/role.yaml

@@ -15,8 +15,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: events-system-controller
-  namespace: events-system
+  name: cloud-run-events-controller
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
 rules:
@@ -40,8 +40,8 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: events-system-broker
-  namespace: events-system
+  name: cloud-run-events-broker
+  namespace: cloud-run-events
   labels:
     events.cloud.google.com/release: devel
 rules: