Skip to content

Commit

Permalink
Merge pull request google#1977 from AlexandraRoatis/release-0.19-ns
Browse files Browse the repository at this point in the history
Rename cloud-run-events to events-system in release 0.19

Force merge as this is failing upgrade tests, as expected, which is the reason why this branch was created in the first place (to fix upgrade tests after this PR in master branch).
  • Loading branch information
Nicolas Lopez authored Dec 7, 2020
2 parents 2a04977 + 6178e7f commit 0064be9
Show file tree
Hide file tree
Showing 134 changed files with 261 additions and 261 deletions.
2 changes: 1 addition & 1 deletion cmd/broker/fanout/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
2 changes: 1 addition & 1 deletion cmd/broker/ingress/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion cmd/broker/retry/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion config/core/100-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
apiVersion: v1
kind: Namespace
metadata:
name: cloud-run-events
name: events-system
labels:
events.cloud.google.com/release: devel
6 changes: 3 additions & 3 deletions config/core/200-serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion config/core/configmaps/br-default-channel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/core/configmaps/br-delivery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/core/configmaps/data-residency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/core/configmaps/gcp-auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/core/configmaps/leader-election.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/core/configmaps/logging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/core/configmaps/observability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/core/configmaps/tracing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions config/core/deployments/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions config/core/deployments/webhook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/brokercell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
clientConfig:
service:
name: webhook
namespace: cloud-run-events
namespace: events-system
versions:
- &version
name: v1alpha1
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/channel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
clientConfig:
service:
name: webhook
namespace: cloud-run-events
namespace: events-system
versions:
- &version
name: v1beta1
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/cloudauditlogssource.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
clientConfig:
service:
name: webhook
namespace: cloud-run-events
namespace: events-system
versions:
- &version
name: v1
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/cloudbuildsource.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
clientConfig:
service:
name: webhook
namespace: cloud-run-events
namespace: events-system
versions:
- &version
name: v1
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/cloudpubsubsource.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
clientConfig:
service:
name: webhook
namespace: cloud-run-events
namespace: events-system
versions:
- &version
name: v1
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/cloudschedulersource.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
clientConfig:
service:
name: webhook
namespace: cloud-run-events
namespace: events-system
versions:
- &version
name: v1
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/cloudstoragesource.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
clientConfig:
service:
name: webhook
namespace: cloud-run-events
namespace: events-system
versions:
- &version
name: v1
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/pullsubscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
clientConfig:
service:
name: webhook
namespace: cloud-run-events
namespace: events-system
versions:
- &version
name: v1
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/topic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
clientConfig:
service:
name: webhook
namespace: cloud-run-events
namespace: events-system
versions:
- &version
name: v1
Expand Down
2 changes: 1 addition & 1 deletion config/core/roles/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
22 changes: 11 additions & 11 deletions config/core/roles/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -50,31 +50,31 @@ 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

---

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
8 changes: 4 additions & 4 deletions config/core/roles/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
Loading

0 comments on commit 0064be9

Please sign in to comment.