diff --git a/cmd/broker/fanout/main.go b/cmd/broker/fanout/main.go index 20fd81ad32..1153289253 100644 --- a/cmd/broker/fanout/main.go +++ b/cmd/broker/fanout/main.go @@ -41,7 +41,7 @@ const ( type envConfig struct { PodName string `envconfig:"POD_NAME" required:"true"` - TargetsConfigPath string `envconfig:"TARGETS_CONFIG_PATH" default:"/var/run/cloud-run-events/broker/targets"` + TargetsConfigPath string `envconfig:"TARGETS_CONFIG_PATH" default:"/var/run/events-system/broker/targets"` HandlerConcurrency int `envconfig:"HANDLER_CONCURRENCY"` MaxConcurrencyPerEvent int `envconfig:"MAX_CONCURRENCY_PER_EVENT"` diff --git a/cmd/broker/ingress/main.go b/cmd/broker/ingress/main.go index 725e18fbfd..5469ab2e6a 100644 --- a/cmd/broker/ingress/main.go +++ b/cmd/broker/ingress/main.go @@ -44,7 +44,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/cloud-run-events/broker/targets" +// 3. It expects broker configmap mounted at "/var/run/events-system/broker/targets" func main() { appcredentials.MustExistOrUnsetEnv() diff --git a/cmd/broker/retry/main.go b/cmd/broker/retry/main.go index 7f7b28f5a4..0f819853b7 100644 --- a/cmd/broker/retry/main.go +++ b/cmd/broker/retry/main.go @@ -41,7 +41,7 @@ const ( type envConfig struct { PodName string `envconfig:"POD_NAME" required:"true"` - TargetsConfigPath string `envconfig:"TARGETS_CONFIG_PATH" default:"/var/run/cloud-run-events/broker/targets"` + TargetsConfigPath string `envconfig:"TARGETS_CONFIG_PATH" default:"/var/run/events-system/broker/targets"` HandlerConcurrency int `envconfig:"HANDLER_CONCURRENCY"` // Outstanding messages effectively limits how many connections we will create to each subscriber. diff --git a/config/core/100-namespace.yaml b/config/core/100-namespace.yaml index 82bea0a037..1d06ef584a 100644 --- a/config/core/100-namespace.yaml +++ b/config/core/100-namespace.yaml @@ -15,6 +15,6 @@ apiVersion: v1 kind: Namespace metadata: - name: cloud-run-events + name: events-system labels: events.cloud.google.com/release: devel diff --git a/config/core/200-serviceaccount.yaml b/config/core/200-serviceaccount.yaml index 084c83b1dd..5a52c92939 100644 --- a/config/core/200-serviceaccount.yaml +++ b/config/core/200-serviceaccount.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: controller - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel @@ -26,7 +26,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: webhook - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel @@ -37,6 +37,6 @@ apiVersion: v1 kind: ServiceAccount metadata: name: broker - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel \ No newline at end of file diff --git a/config/core/configmaps/br-default-channel.yaml b/config/core/configmaps/br-default-channel.yaml index 709bb6ee92..90494ac4bc 100644 --- a/config/core/configmaps/br-default-channel.yaml +++ b/config/core/configmaps/br-default-channel.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-br-default-channel - namespace: cloud-run-events + namespace: events-system data: channelTemplateSpec: | apiVersion: messaging.cloud.google.com/v1beta1 diff --git a/config/core/configmaps/br-delivery.yaml b/config/core/configmaps/br-delivery.yaml index d0623f1168..24e6c8b4be 100644 --- a/config/core/configmaps/br-delivery.yaml +++ b/config/core/configmaps/br-delivery.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-br-delivery - namespace: cloud-run-events + namespace: events-system annotations: knative.dev/example-checksum: "a7f41751" data: diff --git a/config/core/configmaps/data-residency.yaml b/config/core/configmaps/data-residency.yaml index d3507812a3..4eb9581168 100644 --- a/config/core/configmaps/data-residency.yaml +++ b/config/core/configmaps/data-residency.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-dataresidency - namespace: cloud-run-events + namespace: events-system annotations: knative.dev/example-checksum: "809e8f92" data: diff --git a/config/core/configmaps/gcp-auth.yaml b/config/core/configmaps/gcp-auth.yaml index 5d2f89ef9a..1ec79b8edb 100644 --- a/config/core/configmaps/gcp-auth.yaml +++ b/config/core/configmaps/gcp-auth.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-gcp-auth - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel annotations: diff --git a/config/core/configmaps/leader-election.yaml b/config/core/configmaps/leader-election.yaml index 5c1cebac3d..4938d9950d 100644 --- a/config/core/configmaps/leader-election.yaml +++ b/config/core/configmaps/leader-election.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-leader-election - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel annotations: diff --git a/config/core/configmaps/logging.yaml b/config/core/configmaps/logging.yaml index 9fef83c06c..719dafba72 100644 --- a/config/core/configmaps/logging.yaml +++ b/config/core/configmaps/logging.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-logging - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel annotations: diff --git a/config/core/configmaps/observability.yaml b/config/core/configmaps/observability.yaml index 2a5f4f349c..42b7bec26b 100644 --- a/config/core/configmaps/observability.yaml +++ b/config/core/configmaps/observability.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-observability - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel annotations: diff --git a/config/core/configmaps/tracing.yaml b/config/core/configmaps/tracing.yaml index 372482f076..f5f63147f7 100644 --- a/config/core/configmaps/tracing.yaml +++ b/config/core/configmaps/tracing.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-tracing - namespace: cloud-run-events + namespace: events-system annotations: knative.dev/example-checksum: 4002b4c2 data: diff --git a/config/core/deployments/controller.yaml b/config/core/deployments/controller.yaml index cc50486bdd..a270847681 100644 --- a/config/core/deployments/controller.yaml +++ b/config/core/deployments/controller.yaml @@ -16,19 +16,19 @@ apiVersion: apps/v1 kind: Deployment metadata: name: controller - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel spec: replicas: 1 selector: matchLabels: - app: cloud-run-events + app: events-system role: controller template: metadata: labels: - app: cloud-run-events + app: events-system role: controller annotations: sidecar.istio.io/inject: "false" diff --git a/config/core/deployments/webhook.yaml b/config/core/deployments/webhook.yaml index 1b2344ca2b..57144cc750 100644 --- a/config/core/deployments/webhook.yaml +++ b/config/core/deployments/webhook.yaml @@ -16,19 +16,19 @@ apiVersion: apps/v1 kind: Deployment metadata: name: webhook - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel spec: replicas: 1 selector: matchLabels: - app: cloud-run-events + app: events-system role: webhook template: metadata: labels: - app: cloud-run-events + app: events-system role: webhook events.cloud.google.com/release: devel annotations: diff --git a/config/core/resources/brokercell.yaml b/config/core/resources/brokercell.yaml index 726b2ccfd3..f4cf070e76 100644 --- a/config/core/resources/brokercell.yaml +++ b/config/core/resources/brokercell.yaml @@ -39,7 +39,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1alpha1 diff --git a/config/core/resources/channel.yaml b/config/core/resources/channel.yaml index 24a95cf953..058e655f89 100644 --- a/config/core/resources/channel.yaml +++ b/config/core/resources/channel.yaml @@ -47,7 +47,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1beta1 diff --git a/config/core/resources/cloudauditlogssource.yaml b/config/core/resources/cloudauditlogssource.yaml index 7be20ac5c8..e97ecdfabb 100644 --- a/config/core/resources/cloudauditlogssource.yaml +++ b/config/core/resources/cloudauditlogssource.yaml @@ -47,7 +47,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/core/resources/cloudbuildsource.yaml b/config/core/resources/cloudbuildsource.yaml index 8ce2a9c08e..a624c6f9c4 100644 --- a/config/core/resources/cloudbuildsource.yaml +++ b/config/core/resources/cloudbuildsource.yaml @@ -51,7 +51,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/core/resources/cloudpubsubsource.yaml b/config/core/resources/cloudpubsubsource.yaml index d05b704fc3..799f63be73 100644 --- a/config/core/resources/cloudpubsubsource.yaml +++ b/config/core/resources/cloudpubsubsource.yaml @@ -47,7 +47,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/core/resources/cloudschedulersource.yaml b/config/core/resources/cloudschedulersource.yaml index 5886284105..ace0c04d61 100644 --- a/config/core/resources/cloudschedulersource.yaml +++ b/config/core/resources/cloudschedulersource.yaml @@ -47,7 +47,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/core/resources/cloudstoragesource.yaml b/config/core/resources/cloudstoragesource.yaml index fcbd562ddf..9e4f5dfb91 100644 --- a/config/core/resources/cloudstoragesource.yaml +++ b/config/core/resources/cloudstoragesource.yaml @@ -50,7 +50,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/core/resources/pullsubscription.yaml b/config/core/resources/pullsubscription.yaml index 44e95872e3..07e4d780b0 100644 --- a/config/core/resources/pullsubscription.yaml +++ b/config/core/resources/pullsubscription.yaml @@ -40,7 +40,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/core/resources/topic.yaml b/config/core/resources/topic.yaml index fd4e9fbc9d..524f4d59ba 100644 --- a/config/core/resources/topic.yaml +++ b/config/core/resources/topic.yaml @@ -41,7 +41,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/core/roles/clusterrole.yaml b/config/core/roles/clusterrole.yaml index 6492a00edd..daefdd1db2 100644 --- a/config/core/roles/clusterrole.yaml +++ b/config/core/roles/clusterrole.yaml @@ -15,7 +15,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: cloud-run-events-controller + name: events-system-controller labels: events.cloud.google.com/release: devel rules: diff --git a/config/core/roles/clusterrolebinding.yaml b/config/core/roles/clusterrolebinding.yaml index 95101fd27b..25a8b2ef54 100644 --- a/config/core/roles/clusterrolebinding.yaml +++ b/config/core/roles/clusterrolebinding.yaml @@ -15,30 +15,30 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: cloud-run-events-controller + name: events-system-controller labels: events.cloud.google.com/release: devel subjects: - kind: ServiceAccount name: controller - namespace: cloud-run-events + namespace: events-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: cloud-run-events-controller + name: events-system-controller --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: cloud-run-events-controller-resolver + name: events-system-controller-resolver labels: events.cloud.google.com/release: devel subjects: - kind: ServiceAccount name: controller - namespace: cloud-run-events + namespace: events-system # An aggregated ClusterRole for all Addressable CRDs. # Ref: https://github.com/knative/eventing/blob/master/config/200-addressable-resolvers-clusterrole.yaml roleRef: @@ -50,16 +50,16 @@ roleRef: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: cloud-run-events-controller-source-observer + name: events-system-controller-source-observer labels: events.cloud.google.com/release: devel subjects: - kind: ServiceAccount name: controller - namespace: cloud-run-events + namespace: events-system roleRef: kind: ClusterRole - name: cloud-run-events-source-observer + name: events-system-source-observer apiGroup: rbac.authorization.k8s.io --- @@ -67,14 +67,14 @@ roleRef: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: cloud-run-events-webhook + name: events-system-webhook labels: events.cloud.google.com/release: devel subjects: - kind: ServiceAccount name: webhook - namespace: cloud-run-events + namespace: events-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: cloud-run-events-webhook + name: events-system-webhook diff --git a/config/core/roles/role.yaml b/config/core/roles/role.yaml index c753cd6f41..01f79ca72e 100644 --- a/config/core/roles/role.yaml +++ b/config/core/roles/role.yaml @@ -15,8 +15,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: cloud-run-events-controller - namespace: cloud-run-events + name: events-system-controller + namespace: events-system labels: events.cloud.google.com/release: devel rules: @@ -40,8 +40,8 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: cloud-run-events-broker - namespace: cloud-run-events + name: events-system-broker + namespace: events-system labels: events.cloud.google.com/release: devel rules: diff --git a/config/core/roles/rolebinding.yaml b/config/core/roles/rolebinding.yaml index cfc25cb8c8..364f1731a3 100644 --- a/config/core/roles/rolebinding.yaml +++ b/config/core/roles/rolebinding.yaml @@ -15,33 +15,33 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: cloud-run-events-controller - namespace: cloud-run-events + name: events-system-controller + namespace: events-system labels: events.cloud.google.com/release: devel subjects: - kind: ServiceAccount name: controller - namespace: cloud-run-events + namespace: events-system roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: cloud-run-events-controller + name: events-system-controller --- # RoleBinding for GCP broker data plane. apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: cloud-run-events-broker - namespace: cloud-run-events + name: events-system-broker + namespace: events-system labels: events.cloud.google.com/release: devel subjects: - kind: ServiceAccount name: broker - namespace: cloud-run-events + namespace: events-system roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: cloud-run-events-broker \ No newline at end of file + name: events-system-broker diff --git a/config/core/roles/source-observer-clusterrole.yaml b/config/core/roles/source-observer-clusterrole.yaml index 144c499c5b..db9956a209 100644 --- a/config/core/roles/source-observer-clusterrole.yaml +++ b/config/core/roles/source-observer-clusterrole.yaml @@ -16,7 +16,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: cloud-run-events-source-observer + name: events-system-source-observer labels: events.cloud.google.com/release: devel aggregationRule: @@ -26,7 +26,7 @@ aggregationRule: rules: [] # Rules are automatically filled in by the controller manager. --- -# The role is needed for the aggregated role cloud-run-events-source-observer in knative-gcp to provide readonly access to "Sources". +# The role is needed for the aggregated role events-system-source-observer in knative-gcp to provide readonly access to "Sources". # The role is needed for the aggregated role source-observer in knative-eventing to provide readonly access to "Sources". # See https://github.com/knative/eventing/blob/master/config/200-source-observer-clusterrole.yaml. kind: ClusterRole @@ -36,7 +36,7 @@ metadata: labels: events.cloud.google.com/release: devel duck.knative.dev/source: "true" -# Do not use this role directly. These rules will be added to the "cloud-run-events-source-observer" in knative-gcp and "source-observer" role in knative-eventing. +# Do not use this role directly. These rules will be added to the "events-system-source-observer" in knative-gcp and "source-observer" role in knative-eventing. rules: - apiGroups: - "events.cloud.google.com" diff --git a/config/core/roles/webhook-clusterrole.yaml b/config/core/roles/webhook-clusterrole.yaml index a7fc4eb2af..dae2ff1bfe 100644 --- a/config/core/roles/webhook-clusterrole.yaml +++ b/config/core/roles/webhook-clusterrole.yaml @@ -15,7 +15,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: cloud-run-events-webhook + name: events-system-webhook labels: events.cloud.google.com/release: devel rules: diff --git a/config/core/services/controller.yaml b/config/core/services/controller.yaml index de6d581864..b2a5fbd9ad 100644 --- a/config/core/services/controller.yaml +++ b/config/core/services/controller.yaml @@ -16,13 +16,13 @@ apiVersion: v1 kind: Service metadata: name: controller - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel - app: cloud-run-events-controller + app: events-system-controller spec: selector: - app: cloud-run-events-controller + app: events-system-controller ports: - name: metrics port: 9090 diff --git a/config/core/services/webhook.yaml b/config/core/services/webhook.yaml index 3e83ad3978..8e2236e653 100644 --- a/config/core/services/webhook.yaml +++ b/config/core/services/webhook.yaml @@ -19,7 +19,7 @@ metadata: role: webhook events.cloud.google.com/release: devel name: webhook - namespace: cloud-run-events + namespace: events-system spec: ports: - port: 443 diff --git a/config/core/webhooks/config-validation.yaml b/config/core/webhooks/config-validation.yaml index da06a2b63e..cba8c3405c 100644 --- a/config/core/webhooks/config-validation.yaml +++ b/config/core/webhooks/config-validation.yaml @@ -24,7 +24,7 @@ webhooks: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system failurePolicy: Fail sideEffects: None name: config.webhook.events.cloud.google.com diff --git a/config/core/webhooks/defaulting.yaml b/config/core/webhooks/defaulting.yaml index aac154b447..f5121cb70e 100644 --- a/config/core/webhooks/defaulting.yaml +++ b/config/core/webhooks/defaulting.yaml @@ -24,7 +24,7 @@ webhooks: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system failurePolicy: Fail sideEffects: None name: webhook.events.cloud.google.com diff --git a/config/core/webhooks/resource-validation.yaml b/config/core/webhooks/resource-validation.yaml index e6213442b6..3d6058c6a9 100644 --- a/config/core/webhooks/resource-validation.yaml +++ b/config/core/webhooks/resource-validation.yaml @@ -24,7 +24,7 @@ webhooks: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system failurePolicy: Fail sideEffects: None name: validation.webhook.events.cloud.google.com diff --git a/config/core/webhooks/secret.yaml b/config/core/webhooks/secret.yaml index 2f47d081b7..832f127b4b 100644 --- a/config/core/webhooks/secret.yaml +++ b/config/core/webhooks/secret.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: Secret metadata: name: webhook-certs - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel # The data is populated at install time. diff --git a/config/istio/600-istioegress.yaml b/config/istio/600-istioegress.yaml index a40d182dd5..a793839ad6 100644 --- a/config/istio/600-istioegress.yaml +++ b/config/istio/600-istioegress.yaml @@ -16,7 +16,7 @@ apiVersion: networking.istio.io/v1alpha3 kind: ServiceEntry metadata: - name: cloud-run-events-googleapis-ext + name: events-system-googleapis-ext labels: events.cloud.google.com/release: devel spec: diff --git a/config/monitoring/metrics/README.md b/config/monitoring/metrics/README.md index efefd1b9b9..1271e219c4 100644 --- a/config/monitoring/metrics/README.md +++ b/config/monitoring/metrics/README.md @@ -118,7 +118,7 @@ Then, access the [Grafana Dashboard](http://localhost:3000) 1. Run the following command to setup StackDriver as the metrics backend: ```shell - kubectl edit cm -n cloud-run-events config-observability + kubectl edit cm -n events-system config-observability ``` Add `metrics.backend-destination: stackdriver`, diff --git a/config/monitoring/metrics/prometheus/prometheus-scrape-kn-gcp.yaml b/config/monitoring/metrics/prometheus/prometheus-scrape-kn-gcp.yaml index 390bbc011c..973451226c 100644 --- a/config/monitoring/metrics/prometheus/prometheus-scrape-kn-gcp.yaml +++ b/config/monitoring/metrics/prometheus/prometheus-scrape-kn-gcp.yaml @@ -1,7 +1,7 @@ ############################################# ### The following is for Cloud Run Events ### # Cloud Run Events Controller endpoint -- job_name: cloud-run-events-controller +- job_name: events-system-controller scrape_interval: 3s scrape_timeout: 3s kubernetes_sd_configs: @@ -10,14 +10,14 @@ # Scrape only the the targets matching the following metadata - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_pod_label_app, __meta_kubernetes_pod_label_role, __meta_kubernetes_pod_container_port_name] action: keep - regex: cloud-run-events;cloud-run-events;controller;metrics + regex: events-system;events-system;controller;metrics # Rename metadata labels to be reader friendly - source_labels: [__meta_kubernetes_namespace] target_label: namespace - source_labels: [__meta_kubernetes_pod_name] target_label: pod # Cloud Run Events Webhook endpoint -- job_name: cloud-run-events-webhook +- job_name: events-system-webhook scrape_interval: 3s scrape_timeout: 3s kubernetes_sd_configs: @@ -26,7 +26,7 @@ # Scrape only the the targets matching the following metadata - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_pod_label_app, __meta_kubernetes_pod_label_role, __meta_kubernetes_pod_container_port_name] action: keep - regex: cloud-run-events;cloud-run-events;webhook;metrics + regex: events-system;events-system;webhook;metrics # Rename metadata labels to be reader friendly - source_labels: [__meta_kubernetes_namespace] target_label: namespace @@ -44,7 +44,7 @@ # Scrape only the the targets matching the following metadata - source_labels: [__meta_kubernetes_pod_label_events_cloud_run_controller, __meta_kubernetes_pod_container_port_name] action: keep - regex: cloud-run-events-pubsub-pullsubscription-controller;metrics + regex: events-system-pubsub-pullsubscription-controller;metrics # Rename metadata labels to be reader friendly - source_labels: [__meta_kubernetes_namespace] target_label: namespace @@ -60,7 +60,7 @@ # Scrape only the the targets matching the following metadata - source_labels: [__meta_kubernetes_pod_label_events_cloud_run_controller, __meta_kubernetes_pod_container_port_name] action: keep - regex: cloud-run-events-pubsub-topic-controller;metrics + regex: events-system-pubsub-topic-controller;metrics # Rename metadata labels to be reader friendly - source_labels: [__meta_kubernetes_namespace] target_label: namespace diff --git a/config/pre-install/v0.18.0/channel.yaml b/config/pre-install/v0.18.0/channel.yaml index 04f9cbeab3..38146e81c0 100644 --- a/config/pre-install/v0.18.0/channel.yaml +++ b/config/pre-install/v0.18.0/channel.yaml @@ -47,7 +47,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1alpha1 diff --git a/config/pre-install/v0.18.0/cloudauditlogssource.yaml b/config/pre-install/v0.18.0/cloudauditlogssource.yaml index 967d229a9b..378c0d638c 100644 --- a/config/pre-install/v0.18.0/cloudauditlogssource.yaml +++ b/config/pre-install/v0.18.0/cloudauditlogssource.yaml @@ -47,7 +47,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/pre-install/v0.18.0/cloudbuildsource.yaml b/config/pre-install/v0.18.0/cloudbuildsource.yaml index ed05c2fd53..13f97da6a8 100644 --- a/config/pre-install/v0.18.0/cloudbuildsource.yaml +++ b/config/pre-install/v0.18.0/cloudbuildsource.yaml @@ -51,7 +51,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/pre-install/v0.18.0/cloudpubsubsource.yaml b/config/pre-install/v0.18.0/cloudpubsubsource.yaml index 4f60a36f02..9a08530b03 100644 --- a/config/pre-install/v0.18.0/cloudpubsubsource.yaml +++ b/config/pre-install/v0.18.0/cloudpubsubsource.yaml @@ -47,7 +47,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/pre-install/v0.18.0/cloudschedulersource.yaml b/config/pre-install/v0.18.0/cloudschedulersource.yaml index b935443568..8eca16552d 100644 --- a/config/pre-install/v0.18.0/cloudschedulersource.yaml +++ b/config/pre-install/v0.18.0/cloudschedulersource.yaml @@ -47,7 +47,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/pre-install/v0.18.0/cloudstoragesource.yaml b/config/pre-install/v0.18.0/cloudstoragesource.yaml index 583653788d..a4f64e3bb9 100644 --- a/config/pre-install/v0.18.0/cloudstoragesource.yaml +++ b/config/pre-install/v0.18.0/cloudstoragesource.yaml @@ -50,7 +50,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/pre-install/v0.18.0/pullsubscription.yaml b/config/pre-install/v0.18.0/pullsubscription.yaml index de27cefe0b..22dde1ccd8 100644 --- a/config/pre-install/v0.18.0/pullsubscription.yaml +++ b/config/pre-install/v0.18.0/pullsubscription.yaml @@ -40,7 +40,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/pre-install/v0.18.0/serviceaccount.yaml b/config/pre-install/v0.18.0/serviceaccount.yaml index d8715ef1c3..b25794ec50 100644 --- a/config/pre-install/v0.18.0/serviceaccount.yaml +++ b/config/pre-install/v0.18.0/serviceaccount.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: knative-gcp-pre-install-job - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel @@ -31,7 +31,7 @@ metadata: subjects: - kind: ServiceAccount name: knative-gcp-pre-install-job - namespace: cloud-run-events + namespace: events-system roleRef: kind: ClusterRole name: knative-gcp-pre-install-job-role diff --git a/config/pre-install/v0.18.0/storage-version-migration.yaml b/config/pre-install/v0.18.0/storage-version-migration.yaml index 841800655a..fd14072f69 100644 --- a/config/pre-install/v0.18.0/storage-version-migration.yaml +++ b/config/pre-install/v0.18.0/storage-version-migration.yaml @@ -16,7 +16,7 @@ apiVersion: batch/v1 kind: Job metadata: name: storage-version-migration-knative-gcp - namespace: cloud-run-events + namespace: events-system labels: app: "storage-version-migration-knative-gcp" events.cloud.google.com/release: devel diff --git a/config/pre-install/v0.18.0/topic.yaml b/config/pre-install/v0.18.0/topic.yaml index f22221f01c..f1b2e3799b 100644 --- a/config/pre-install/v0.18.0/topic.yaml +++ b/config/pre-install/v0.18.0/topic.yaml @@ -41,7 +41,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/pre-install/v0.19.0/cloudbuildsource.yaml b/config/pre-install/v0.19.0/cloudbuildsource.yaml index e86186a312..f972e862b0 100644 --- a/config/pre-install/v0.19.0/cloudbuildsource.yaml +++ b/config/pre-install/v0.19.0/cloudbuildsource.yaml @@ -51,7 +51,7 @@ spec: clientConfig: service: name: webhook - namespace: cloud-run-events + namespace: events-system versions: - &version name: v1 diff --git a/config/pre-install/v0.19.0/serviceaccount.yaml b/config/pre-install/v0.19.0/serviceaccount.yaml index 583a3d5ae3..9981c1564c 100644 --- a/config/pre-install/v0.19.0/serviceaccount.yaml +++ b/config/pre-install/v0.19.0/serviceaccount.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: knative-gcp-pre-install-job-v0-19-0 - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel @@ -31,7 +31,7 @@ metadata: subjects: - kind: ServiceAccount name: knative-gcp-pre-install-job-v0-19-0 - namespace: cloud-run-events + namespace: events-system roleRef: kind: ClusterRole name: knative-gcp-pre-install-job-role-v0-19-0 diff --git a/config/pre-install/v0.19.0/storage-version-migration.yaml b/config/pre-install/v0.19.0/storage-version-migration.yaml index 3f910b53e1..ac28927740 100644 --- a/config/pre-install/v0.19.0/storage-version-migration.yaml +++ b/config/pre-install/v0.19.0/storage-version-migration.yaml @@ -18,14 +18,14 @@ metadata: # naming it to storage-version-migration-knative-gcp-v0.19.0 will create the job, # but leaves the job in a limbo state that it does not start: # - # $ kubectl get job -n cloud-run-events + # $ kubectl get job -n events-system # NAME COMPLETIONS DURATION AGE # storage-version-migration-knative-gcp 1/1 8s 13m # storage-version-migration-knative-gcp-v0.19.0 0/1 15s # # The corresponding pod is not created either: # - # $ kubectl get pods -n cloud-run-events + # $ kubectl get pods -n events-system # NAME READY STATUS RESTARTS AGE # controller-7847f7d8d7-mwdsm 1/1 Running 0 4m31s # storage-version-migration-knative-gcp-fsxvk 0/1 Completed 0 13m @@ -33,7 +33,7 @@ metadata: # # The reason is why this is happening is unknown, changing it to the following name works. name: storage-version-migration-knative-gcp-v0-19-0 - namespace: cloud-run-events + namespace: events-system labels: app: "storage-version-migration-knative-gcp-v0-19-0" events.cloud.google.com/release: devel diff --git a/docs/development/profiling.md b/docs/development/profiling.md index 811332f1ed..235f3d22d9 100644 --- a/docs/development/profiling.md +++ b/docs/development/profiling.md @@ -12,7 +12,7 @@ below. Currently this includes: ## Enabling the pprof HTTP server The pprof HTTP server is enabled automatically when `config-observability` in -the system namespace (normally `cloud-run-events`) includes the key +the system namespace (normally `events-system`) includes the key `profiling.enable` with any value. The profiling port is 8008. See [`server.go`](https://github.com/knative/pkg/blob/master/profiling/server.go) for more details. diff --git a/docs/examples/gcpbroker/README.md b/docs/examples/gcpbroker/README.md index 00f84d7ae4..29c80c6da0 100644 --- a/docs/examples/gcpbroker/README.md +++ b/docs/examples/gcpbroker/README.md @@ -21,7 +21,7 @@ kubectl apply -f triggers.yaml The yamls create the following resources: -- `cloud-run-events-example` namespace +- `events-system-example` namespace - A pod in which you can run `curl` as the event producer - 2 Kubernetes services `hello-display` and `goodbye-display` as event consumers - A GCP broker named `test-broker` @@ -33,24 +33,24 @@ The yamls create the following resources: Verify the broker is ready: ```shell -kubectl -n cloud-run-events-example get broker test-broker +kubectl -n events-system-example get broker test-broker ``` ```shell NAME READY REASON URL AGE -test-broker True http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/cloud-run-events-example/test-broker 9s +test-broker True http://default-brokercell-ingress.events-system.svc.cluster.local/events-system-example/test-broker 9s ``` Verify the triggers are ready: ```shell -kubectl -n cloud-run-events-example get triggers +kubectl -n events-system-example get triggers ``` ```shell NAME READY REASON BROKER SUBSCRIBER_URI AGE -goodbye-display True test-broker http://goodbye-display.cloud-run-events-example.svc.cluster.local/ 4s -hello-display True test-broker http://hello-display.cloud-run-events-example.svc.cluster.local/ 4s +goodbye-display True test-broker http://goodbye-display.events-system-example.svc.cluster.local/ 4s +hello-display True test-broker http://hello-display.events-system-example.svc.cluster.local/ 4s ``` ## Send Events to the Broker @@ -58,14 +58,14 @@ hello-display True test-broker http://hello-display.cloud-run- SSH into the event publisher pod by running the following command: ```sh - kubectl -n cloud-run-events-example attach curl -it + kubectl -n events-system-example attach curl -it ``` A prompt similar to the one below will appear: ```sh Defaulting container name to curl. - Use 'kubectl describe pod/ -n cloud-run-events-example' to see all of the containers in this pod. + Use 'kubectl describe pod/ -n events-system-example' to see all of the containers in this pod. If you don't see a command prompt, try pressing enter. [ root@curl:/ ]$ ``` @@ -76,7 +76,7 @@ To show the various types of events you can send, you will make three requests: `type:greeting`, run the following in the SSH terminal: ```sh - curl -v "http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/cloud-run-events-example/test-broker" \ + curl -v "http://default-brokercell-ingress.events-system.svc.cluster.local/events-system-example/test-broker" \ -X POST \ -H "Ce-Id: say-hello" \ -H "Ce-Specversion: 1.0" \ @@ -102,7 +102,7 @@ To show the various types of events you can send, you will make three requests: `source:sendoff`, run the following in the SSH terminal: ```sh - curl -v "http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/cloud-run-events-example/test-broker" \ + curl -v "http://default-brokercell-ingress.events-system.svc.cluster.local/events-system-example/test-broker" \ -X POST \ -H "Ce-Id: say-goodbye" \ -H "Ce-Specversion: 1.0" \ @@ -129,7 +129,7 @@ To show the various types of events you can send, you will make three requests: terminal: ```sh - curl -v "http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/cloud-run-events-example/test-broker" \ + curl -v "http://default-brokercell-ingress.events-system.svc.cluster.local/events-system-example/test-broker" \ -X POST \ -H "Ce-Id: say-hello-goodbye" \ -H "Ce-Specversion: 1.0" \ @@ -167,7 +167,7 @@ After sending events, verify that your events were received by the appropriate following command: ```sh - kubectl -n cloud-run-events-example logs -l app=hello-display --tail=100 + kubectl -n events-system-example logs -l app=hello-display --tail=100 ``` This returns the `Attributes` and `Data` of the events you sent to @@ -184,7 +184,7 @@ After sending events, verify that your events were received by the appropriate time: 2019-05-20T17:59:43.81718488Z contenttype: application/json Extensions, - knativehistory: default-broker-srk54-channel-24gls.cloud-run-events-example.svc.cluster.local + knativehistory: default-broker-srk54-channel-24gls.events-system-example.svc.cluster.local Data, { "msg": "Hello Cloud Run Events!" @@ -199,7 +199,7 @@ After sending events, verify that your events were received by the appropriate time: 2019-05-20T17:59:54.211866425Z contenttype: application/json Extensions, - knativehistory: default-broker-srk54-channel-24gls.cloud-run-events-example.svc.cluster.local + knativehistory: default-broker-srk54-channel-24gls.events-system-example.svc.cluster.local Data, { "msg": "Hello Cloud Run Events! Goodbye Cloud Run Events!" @@ -210,7 +210,7 @@ After sending events, verify that your events were received by the appropriate following command: ```sh - kubectl -n cloud-run-events-example logs -l app=goodbye-display --tail=100 + kubectl -n events-system-example logs -l app=goodbye-display --tail=100 ``` This returns the `Attributes` and `Data` of the events you sent to @@ -227,7 +227,7 @@ After sending events, verify that your events were received by the appropriate time: 2019-05-20T17:59:49.044926148Z contenttype: application/json Extensions, - knativehistory: default-broker-srk54-channel-24gls.cloud-run-events-example.svc.cluster.local + knativehistory: default-broker-srk54-channel-24gls.events-system-example.svc.cluster.local Data, { "msg": "Goodbye Cloud Run Events!" @@ -242,7 +242,7 @@ After sending events, verify that your events were received by the appropriate time: 2019-05-20T17:59:54.211866425Z contenttype: application/json Extensions, - knativehistory: default-broker-srk54-channel-24gls.cloud-run-events-example.svc.cluster.local + knativehistory: default-broker-srk54-channel-24gls.events-system-example.svc.cluster.local Data, { "msg": "Hello Cloud Run Events! Goodbye Cloud Run Events!" @@ -268,13 +268,13 @@ consumers are back. 1. SSH into the event publisher pod by running the following command: ```sh - kubectl -n cloud-run-events-example attach curl -it + kubectl -n events-system-example attach curl -it ``` 1. Send an event that has the `type:greeting` and the`source:sendoff`: ```sh - curl -v "http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/cloud-run-events-example/test-broker" \ + curl -v "http://default-brokercell-ingress.events-system.svc.cluster.local/events-system-example/test-broker" \ -X POST \ -H "Ce-Id: say-hello-goodbye" \ -H "Ce-Specversion: 1.0" \ diff --git a/docs/examples/gcpbroker/broker.yaml b/docs/examples/gcpbroker/broker.yaml index 0166aadb79..20cb07bf69 100644 --- a/docs/examples/gcpbroker/broker.yaml +++ b/docs/examples/gcpbroker/broker.yaml @@ -16,6 +16,6 @@ apiVersion: eventing.knative.dev/v1beta1 kind: Broker metadata: name: test-broker - namespace: cloud-run-events-example + namespace: events-system-example annotations: "eventing.knative.dev/broker.class": "googlecloud" \ No newline at end of file diff --git a/docs/examples/gcpbroker/event-consumers.yaml b/docs/examples/gcpbroker/event-consumers.yaml index 88f2ad8e03..928aad7ed3 100644 --- a/docs/examples/gcpbroker/event-consumers.yaml +++ b/docs/examples/gcpbroker/event-consumers.yaml @@ -16,7 +16,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: hello-display - namespace: cloud-run-events-example + namespace: events-system-example spec: replicas: 1 selector: @@ -39,7 +39,7 @@ spec: apiVersion: v1 metadata: name: hello-display - namespace: cloud-run-events-example + namespace: events-system-example spec: selector: app: hello-display @@ -53,7 +53,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: goodbye-display - namespace: cloud-run-events-example + namespace: events-system-example spec: replicas: 1 selector: @@ -76,7 +76,7 @@ kind: Service apiVersion: v1 metadata: name: goodbye-display - namespace: cloud-run-events-example + namespace: events-system-example spec: selector: app: goodbye-display diff --git a/docs/examples/gcpbroker/event-publisher.yaml b/docs/examples/gcpbroker/event-publisher.yaml index 87b23af9db..f5b40dc254 100644 --- a/docs/examples/gcpbroker/event-publisher.yaml +++ b/docs/examples/gcpbroker/event-publisher.yaml @@ -18,7 +18,7 @@ metadata: labels: run: curl name: curl - namespace: cloud-run-events-example + namespace: events-system-example spec: containers: # This could be any image that we can SSH into and has curl. diff --git a/docs/examples/gcpbroker/namespace.yaml b/docs/examples/gcpbroker/namespace.yaml index f2ec6a3651..7491b67143 100644 --- a/docs/examples/gcpbroker/namespace.yaml +++ b/docs/examples/gcpbroker/namespace.yaml @@ -15,6 +15,6 @@ apiVersion: v1 kind: Namespace metadata: - name: cloud-run-events-example + name: events-system-example labels: events.cloud.google.com/release: devel diff --git a/docs/examples/gcpbroker/triggers.yaml b/docs/examples/gcpbroker/triggers.yaml index d719a44675..f46c218731 100644 --- a/docs/examples/gcpbroker/triggers.yaml +++ b/docs/examples/gcpbroker/triggers.yaml @@ -17,7 +17,7 @@ apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: hello-display - namespace: cloud-run-events-example + namespace: events-system-example spec: broker: test-broker filter: @@ -35,7 +35,7 @@ apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: goodbye-display - namespace: cloud-run-events-example + namespace: events-system-example spec: broker: test-broker filter: diff --git a/docs/examples/metrics/README.md b/docs/examples/metrics/README.md index 55f69c1672..1a6bcd0117 100644 --- a/docs/examples/metrics/README.md +++ b/docs/examples/metrics/README.md @@ -19,7 +19,7 @@ and viewing those metrics with common filters in Stackdriver. ## Generating metrics -This example will run everything in the cloud-run-events-example namespace. +This example will run everything in the events-system-example namespace. 1. Create the namespace @@ -37,12 +37,12 @@ This example will run everything in the cloud-run-events-example namespace. 3. Verify that the Broker is ready ```shell - kubectl -n cloud-run-events-example get broker test-broker + kubectl -n events-system-example get broker test-broker ``` ```shell NAME READY REASON URL AGE - test-broker True http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/cloud-run-events-example/test-broker 9s + test-broker True http://default-brokercell-ingress.events-system.svc.cluster.local/events-system-example/test-broker 9s ``` 4. Deploy a Trigger and event consumer @@ -55,12 +55,12 @@ This example will run everything in the cloud-run-events-example namespace. 5. Verify that the Trigger is ready ```shell - kubectl -n cloud-run-events-example get trigger hello-display + kubectl -n events-system-example get trigger hello-display ``` ```shell NAME READY REASON BROKER SUBSCRIBER_URI AGE - hello-display True test-broker http://hello-display.cloud-run-events-example.svc.cluster.local/ 4s + hello-display True test-broker http://hello-display.events-system-example.svc.cluster.local/ 4s ``` 6. ##### Send events to the Broker: @@ -68,14 +68,14 @@ This example will run everything in the cloud-run-events-example namespace. SSH into the event publisher Pod by running the following command: ```shell - kubectl -n cloud-run-events-example attach curl -it + kubectl -n events-system-example attach curl -it ``` A prompt similar to the one below will appear: ```sh Defaulting container name to curl. - Use 'kubectl describe pod/ -n cloud-run-events-example' to see all of the containers in this pod. + Use 'kubectl describe pod/ -n events-system-example' to see all of the containers in this pod. If you don't see a command prompt, try pressing enter. [ root@curl:/ ]$ ``` @@ -83,7 +83,7 @@ This example will run everything in the cloud-run-events-example namespace. Send multiple events like this to generate metrics: ```sh - curl -v "http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/cloud-run-events-example/test-broker" \ + curl -v "http://default-brokercell-ingress.events-system.svc.cluster.local/events-system-example/test-broker" \ -X POST \ -H "Ce-Id: say-hello" \ -H "Ce-Specversion: 1.0" \ diff --git a/docs/examples/metrics/broker.yaml b/docs/examples/metrics/broker.yaml index 4fbc74b3cf..cb9903e922 100644 --- a/docs/examples/metrics/broker.yaml +++ b/docs/examples/metrics/broker.yaml @@ -16,6 +16,6 @@ apiVersion: eventing.knative.dev/v1beta1 kind: Broker metadata: name: test-broker - namespace: cloud-run-events-example + namespace: events-system-example annotations: "eventing.knative.dev/broker.class": "googlecloud" diff --git a/docs/examples/metrics/event-consumer.yaml b/docs/examples/metrics/event-consumer.yaml index 4af1f0fb3e..fdaad7b89d 100644 --- a/docs/examples/metrics/event-consumer.yaml +++ b/docs/examples/metrics/event-consumer.yaml @@ -16,7 +16,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: hello-display - namespace: cloud-run-events-example + namespace: events-system-example spec: replicas: 1 selector: @@ -39,7 +39,7 @@ spec: apiVersion: v1 metadata: name: hello-display - namespace: cloud-run-events-example + namespace: events-system-example spec: selector: app: hello-display diff --git a/docs/examples/metrics/event-publisher.yaml b/docs/examples/metrics/event-publisher.yaml index 4295ed3da2..132a62f131 100644 --- a/docs/examples/metrics/event-publisher.yaml +++ b/docs/examples/metrics/event-publisher.yaml @@ -18,7 +18,7 @@ metadata: labels: run: curl name: curl - namespace: cloud-run-events-example + namespace: events-system-example spec: containers: # This could be any image that we can SSH into and has curl. diff --git a/docs/examples/metrics/namespace.yaml b/docs/examples/metrics/namespace.yaml index f2ec6a3651..7491b67143 100644 --- a/docs/examples/metrics/namespace.yaml +++ b/docs/examples/metrics/namespace.yaml @@ -15,6 +15,6 @@ apiVersion: v1 kind: Namespace metadata: - name: cloud-run-events-example + name: events-system-example labels: events.cloud.google.com/release: devel diff --git a/docs/examples/metrics/trigger.yaml b/docs/examples/metrics/trigger.yaml index 4da4e80cb6..2966bb1d92 100644 --- a/docs/examples/metrics/trigger.yaml +++ b/docs/examples/metrics/trigger.yaml @@ -16,7 +16,7 @@ apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: hello-display - namespace: cloud-run-events-example + namespace: events-system-example spec: broker: test-broker subscriber: diff --git a/docs/how-to/authentication-mechanism-troubleshooting.md b/docs/how-to/authentication-mechanism-troubleshooting.md index 305d12bdc0..bfc06a5bf0 100644 --- a/docs/how-to/authentication-mechanism-troubleshooting.md +++ b/docs/how-to/authentication-mechanism-troubleshooting.md @@ -140,17 +140,17 @@ kubectl describe cloudauditlogssource test -n default - If you are using Workload Identity for the Control Plane, refer [here](../install/authentication-mechanisms-gcp.md/#workload-identity) to check the Google Cloud Service Account `cloud-run-events`, and the - Kubernetes Service Account `controller` in namespace `cloud-run-events`. + Kubernetes Service Account `controller` in namespace `events-system`. - If you are using Kubernetes Secret for the Control Plane, refer [here](../install/authentication-mechanisms-gcp.md/#kubernetes-secrets) to check the Kubernetes Secret `google-cloud-key` in namespace - `cloud-run-events`. + `events-system`. **_Note:_** For Kubernetes Secret, if the JSON private key no longer exists under your Google Cloud Service Account `cloud-run-events`. Then, even the Google Cloud Service Account `cloud-run-events` has all required permissions, and the corresponding Kubernetes Secret `google-cloud-key` is in namespace -`cloud-run-events`, you still get permission related error. To such case, you +`events-system`, you still get permission related error. To such case, you have to re-download the JSON private key and re-create the Kubernetes Secret, refer [here](../install/authentication-mechanisms-gcp.md/#option-2-kubernetes-secrets) diff --git a/docs/how-to/broker-priority.md b/docs/how-to/broker-priority.md index 4d47319695..c70adeadc4 100644 --- a/docs/how-to/broker-priority.md +++ b/docs/how-to/broker-priority.md @@ -3,7 +3,7 @@ ## Background The data plane components of `GCP-broker` are running on Kubernetes clusters in -`cloud-run-events` namespace. Their resource consumption depends on the number +`events-system` namespace. Their resource consumption depends on the number of cluster nodes and number of pods running in total. As existing components use more resources and as we add more new components, @@ -56,7 +56,7 @@ value bigger than `1000000000`(one billion). 1. Make sure you have at least one broker in your cluster. 2. Apply the following command to check the broker data plane: ``` - kubectl get deployment -n cloud-run-events + kubectl get deployment -n events-system ``` You are going to update `deployment`s: ``` @@ -86,7 +86,7 @@ value bigger than `1000000000`(one billion). 4. Use the following command to verify the Pod Priority. ``` - kubectl get pod -n cloud-run-events -l 'role in (ingress,fanout,retry)' -o yaml + kubectl get pod -n events-system -l 'role in (ingress,fanout,retry)' -o yaml ``` You will find a new field `Priority` under `spec.template.spec` with the diff --git a/docs/how-to/cloud-trace.md b/docs/how-to/cloud-trace.md index a0a0d45696..d32c9e41de 100644 --- a/docs/how-to/cloud-trace.md +++ b/docs/how-to/cloud-trace.md @@ -15,11 +15,11 @@ to grant dataplane service accounts `roles/cloudtrace.agent`. ## Enable Tracing in the `config-tracing` ConfigMap -Edit the `config-tracing` ConfigMap under the `cloud-run-events` namespace in +Edit the `config-tracing` ConfigMap under the `events-system` namespace in Cloud Console or with the following `kubectl` command: ```shell -kubectl edit configmap -n cloud-run-events config-tracing +kubectl edit configmap -n events-system config-tracing ``` and add the following entries to the data section: diff --git a/docs/how-to/metrics.md b/docs/how-to/metrics.md index 924ae1fa37..252007d280 100644 --- a/docs/how-to/metrics.md +++ b/docs/how-to/metrics.md @@ -25,11 +25,11 @@ gcloud projects add-iam-policy-binding $PROJECT_ID \ ## Enable Metrics in the `config-observability` ConfigMap -Edit the `config-observability` ConfigMap under the `cloud-run-events` namespace +Edit the `config-observability` ConfigMap under the `events-system` namespace in Cloud Console or with the following `kubectl` command: ```shell -kubectl edit configmap -n cloud-run-events config-observability +kubectl edit configmap -n events-system config-observability ``` and add the following entries: diff --git a/docs/install/authentication-mechanisms-gcp.md b/docs/install/authentication-mechanisms-gcp.md index e4fa0549e2..747177a183 100644 --- a/docs/install/authentication-mechanisms-gcp.md +++ b/docs/install/authentication-mechanisms-gcp.md @@ -85,7 +85,7 @@ gcloud projects add-iam-policy-binding $PROJECT_ID \ resources will reside. If you are configuring Authentication Mechanism for the Control Plane, you can skip this step, and directly use Kubernetes Service Account `controller` which is already in the Control Plane namespace - `cloud-run-events` + `events-system` ```shell kubectl create serviceaccount ksa-name -n ksa-namespace @@ -103,7 +103,7 @@ gcloud projects add-iam-policy-binding $PROJECT_ID \ ``` If you are configuring Authentication Mechanism for the Control Plane, you - can replace `ksa-namespace` with `cloud-run-events`, `ksa-name` with + can replace `ksa-namespace` with `events-system`, `ksa-name` with `controller`, and `gsa-name` with `cloud-run-events` 1. Annotate the Kubernetes Service Account `ksa-name`. @@ -114,7 +114,7 @@ gcloud projects add-iam-policy-binding $PROJECT_ID \ ``` If you are configuring Authentication Mechanism for the Control Plane, you - can replace `ksa-namespace` with `cloud-run-events`, `ksa-name` with + can replace `ksa-namespace` with `events-system`, `ksa-name` with `controller`, and `gsa-name` with `cloud-run-events` ### Option 2: Kubernetes Secrets @@ -127,11 +127,11 @@ gcloud projects add-iam-policy-binding $PROJECT_ID \ --iam-account=cloud-run-events@$PROJECT_ID.iam.gserviceaccount.com ``` -1. Create a Secret on the Kubernetes cluster in the `cloud-run-events` namespace +1. Create a Secret on the Kubernetes cluster in the `events-system` namespace with the downloaded key: ```shell - kubectl --namespace cloud-run-events create secret generic google-cloud-key --from-file=key.json=cloud-run-events.json + kubectl --namespace events-system create secret generic google-cloud-key --from-file=key.json=cloud-run-events.json ``` Note that `google-cloud-key` and `key.json` are default values expected by @@ -195,7 +195,7 @@ for automated scripts. You can directly edit the ConfigMap by: ```shell - kubectl edit configmap config-gcp-auth -n cloud-run-events + kubectl edit configmap config-gcp-auth -n events-system ``` and add `workloadIdentityMapping` in `clusterDefaults`: diff --git a/docs/install/config-br-default-channel.yaml b/docs/install/config-br-default-channel.yaml index 4228d7cd67..eecf4915cd 100644 --- a/docs/install/config-br-default-channel.yaml +++ b/docs/install/config-br-default-channel.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-br-default-channel - namespace: cloud-run-events + namespace: events-system data: channelTemplateSpec: | apiVersion: messaging.cloud.google.com/v1beta1 diff --git a/docs/install/install-broker-with-pubsub-channel.md b/docs/install/install-broker-with-pubsub-channel.md index 92d619d087..e4b8ff8760 100644 --- a/docs/install/install-broker-with-pubsub-channel.md +++ b/docs/install/install-broker-with-pubsub-channel.md @@ -16,10 +16,10 @@ Channel. ## Deployment 1. Verify the configmap `config-br-default-channel` is in the - `cloud-run-events` namespace. + `events-system` namespace. ```shell - kubectl get configmap config-br-default-channel -n cloud-run-events + kubectl get configmap config-br-default-channel -n events-system ``` By default, it is assumed to use a default secret. Modify diff --git a/docs/install/install-gcp-broker.md b/docs/install/install-gcp-broker.md index 1ac3a9fe29..dd8050db75 100644 --- a/docs/install/install-gcp-broker.md +++ b/docs/install/install-gcp-broker.md @@ -47,7 +47,7 @@ Workload Identity see ```shell gcloud iam service-accounts add-iam-policy-binding \ --role roles/iam.workloadIdentityUser \ - --member serviceAccount:$PROJECT_ID.svc.id.goog[cloud-run-events/broker] \ + --member serviceAccount:$PROJECT_ID.svc.id.goog[events-system/broker] \ cre-dataplane@$PROJECT_ID.iam.gserviceaccount.com ``` @@ -55,7 +55,7 @@ Workload Identity see `iam.gke.io/gcp-service-account=cre-dataplane@PROJECT_ID.iam.gserviceaccount.com` ```shell - kubectl --namespace cloud-run-events annotate serviceaccount broker iam.gke.io/gcp-service-account=cre-dataplane@${PROJECT_ID}.iam.gserviceaccount.com + kubectl --namespace events-system annotate serviceaccount broker iam.gke.io/gcp-service-account=cre-dataplane@${PROJECT_ID}.iam.gserviceaccount.com ``` ### Option 2. Export Service Account Keys And Store Them as Kubernetes Secrets @@ -71,7 +71,7 @@ Workload Identity see 1. Create a secret on the Kubernetes cluster with the downloaded key. ```shell - kubectl --namespace cloud-run-events create secret generic google-broker-key --from-file=key.json=cre-dataplane.json + kubectl --namespace events-system create secret generic google-broker-key --from-file=key.json=cre-dataplane.json ``` `google-broker-key` and `key.json` are default values expected by our @@ -93,7 +93,7 @@ Workload Identity see ## Usage ```shell -export NAMESPACE=cloud-run-events-example +export NAMESPACE=events-system-example export BROKER=test-broker kubectl create namespace ${NAMESPACE} ``` @@ -126,7 +126,7 @@ kubectl create namespace ${NAMESPACE} ```shell NAME READY REASON URL AGE - test-broker True http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/cloud-run-events-example/test-broker 15s + test-broker True http://default-brokercell-ingress.events-system.svc.cluster.local/events-system-example/test-broker 15s ``` Once the GCP broker is ready, you can use it by sending events to its `URL` and @@ -152,7 +152,7 @@ subscriptions for the Triggers. [shared main function](https://github.com/google/knative-gcp/blob/master/cmd/controller/main.go) with other controllers. - [Deployment](https://github.com/google/knative-gcp/blob/master/config/500-controller.yaml): - By default it's deployed as `controller` in the `cloud-run-events` namespace. + By default it's deployed as `controller` in the `events-system` namespace. ### Data Plane @@ -163,19 +163,19 @@ All GCP Brokers share the following data plane components: - Code: [main.go](https://github.com/google/knative-gcp/blob/master/cmd/broker/ingress/main.go) - Deployment: It contains a Service and Deployment, both called - `broker-ingress` in the `cloud-run-events` namespace. + `broker-ingress` in the `events-system` namespace. - Fanout. Fanout continuously pull events from decouple topics for all Brokers, applies Trigger filters, and sends events to consumers. For failed deliveries, it sends the events to the corresponding retry topic. - Code: [main.go](https://github.com/google/knative-gcp/blob/master/cmd/broker/fanout/main.go) - - Deployment: It a deployment called `broker-fanout` in the `cloud-run-events` + - Deployment: It a deployment called `broker-fanout` in the `events-system` namespace. - Retry. Retry continuously resends events that have failed in delivery to the consumers. - Code: [main.go](https://github.com/google/knative-gcp/blob/master/cmd/broker/retry/main.go) - - Deployment: It a deployment called `broker-retry` in the `cloud-run-events` + - Deployment: It a deployment called `broker-retry` in the `events-system` namespace. ### Common Issues @@ -196,8 +196,8 @@ All GCP Brokers share the following data plane components: - Check the ingress pod logs. - Make sure the HTTP method is POST and the request is a CloudEvent. It's recommended to use CloudEvents SDK to make the request. - - Compare `/var/run/cloud-run-events/broker/targets` file in the ingress pod - with the contents in `config-targets` configmap in `cloud-run-events` + - Compare `/var/run/events-system/broker/targets` file in the ingress pod + with the contents in `config-targets` configmap in `events-system` namespace. If they are not the same, it's likely that the configmap volume in the pod is not updated with the latest information. Delete the pod and wait for it to be recreated. Meanwhile file a bug. @@ -209,8 +209,8 @@ All GCP Brokers share the following data plane components: [#832](https://github.com/google/knative-gcp/issues/832). In this case you need to delete the pull subscription manually and wait for it to be recreated by the controller. - - Compare `/var/run/cloud-run-events/broker/targets` file in the fanout pod - with the contents in `config-targets` configmap in `cloud-run-events` + - Compare `/var/run/events-system/broker/targets` file in the fanout pod + with the contents in `config-targets` configmap in `events-system` namespace. If they are not the same, it's likely that the configmap volume in the pod is not updated with the latest information. Delete the pod and wait for it to be recreated. Meanwhile file a bug. @@ -224,8 +224,8 @@ All GCP Brokers share the following data plane components: [#832](https://github.com/google/knative-gcp/issues/832). In this case you need to delete the pull subscription manually and wait for it to be recreated by the controller. - - Compare `/var/run/cloud-run-events/broker/targets` file in the retry pod - with the contents in `config-targets` configmap in `cloud-run-events` + - Compare `/var/run/events-system/broker/targets` file in the retry pod + with the contents in `config-targets` configmap in `events-system` namespace. If they are not the same, it's likely that the configmap volume in the pod is not updated with the latest information. Delete the pod and wait for it to be recreated. Meanwhile file a bug. diff --git a/docs/install/patch-config-br-defaults-with-pubsub.yaml b/docs/install/patch-config-br-defaults-with-pubsub.yaml index f1c3e7ec90..583a1e736b 100644 --- a/docs/install/patch-config-br-defaults-with-pubsub.yaml +++ b/docs/install/patch-config-br-defaults-with-pubsub.yaml @@ -20,4 +20,4 @@ data: apiVersion: v1 kind: ConfigMap name: config-br-default-channel - namespace: cloud-run-events + namespace: events-system diff --git a/hack/lib.sh b/hack/lib.sh index 2199f0f2d7..47956b7fcb 100644 --- a/hack/lib.sh +++ b/hack/lib.sh @@ -15,7 +15,7 @@ # limitations under the License. readonly CONTROL_PLANE_SERVICE_ACCOUNT="cloud-run-events" -readonly CONTROL_PLANE_NAMESPACE="cloud-run-events" +readonly CONTROL_PLANE_NAMESPACE="events-system" readonly PUBSUB_SERVICE_ACCOUNT="cre-pubsub" diff --git a/pkg/apis/configs/brokerdelivery/br_delivery_defaults_test.go b/pkg/apis/configs/brokerdelivery/br_delivery_defaults_test.go index 50648bc49a..40ceaf3a31 100644 --- a/pkg/apis/configs/brokerdelivery/br_delivery_defaults_test.go +++ b/pkg/apis/configs/brokerdelivery/br_delivery_defaults_test.go @@ -116,7 +116,7 @@ func TestNewDefaultsConfigFromConfigMapWithError(t *testing.T) { "empty data": { config: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Namespace: "cloud-run-events", + Namespace: "events-system", Name: configName, }, Data: map[string]string{}, @@ -125,7 +125,7 @@ func TestNewDefaultsConfigFromConfigMapWithError(t *testing.T) { "missing key": { config: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Namespace: "cloud-run-events", + Namespace: "events-system", Name: configName, }, Data: map[string]string{ @@ -136,7 +136,7 @@ func TestNewDefaultsConfigFromConfigMapWithError(t *testing.T) { "invalid YAML": { config: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Namespace: "cloud-run-events", + Namespace: "events-system", Name: configName, }, Data: map[string]string{ diff --git a/pkg/apis/configs/brokerdelivery/testdata/config-br-delivery.yaml b/pkg/apis/configs/brokerdelivery/testdata/config-br-delivery.yaml index 9604df5d4e..30abe45a21 100644 --- a/pkg/apis/configs/brokerdelivery/testdata/config-br-delivery.yaml +++ b/pkg/apis/configs/brokerdelivery/testdata/config-br-delivery.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-br-delivery - namespace: cloud-run-events + namespace: events-system data: default-br-delivery-config: | clusterDefaults: diff --git a/pkg/apis/configs/dataresidency/dataresidency_defaults_test.go b/pkg/apis/configs/dataresidency/dataresidency_defaults_test.go index 650d034ba9..3cf69c4015 100644 --- a/pkg/apis/configs/dataresidency/dataresidency_defaults_test.go +++ b/pkg/apis/configs/dataresidency/dataresidency_defaults_test.go @@ -126,7 +126,7 @@ func TestNewDefaultsConfigFromConfigMapWithKeyError(t *testing.T) { "empty data": { config: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Namespace: "cloud-run-events", + Namespace: "events-system", Name: configName, }, Data: map[string]string{}, @@ -135,7 +135,7 @@ func TestNewDefaultsConfigFromConfigMapWithKeyError(t *testing.T) { "missing key": { config: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Namespace: "cloud-run-events", + Namespace: "events-system", Name: configName, }, Data: map[string]string{ @@ -146,7 +146,7 @@ func TestNewDefaultsConfigFromConfigMapWithKeyError(t *testing.T) { "wrong format": { config: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Namespace: "cloud-run-events", + Namespace: "events-system", Name: configName, }, Data: map[string]string{ diff --git a/pkg/apis/configs/dataresidency/testdata/config-dataresidency.yaml b/pkg/apis/configs/dataresidency/testdata/config-dataresidency.yaml index 06ae60fd64..6ffe8df76f 100644 --- a/pkg/apis/configs/dataresidency/testdata/config-dataresidency.yaml +++ b/pkg/apis/configs/dataresidency/testdata/config-dataresidency.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-dataresidency - namespace: cloud-run-events + namespace: events-system data: default-dataresidency-config: | clusterDefaults: diff --git a/pkg/apis/configs/gcpauth/gcp_auth_defaults_test.go b/pkg/apis/configs/gcpauth/gcp_auth_defaults_test.go index 3b29403c30..2deabe138a 100644 --- a/pkg/apis/configs/gcpauth/gcp_auth_defaults_test.go +++ b/pkg/apis/configs/gcpauth/gcp_auth_defaults_test.go @@ -120,7 +120,7 @@ func TestNewDefaultsConfigFromConfigMapWithError(t *testing.T) { "empty data": { config: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Namespace: "cloud-run-events", + Namespace: "events-system", Name: configName, }, Data: map[string]string{}, @@ -129,7 +129,7 @@ func TestNewDefaultsConfigFromConfigMapWithError(t *testing.T) { "missing key": { config: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Namespace: "cloud-run-events", + Namespace: "events-system", Name: configName, }, Data: map[string]string{ diff --git a/pkg/apis/configs/gcpauth/testdata/config-gcp-auth.yaml b/pkg/apis/configs/gcpauth/testdata/config-gcp-auth.yaml index ee00244f22..ccbb4162be 100644 --- a/pkg/apis/configs/gcpauth/testdata/config-gcp-auth.yaml +++ b/pkg/apis/configs/gcpauth/testdata/config-gcp-auth.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-gcp-auth - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel diff --git a/pkg/apis/intevents/v1alpha1/brokercell_types.go b/pkg/apis/intevents/v1alpha1/brokercell_types.go index 0b37b058b0..327036d516 100644 --- a/pkg/apis/intevents/v1alpha1/brokercell_types.go +++ b/pkg/apis/intevents/v1alpha1/brokercell_types.go @@ -136,7 +136,7 @@ type BrokerCellStatus struct { // IngressTemplate contains a URI template as specified by RFC6570 to // generate Broker ingress URIs. It may contain variables `name` and // `namespace`. - // Example: "http://broker-ingress.cloud-run-events.svc.cluster.local/{namespace}/{name}" + // Example: "http://broker-ingress.events-system.svc.cluster.local/{namespace}/{name}" IngressTemplate string `json:"ingressTemplate,omitempty"` } diff --git a/pkg/broker/config/volume/volume.go b/pkg/broker/config/volume/volume.go index 02d8348c28..943e6ce48d 100644 --- a/pkg/broker/config/volume/volume.go +++ b/pkg/broker/config/volume/volume.go @@ -28,7 +28,7 @@ import ( ) const ( - defaultPath = "/var/run/cloud-run-events/broker/targets" + defaultPath = "/var/run/events-system/broker/targets" ) // Targets implements config.ReadonlyTargets with data diff --git a/pkg/reconciler/brokercell/resources/args.go b/pkg/reconciler/brokercell/resources/args.go index 5a569f28de..8c6d0b5f26 100644 --- a/pkg/reconciler/brokercell/resources/args.go +++ b/pkg/reconciler/brokercell/resources/args.go @@ -102,7 +102,7 @@ func Labels(brokerCellName, componentName string) map[string]string { func CommonLabels(brokerCellName string) map[string]string { return map[string]string{ - "app": "cloud-run-events", + "app": "events-system", BrokerCellLabelKey: brokerCellName, } } diff --git a/pkg/reconciler/brokercell/resources/deployments.go b/pkg/reconciler/brokercell/resources/deployments.go index 2564c58498..f406550e5f 100644 --- a/pkg/reconciler/brokercell/resources/deployments.go +++ b/pkg/reconciler/brokercell/resources/deployments.go @@ -230,7 +230,7 @@ func containerTemplate(args Args) corev1.Container { VolumeMounts: []corev1.VolumeMount{ { Name: "broker-config", - MountPath: "/var/run/cloud-run-events/broker", + MountPath: "/var/run/events-system/broker", }, { Name: "google-broker-key", diff --git a/pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml b/pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml index 9070b8437f..3eaa8b8ba7 100644 --- a/pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml +++ b/pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml @@ -17,7 +17,7 @@ metadata: name: test-brokercell-brokercell-fanout namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: fanout ownerReferences: @@ -29,7 +29,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: fanout minReadySeconds: 60 @@ -79,7 +79,7 @@ spec: value: "100" volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_restart_annotation.yaml b/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_restart_annotation.yaml index 0940afbd0c..568370a3fb 100644 --- a/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_restart_annotation.yaml +++ b/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_restart_annotation.yaml @@ -18,7 +18,7 @@ metadata: name: test-brokercell-brokercell-fanout namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: fanout ownerReferences: @@ -30,7 +30,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: fanout minReadySeconds: 60 @@ -81,7 +81,7 @@ spec: value: "100" volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_status.yaml b/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_status.yaml index e243ac02b3..da999da531 100644 --- a/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_status.yaml +++ b/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_status.yaml @@ -18,7 +18,7 @@ metadata: name: test-brokercell-brokercell-fanout namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: fanout ownerReferences: @@ -30,7 +30,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: fanout minReadySeconds: 60 @@ -80,7 +80,7 @@ spec: value: "100" volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/fanout_hpa.yaml b/pkg/reconciler/brokercell/testingdata/fanout_hpa.yaml index 1214c76931..6cd1a8191d 100644 --- a/pkg/reconciler/brokercell/testingdata/fanout_hpa.yaml +++ b/pkg/reconciler/brokercell/testingdata/fanout_hpa.yaml @@ -16,7 +16,7 @@ metadata: name: test-brokercell-brokercell-fanout-hpa namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: fanout ownerReferences: diff --git a/pkg/reconciler/brokercell/testingdata/ingress_deployment.yaml b/pkg/reconciler/brokercell/testingdata/ingress_deployment.yaml index 223b89752e..29789b0ed9 100644 --- a/pkg/reconciler/brokercell/testingdata/ingress_deployment.yaml +++ b/pkg/reconciler/brokercell/testingdata/ingress_deployment.yaml @@ -17,7 +17,7 @@ metadata: name: test-brokercell-brokercell-ingress namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress ownerReferences: @@ -29,7 +29,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress minReadySeconds: 60 @@ -91,7 +91,7 @@ spec: value: false volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_filtering_annotation.yaml b/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_filtering_annotation.yaml index 7a055b37db..9ea021634b 100644 --- a/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_filtering_annotation.yaml +++ b/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_filtering_annotation.yaml @@ -19,7 +19,7 @@ metadata: name: test-brokercell-brokercell-ingress namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress ownerReferences: @@ -31,7 +31,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress minReadySeconds: 60 @@ -94,7 +94,7 @@ spec: value: "true" volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_restart_annotation.yaml b/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_restart_annotation.yaml index e2528bab51..251ef7d83d 100644 --- a/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_restart_annotation.yaml +++ b/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_restart_annotation.yaml @@ -18,7 +18,7 @@ metadata: name: test-brokercell-brokercell-ingress namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress ownerReferences: @@ -30,7 +30,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress minReadySeconds: 60 @@ -93,7 +93,7 @@ spec: value: false volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_status.yaml b/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_status.yaml index 5bcb0fb059..bffca71ebb 100644 --- a/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_status.yaml +++ b/pkg/reconciler/brokercell/testingdata/ingress_deployment_with_status.yaml @@ -18,7 +18,7 @@ metadata: name: test-brokercell-brokercell-ingress namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress ownerReferences: @@ -30,7 +30,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress minReadySeconds: 60 @@ -92,7 +92,7 @@ spec: value: false volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/ingress_hpa.yaml b/pkg/reconciler/brokercell/testingdata/ingress_hpa.yaml index 24e0edd694..1a21ee77eb 100644 --- a/pkg/reconciler/brokercell/testingdata/ingress_hpa.yaml +++ b/pkg/reconciler/brokercell/testingdata/ingress_hpa.yaml @@ -16,7 +16,7 @@ metadata: name: test-brokercell-brokercell-ingress-hpa namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress ownerReferences: diff --git a/pkg/reconciler/brokercell/testingdata/ingress_service.yaml b/pkg/reconciler/brokercell/testingdata/ingress_service.yaml index a7c4b9995a..95d1b7b3fa 100644 --- a/pkg/reconciler/brokercell/testingdata/ingress_service.yaml +++ b/pkg/reconciler/brokercell/testingdata/ingress_service.yaml @@ -17,7 +17,7 @@ metadata: name: test-brokercell-brokercell-ingress namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress ownerReferences: @@ -28,7 +28,7 @@ metadata: blockOwnerDeletion: true spec: selector: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress ports: diff --git a/pkg/reconciler/brokercell/testingdata/ingress_service_with_status.yaml b/pkg/reconciler/brokercell/testingdata/ingress_service_with_status.yaml index 899a4b44fa..4ee1019ed9 100644 --- a/pkg/reconciler/brokercell/testingdata/ingress_service_with_status.yaml +++ b/pkg/reconciler/brokercell/testingdata/ingress_service_with_status.yaml @@ -18,7 +18,7 @@ metadata: name: test-brokercell-brokercell-ingress namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress ownerReferences: @@ -29,7 +29,7 @@ metadata: blockOwnerDeletion: true spec: selector: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: ingress ports: diff --git a/pkg/reconciler/brokercell/testingdata/retry_deployment.yaml b/pkg/reconciler/brokercell/testingdata/retry_deployment.yaml index f36c893df1..e32db104b4 100644 --- a/pkg/reconciler/brokercell/testingdata/retry_deployment.yaml +++ b/pkg/reconciler/brokercell/testingdata/retry_deployment.yaml @@ -17,7 +17,7 @@ metadata: name: test-brokercell-brokercell-retry namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: retry ownerReferences: @@ -29,7 +29,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: retry minReadySeconds: 60 @@ -77,7 +77,7 @@ spec: value: "secret" volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/retry_deployment_with_restart_annotation.yaml b/pkg/reconciler/brokercell/testingdata/retry_deployment_with_restart_annotation.yaml index ec066c2921..ee638f9657 100644 --- a/pkg/reconciler/brokercell/testingdata/retry_deployment_with_restart_annotation.yaml +++ b/pkg/reconciler/brokercell/testingdata/retry_deployment_with_restart_annotation.yaml @@ -18,7 +18,7 @@ metadata: name: test-brokercell-brokercell-retry namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: retry ownerReferences: @@ -30,7 +30,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: retry minReadySeconds: 60 @@ -79,7 +79,7 @@ spec: value: "secret" volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/retry_deployment_with_status.yaml b/pkg/reconciler/brokercell/testingdata/retry_deployment_with_status.yaml index eb82232fac..c7a7d83f5a 100644 --- a/pkg/reconciler/brokercell/testingdata/retry_deployment_with_status.yaml +++ b/pkg/reconciler/brokercell/testingdata/retry_deployment_with_status.yaml @@ -18,7 +18,7 @@ metadata: name: test-brokercell-brokercell-retry namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: retry ownerReferences: @@ -30,7 +30,7 @@ metadata: spec: selector: matchLabels: &labels - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: retry minReadySeconds: 60 @@ -78,7 +78,7 @@ spec: value: "secret" volumeMounts: - name: broker-config - mountPath: /var/run/cloud-run-events/broker + mountPath: /var/run/events-system/broker - name: google-broker-key mountPath: /var/secrets/google resources: diff --git a/pkg/reconciler/brokercell/testingdata/retry_hpa.yaml b/pkg/reconciler/brokercell/testingdata/retry_hpa.yaml index c065e356b7..520692c622 100644 --- a/pkg/reconciler/brokercell/testingdata/retry_hpa.yaml +++ b/pkg/reconciler/brokercell/testingdata/retry_hpa.yaml @@ -16,7 +16,7 @@ metadata: name: test-brokercell-brokercell-retry-hpa namespace: testnamespace labels: - app: cloud-run-events + app: events-system brokerCell: test-brokercell role: retry ownerReferences: diff --git a/pkg/reconciler/deployment/controller.go b/pkg/reconciler/deployment/controller.go index 75517ad3ae..ae30facf96 100644 --- a/pkg/reconciler/deployment/controller.go +++ b/pkg/reconciler/deployment/controller.go @@ -38,9 +38,9 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-deployment-controller" + controllerAgentName = "events-system-deployment-controller" - namespace = "cloud-run-events" + namespace = "events-system" secretName = duck.DefaultSecretName deploymentName = "controller" envKey = "GOOGLE_APPLICATION_CREDENTIALS" @@ -57,7 +57,7 @@ func NewConstructor() Constructor { // NewController initializes the controller and is called by the generated code // Registers event handlers to enqueue events. -// When the secret `google-cloud-key` of namespace `cloud-run-events` gets updated, we will enqueue the deployment `controller` of namespace `cloud-run-events`. +// When the secret `google-cloud-key` of namespace `events-system` gets updated, we will enqueue the deployment `controller` of namespace `events-system`. func NewController( ctx context.Context, cmw configmap.Watcher, diff --git a/pkg/reconciler/deployment/deployment_test.go b/pkg/reconciler/deployment/deployment_test.go index 72bece8f62..f441478a9e 100644 --- a/pkg/reconciler/deployment/deployment_test.go +++ b/pkg/reconciler/deployment/deployment_test.go @@ -37,7 +37,7 @@ import ( const ( testDeploymentName = "test-controller" - testNS = "test-cloud-run-events" + testNS = "test-events-system" ) func init() { diff --git a/pkg/reconciler/events/auditlogs/controller.go b/pkg/reconciler/events/auditlogs/controller.go index f528ac1f99..160c3dbea1 100644 --- a/pkg/reconciler/events/auditlogs/controller.go +++ b/pkg/reconciler/events/auditlogs/controller.go @@ -49,7 +49,7 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-cloudauditlogssource-controller" + controllerAgentName = "events-system-cloudauditlogssource-controller" // receiveAdapterName is the string used as name for the receive adapter pod. receiveAdapterName = "cloudauditlogssource.events.cloud.google.com" diff --git a/pkg/reconciler/events/build/controller.go b/pkg/reconciler/events/build/controller.go index b951bf5d69..c751c22c57 100644 --- a/pkg/reconciler/events/build/controller.go +++ b/pkg/reconciler/events/build/controller.go @@ -41,7 +41,7 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-build-source-controller" + controllerAgentName = "events-system-build-source-controller" // receiveAdapterName is the string used as name for the receive adapter pod. receiveAdapterName = "cloudbuildsource.events.cloud.google.com" diff --git a/pkg/reconciler/events/pubsub/controller.go b/pkg/reconciler/events/pubsub/controller.go index 8d42c71b85..1f6f9b0a4a 100644 --- a/pkg/reconciler/events/pubsub/controller.go +++ b/pkg/reconciler/events/pubsub/controller.go @@ -44,7 +44,7 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-pubsub-source-controller" + controllerAgentName = "events-system-pubsub-source-controller" // receiveAdapterName is the string used as name for the receive adapter pod. receiveAdapterName = "cloudpubsubsource.events.cloud.google.com" diff --git a/pkg/reconciler/events/scheduler/controller.go b/pkg/reconciler/events/scheduler/controller.go index 5ac3b4423c..5bd0450b8d 100644 --- a/pkg/reconciler/events/scheduler/controller.go +++ b/pkg/reconciler/events/scheduler/controller.go @@ -46,7 +46,7 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-scheduler-source-controller" + controllerAgentName = "events-system-scheduler-source-controller" // receiveAdapterName is the string used as name for the receive adapter pod. receiveAdapterName = "cloudschedulersource.events.cloud.google.com" diff --git a/pkg/reconciler/events/storage/controller.go b/pkg/reconciler/events/storage/controller.go index b14f7deaaf..e6139beb60 100644 --- a/pkg/reconciler/events/storage/controller.go +++ b/pkg/reconciler/events/storage/controller.go @@ -46,7 +46,7 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-storage-source-controller" + controllerAgentName = "events-system-storage-source-controller" // receiveAdapterName is the string used as name for the receive adapter pod. receiveAdapterName = "cloudstoragesource.events.cloud.google.com" diff --git a/pkg/reconciler/identity/testdata/config-gcp-auth-empty.yaml b/pkg/reconciler/identity/testdata/config-gcp-auth-empty.yaml index 0f00c6b836..b685d0f827 100644 --- a/pkg/reconciler/identity/testdata/config-gcp-auth-empty.yaml +++ b/pkg/reconciler/identity/testdata/config-gcp-auth-empty.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-gcp-auth - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel diff --git a/pkg/reconciler/identity/testdata/config-gcp-auth.yaml b/pkg/reconciler/identity/testdata/config-gcp-auth.yaml index f4a64bd5bc..8ff8677a87 100644 --- a/pkg/reconciler/identity/testdata/config-gcp-auth.yaml +++ b/pkg/reconciler/identity/testdata/config-gcp-auth.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-gcp-auth - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel diff --git a/pkg/reconciler/intevents/pullsubscription/keda/controller.go b/pkg/reconciler/intevents/pullsubscription/keda/controller.go index 176b531f7e..39509906ad 100644 --- a/pkg/reconciler/intevents/pullsubscription/keda/controller.go +++ b/pkg/reconciler/intevents/pullsubscription/keda/controller.go @@ -58,7 +58,7 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-pubsub-keda-pullsubscription-controller" + controllerAgentName = "events-system-pubsub-keda-pullsubscription-controller" resourceGroup = "pullsubscriptions.internal.events.cloud.google.com" ) diff --git a/pkg/reconciler/intevents/pullsubscription/static/controller.go b/pkg/reconciler/intevents/pullsubscription/static/controller.go index 42761f29e0..92f9b21d03 100644 --- a/pkg/reconciler/intevents/pullsubscription/static/controller.go +++ b/pkg/reconciler/intevents/pullsubscription/static/controller.go @@ -53,7 +53,7 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-pubsub-pullsubscription-controller" + controllerAgentName = "events-system-pubsub-pullsubscription-controller" resourceGroup = "pullsubscriptions.internal.events.cloud.google.com" ) diff --git a/pkg/reconciler/intevents/topic/controller.go b/pkg/reconciler/intevents/topic/controller.go index 1b8e894ca4..4d9348da49 100644 --- a/pkg/reconciler/intevents/topic/controller.go +++ b/pkg/reconciler/intevents/topic/controller.go @@ -51,7 +51,7 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-pubsub-topic-controller" + controllerAgentName = "events-system-pubsub-topic-controller" ) type envConfig struct { diff --git a/pkg/reconciler/messaging/channel/controller.go b/pkg/reconciler/messaging/channel/controller.go index 968c6f3d72..a6a608d8e3 100644 --- a/pkg/reconciler/messaging/channel/controller.go +++ b/pkg/reconciler/messaging/channel/controller.go @@ -43,7 +43,7 @@ const ( // controllerAgentName is the string used by this controller to identify // itself when creating events. - controllerAgentName = "cloud-run-events-channel-controller" + controllerAgentName = "events-system-channel-controller" ) type Constructor injection.ControllerConstructor diff --git a/pkg/utils/authcheck/authtype.go b/pkg/utils/authcheck/authtype.go index f30b8244c2..e10503fed2 100644 --- a/pkg/utils/authcheck/authtype.go +++ b/pkg/utils/authcheck/authtype.go @@ -48,7 +48,7 @@ type AuthTypeArgs struct { const ( AuthenticationCheckUnknownReason = "AuthenticationCheckPending" - ControlPlaneNamespace = "cloud-run-events" + ControlPlaneNamespace = "events-system" BrokerServiceAccountName = "broker" ) diff --git a/pkg/utils/authcheck/authtype_test.go b/pkg/utils/authcheck/authtype_test.go index 99f146a368..906edf9c8f 100644 --- a/pkg/utils/authcheck/authtype_test.go +++ b/pkg/utils/authcheck/authtype_test.go @@ -30,7 +30,7 @@ import ( const ( testNS = "test" - testBrokerNS = "cloud-run-events" + testBrokerNS = "events-system" serviceAccountName = "test-ksa" secretName = "test-secret" brokerServiceAccountName = "broker" diff --git a/test/actor/ns-gen/main.go b/test/actor/ns-gen/main.go index 7e79e0bf9c..6c2cf68235 100644 --- a/test/actor/ns-gen/main.go +++ b/test/actor/ns-gen/main.go @@ -130,7 +130,7 @@ spec: image: ko://github.com/google/knative-gcp/test/actor/seeder env: - name: TARGET - value: http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/{{.namespace}}/testbroker + value: http://default-brokercell-ingress.events-system.svc.cluster.local/{{.namespace}}/testbroker - name: INTERVAL value: {{.interval}} - name: SIZE diff --git a/test/e2e-common.sh b/test/e2e-common.sh index 3f66560b7d..43c4b177a6 100755 --- a/test/e2e-common.sh +++ b/test/e2e-common.sh @@ -219,7 +219,7 @@ function enable_monitoring(){ # test flakiness. # # 2. The broker data plane will be GCed if there is no broker. Usually this would -# happen before we dump all the pod logs in the cloud-run-events namespace. The +# happen before we dump all the pod logs in the events-system namespace. The # warm-up broker makes sure there is always one broker left and thus data plane pods # won't be deleted before we dump logs. function warmup_broker_setup(){ @@ -227,7 +227,7 @@ function warmup_broker_setup(){ } function dump_extra_cluster_state() { - # Collecting logs from all namespace `cloud-run-events` pods. + # Collecting logs from all namespace `events-system` pods. echo "============================================================" local namespace=${CONTROL_PLANE_NAMESPACE} local controller_logs="controller-logs" diff --git a/test/e2e/README.md b/test/e2e/README.md index 97f7474f4b..abd28150a4 100755 --- a/test/e2e/README.md +++ b/test/e2e/README.md @@ -151,7 +151,7 @@ First, you'll have to modify `clusterDefaults` in ConfigMap `config-gcp-auth`. You can directly edit the ConfigMap by: ```shell -kubectl edit configmap config-gcp-auth -n cloud-run-events +kubectl edit configmap config-gcp-auth -n events-system ``` and replace the `default-auth-config:` part with: @@ -276,7 +276,7 @@ prow links on the PR page. Such links are in the format of If the prow page doesn't provide any useful information, check out the full logs dump. -- The control plane pods (in `cloud-run-events` namespace) logs dump are at +- The control plane pods (in `events-system` namespace) logs dump are at `https://console.cloud.google.com/storage/browser/knative-prow/pr-logs/pull/google_knative-gcp/[PR ID]/[TEST NAME]/[TEST ID]/artifacts/controller-logs/` . - The data plane pods logs dump are at diff --git a/test/e2e/test_gcp_broker.go b/test/e2e/test_gcp_broker.go index d5ac9b3c3d..05466f9d65 100644 --- a/test/e2e/test_gcp_broker.go +++ b/test/e2e/test_gcp_broker.go @@ -76,7 +76,7 @@ func GCPBrokerTracingTestImpl(t *testing.T, authConfig lib.AuthConfig) { client := lib.Setup(ctx, t, true, authConfig.WorkloadIdentity) defer lib.TearDown(ctx, client) - err := client.Core.Kube.UpdateConfigMap(ctx, "cloud-run-events", "config-tracing", map[string]string{ + err := client.Core.Kube.UpdateConfigMap(ctx, "events-system", "config-tracing", map[string]string{ "backend": "stackdriver", "stackdriver-project-id": projectID, }) diff --git a/test/e2e/test_logging.go b/test/e2e/test_logging.go index 8a536cda9a..a131b35aff 100644 --- a/test/e2e/test_logging.go +++ b/test/e2e/test_logging.go @@ -94,12 +94,12 @@ func CloudLoggingGCPControlPlaneTestImpl(t *testing.T, authConfig lib.AuthConfig err = pollForStringInContainers(ctx, startTimestamp, randomString, containerHierarchy{ gcpProject: project, - namespace: "cloud-run-events", + namespace: "events-system", container: "controller", }, containerHierarchy{ gcpProject: project, - namespace: "cloud-run-events", + namespace: "events-system", container: "webhook", }) if err != nil { diff --git a/test/lib.sh b/test/lib.sh index f5fcaea898..054e325049 100644 --- a/test/lib.sh +++ b/test/lib.sh @@ -64,7 +64,7 @@ function cloud_run_events_setup() { kubectl apply -f $kne_config || return 1 fi ko apply --strict -f ${CLOUD_RUN_EVENTS_ISTIO_CONFIG}|| return 1 - wait_until_pods_running cloud-run-events || return 1 + wait_until_pods_running events-system || return 1 } # Latest release. If user does not supply this as a flag, the latest @@ -97,7 +97,7 @@ function install_cloud_run_events() { else kubectl apply -f $kne_config || return 1 fi - wait_until_pods_running cloud-run-events || return 1 + wait_until_pods_running events-system || return 1 } function install_cloud_run_events_from_head() { diff --git a/test/lib/lifecycle.go b/test/lib/lifecycle.go index b5214a523c..98af75f239 100644 --- a/test/lib/lifecycle.go +++ b/test/lib/lifecycle.go @@ -95,7 +95,7 @@ var setStackDriverConfigOnce = sync.Once{} func (c *Client) SetupStackDriverMetrics(ctx context.Context, t *testing.T) { t.Helper() setStackDriverConfigOnce.Do(func() { - err := pkgTest.UpdateConfigMap(ctx, c.Core.Kube, "cloud-run-events", "config-observability", map[string]string{ + err := pkgTest.UpdateConfigMap(ctx, c.Core.Kube, "events-system", "config-observability", map[string]string{ "metrics.allow-stackdriver-custom-metrics": "false", "metrics.backend-destination": "stackdriver", "metrics.stackdriver-custom-metrics-subdomain": "cloud.google.com", diff --git a/test/lib/secrets.go b/test/lib/secrets.go index eb39e80789..92836e1511 100644 --- a/test/lib/secrets.go +++ b/test/lib/secrets.go @@ -67,7 +67,7 @@ func GetCredential(ctx context.Context, client *eventingtestlib.Client, workload func SetTracingToZipkin(ctx context.Context, client *eventingtestlib.Client) { client.T.Helper() setTracingConfigOnce.Do(func() { - err := pkgtest.UpdateConfigMap(ctx, client.Kube, "cloud-run-events", "config-tracing", map[string]string{ + err := pkgtest.UpdateConfigMap(ctx, client.Kube, "events-system", "config-tracing", map[string]string{ "backend": "zipkin", "zipkin-endpoint": "http://zipkin.knative-eventing.svc.cluster.local:9411/api/v2/spans", }) diff --git a/test/performance/benchmarks/broker-gcp/100-broker-gcp-setup.yaml b/test/performance/benchmarks/broker-gcp/100-broker-gcp-setup.yaml index 2c3bdf0c63..58b2154fe8 100644 --- a/test/performance/benchmarks/broker-gcp/100-broker-gcp-setup.yaml +++ b/test/performance/benchmarks/broker-gcp/100-broker-gcp-setup.yaml @@ -29,7 +29,7 @@ metadata: annotations: internal.events.cloud.google.com/creator: googlecloud name: default - namespace: cloud-run-events + namespace: events-system spec: components: fanout: diff --git a/test/performance/benchmarks/broker-gcp/200-broker-gcp.yaml b/test/performance/benchmarks/broker-gcp/200-broker-gcp.yaml index 0789f1c2f9..aa3cf35f5c 100644 --- a/test/performance/benchmarks/broker-gcp/200-broker-gcp.yaml +++ b/test/performance/benchmarks/broker-gcp/200-broker-gcp.yaml @@ -37,7 +37,7 @@ spec: image: ko://knative.dev/eventing/test/test_images/performance args: - "--roles=sender,receiver" - - "--sink=http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/default/gcp" + - "--sink=http://default-brokercell-ingress.events-system.svc.cluster.local/default/gcp" - "--aggregator=broker-gcp-aggregator:10000" - "--pace=100:10,200:20,400:30,500:60,600:60" env: diff --git a/test/performance/benchmarks/broker-gcp/continuous/100-broker-gcp-setup.yaml b/test/performance/benchmarks/broker-gcp/continuous/100-broker-gcp-setup.yaml index 68ce4da666..c1f1f1be75 100644 --- a/test/performance/benchmarks/broker-gcp/continuous/100-broker-gcp-setup.yaml +++ b/test/performance/benchmarks/broker-gcp/continuous/100-broker-gcp-setup.yaml @@ -29,7 +29,7 @@ metadata: annotations: internal.events.cloud.google.com/creator: googlecloud name: default - namespace: cloud-run-events + namespace: events-system spec: components: fanout: diff --git a/test/performance/benchmarks/broker-gcp/continuous/200-broker-gcp.yaml b/test/performance/benchmarks/broker-gcp/continuous/200-broker-gcp.yaml index 6f85c515f8..85203f87ba 100644 --- a/test/performance/benchmarks/broker-gcp/continuous/200-broker-gcp.yaml +++ b/test/performance/benchmarks/broker-gcp/continuous/200-broker-gcp.yaml @@ -43,7 +43,7 @@ spec: image: ko://knative.dev/eventing/test/test_images/performance args: - "--roles=sender,receiver" - - "--sink=http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/default/gcp" + - "--sink=http://default-brokercell-ingress.events-system.svc.cluster.local/default/gcp" - "--aggregator=broker-gcp-aggregator:10000" - "--pace=100:10,600:40,800:120,1000:120,1400:120,2200:120,2800:120" env: diff --git a/test/performance/performance-tests.sh b/test/performance/performance-tests.sh index 2233cf9b5c..9d75b2256a 100755 --- a/test/performance/performance-tests.sh +++ b/test/performance/performance-tests.sh @@ -29,7 +29,7 @@ source $(dirname $0)/../lib.sh readonly TEST_CONFIG_VARIANT="continuous" readonly TEST_NAMESPACE="default" readonly PUBSUB_SECRET_NAME="google-cloud-key" -readonly CONTROL_PLANE_NAMESPACE="cloud-run-events" +readonly CONTROL_PLANE_NAMESPACE="events-system" readonly CONTROL_PLANE_SECRET_NAME="google-cloud-key" function update_knative() { diff --git a/test/test_configs/config-gcp-auth-wi.yaml b/test/test_configs/config-gcp-auth-wi.yaml index 6fa7fb6aa1..5cd524b032 100644 --- a/test/test_configs/config-gcp-auth-wi.yaml +++ b/test/test_configs/config-gcp-auth-wi.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-gcp-auth - namespace: cloud-run-events + namespace: events-system labels: events.cloud.google.com/release: devel diff --git a/test/test_images/probe_helper/main.go b/test/test_images/probe_helper/main.go index 6472f87baf..68ce4c06ba 100644 --- a/test/test_images/probe_helper/main.go +++ b/test/test_images/probe_helper/main.go @@ -104,7 +104,7 @@ type envConfig struct { // Environment variable containing the port to receive delivered events ReceiverPort probe.ReceivePort `envconfig:"RECEIVER_PORT" default:"8080"` // Environment variable containing the base URL for the brokercell ingress, used in the broker e2e delivery probe - BrokerCellIngressBaseURL string `envconfig:"BROKER_CELL_INGRESS_BASE_URL" default:"http://default-brokercell-ingress.cloud-run-events.svc.cluster.local"` + BrokerCellIngressBaseURL string `envconfig:"BROKER_CELL_INGRESS_BASE_URL" default:"http://default-brokercell-ingress.events-system.svc.cluster.local"` // Environment variable containing the maximum tolerated staleness duration for Cloud Scheduler job ticks before they are discarded SchedulerStaleDuration time.Duration `envconfig:"SCHEDULER_STALE_DURATION" default:"3m"` } diff --git a/test/test_images/probe_helper/probe/handlers/cloudpubsub.go b/test/test_images/probe_helper/probe/handlers/cloudpubsub.go index 09a7cec233..db4d77572e 100644 --- a/test/test_images/probe_helper/probe/handlers/cloudpubsub.go +++ b/test/test_images/probe_helper/probe/handlers/cloudpubsub.go @@ -92,7 +92,7 @@ func (p *CloudPubSubSourceProbe) Receive(ctx context.Context, event cloudevents. // datacontenttype: application/json // Data, // { - // "subscription": "cre-src_cloud-run-events-probe_cloudpubsubsource_02f88763-1df6-4944-883f-010ebac27dd2", + // "subscription": "cre-src_events-system-probe_cloudpubsubsource_02f88763-1df6-4944-883f-010ebac27dd2", // "message": { // "messageId": "1529309436535525", // "data": "eydtc2cnOidQcm9iZSBDbG91ZCBSdW4gRXZlbnRzISd9", diff --git a/test/test_images/probe_helper/probe_helper.yaml b/test/test_images/probe_helper/probe_helper.yaml index 6009bb2db8..c89600462c 100644 --- a/test/test_images/probe_helper/probe_helper.yaml +++ b/test/test_images/probe_helper/probe_helper.yaml @@ -16,7 +16,7 @@ apiVersion: serving.knative.dev/v1 kind: Service metadata: name: probe-helper-receiver - namespace: cloud-run-events-probe + namespace: events-system-probe spec: template: metadata: @@ -30,7 +30,7 @@ spec: image: ko://github.com/google/knative-gcp/test/test_images/probe_helper env: - name: BROKER_CELL_INGRESS_BASE_URL - value: "http://default-brokercell-ingress.cloud-run-events.svc.cluster.local" + value: "http://default-brokercell-ingress.events-system.svc.cluster.local" - name: PROBE_PORT value: "8070" - name: RECEIVER_PORT diff --git a/test/test_images/probe_helper/utils/extensions.go b/test/test_images/probe_helper/utils/extensions.go index 914c37f698..85e0ea9813 100644 --- a/test/test_images/probe_helper/utils/extensions.go +++ b/test/test_images/probe_helper/utils/extensions.go @@ -30,7 +30,7 @@ const ( // the targetpath extension with the same path. For example: // // If a source is configured to sink events to: - // http://probe-helper-receiver.cloud-run-events-probe.svc.cluster.local/some-path-goes-here + // http://probe-helper-receiver.events-system-probe.svc.cluster.local/some-path-goes-here // // then, each event generated by the source and passed to the probe helper // receiver client will include the header 'Ce-Receiverpath: /some-path-goes-here'. diff --git a/test/test_images/sendtracker/sendbroker.yaml b/test/test_images/sendtracker/sendbroker.yaml index 1b01675980..d34aff704c 100644 --- a/test/test_images/sendtracker/sendbroker.yaml +++ b/test/test_images/sendtracker/sendbroker.yaml @@ -19,7 +19,7 @@ spec: image: ko://github.com/google/knative-gcp/test/test_images/sendtracker env: - name: K_SINK - value: "http://default-brokercell-ingress.cloud-run-events.svc.cluster.local/default/default" + value: "http://default-brokercell-ingress.events-system.svc.cluster.local/default/default" - name: DELAY_MS value: "10" - name: POST_STOP_SECS