Adapt manifests

Author: timebertt

Makefile

@@ -141,7 +141,7 @@ SHARD_NAME ?= shard-$(shell tr -dc bcdfghjklmnpqrstvwxz2456789 </dev/urandom | h
 
 .PHONY: run-shard
 run-shard: $(KUBECTL) ## Run a shard from your host and deploy prerequisites.
-	$(KUBECTL) apply --server-side --force-conflicts -k hack/config/shard/clusterring
+	$(KUBECTL) apply --server-side --force-conflicts -k hack/config/shard/controllerring
 	go run ./cmd/shard --shard=$(SHARD_NAME) --lease-namespace=default --zap-log-level=debug
 
 PUSH ?= false

config/rbac/role.yaml

@@ -40,15 +40,15 @@ rules:
 - apiGroups:
   - sharding.timebertt.dev
   resources:
-  - clusterrings
+  - controllerrings
   verbs:
   - get
   - list
   - watch
 - apiGroups:
   - sharding.timebertt.dev
   resources:
-  - clusterrings/status
+  - controllerrings/status
   verbs:
   - patch
   - update

hack/config/shard/clusterring/clusterring.yaml renamed to hack/config/shard/controllerring/controllerring.yaml

@@ -1,5 +1,5 @@
 apiVersion: sharding.timebertt.dev/v1alpha1
-kind: ClusterRing
+kind: ControllerRing
 metadata:
   name: example
 spec:

hack/config/shard/clusterring/kustomization.yaml renamed to hack/config/shard/controllerring/kustomization.yaml

@@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- clusterring.yaml
+- controllerring.yaml
 - sharder_rbac.yaml

hack/config/shard/clusterring/sharder_rbac.yaml renamed to hack/config/shard/controllerring/sharder_rbac.yaml

@@ -1,11 +1,11 @@
-# These manifests grant the sharder controller permissions to act on resources that we listed in the ClusterRing.
+# These manifests grant the sharder controller permissions to act on resources that we listed in the ControllerRing.
 # We need to grant these permissions explicitly depending on what we configured. Otherwise, the sharder would require
 # cluster-admin access.
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: sharding:clusterring:example
+  name: sharding:controllerring:example
 rules:
 - apiGroups:
   - ""
@@ -19,11 +19,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: sharding:clusterring:example
+  name: sharding:controllerring:example
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: sharding:clusterring:example
+  name: sharding:controllerring:example
 subjects:
 - kind: ServiceAccount
   name: sharder

hack/config/shard/shard/kustomization.yaml

@@ -13,7 +13,7 @@ images:
   newTag: latest
 
 resources:
-- ../clusterring
+- ../controllerring
 - deployment.yaml
 - rbac.yaml
 - serviceaccount.yaml

hack/config/skaffold.yaml

@@ -208,7 +208,7 @@ build:
 manifests:
   kustomize:
     paths:
-      - hack/config/shard/clusterring
+      - hack/config/shard/controllerring
       - hack/config/shard/shard
 deploy:
   kubectl:
@@ -333,7 +333,7 @@ build:
 manifests:
   kustomize:
     paths:
-    # default configuration: only run operator shards and use external sharding implementation via ClusterRing
+    # default configuration: only run operator shards and use external sharding implementation via ControllerRing
     - webhosting-operator/config/manager/overlays/default
     - webhosting-operator/config/monitoring/default
 deploy:
@@ -372,7 +372,7 @@ profiles:
   patches:
   - op: replace
     path: /manifests/kustomize/paths/0
-    # default configuration: only run operator shards and use external sharding implementation via ClusterRing
+    # default configuration: only run operator shards and use external sharding implementation via ControllerRing
     value: webhosting-operator/config/manager/overlays/shoot/default
   - op: add
     path: /manifests/kustomize/paths/-
@@ -441,7 +441,7 @@ profiles:
             - bash
             - -c
             - |
-              if kubectl get clusterring example &>/dev/null || kubectl -n default get deploy shard &>/dev/null ; then
+              if kubectl get controllerring example &>/dev/null || kubectl -n default get deploy shard &>/dev/null ; then
                 echo "Example shard is still running, refusing to run a load test experiment."
                 echo "Ensure a clean load test environment, i.e., run 'make down SKAFFOLD_MODULE=shard'."
                 exit 1

webhosting-operator/config/manager/clusterring/clusterring.yaml renamed to webhosting-operator/config/manager/controllerring/controllerring.yaml

@@ -1,5 +1,5 @@
 apiVersion: sharding.timebertt.dev/v1alpha1
-kind: ClusterRing
+kind: ControllerRing
 metadata:
   name: webhosting-operator
 spec:

webhosting-operator/config/manager/clusterring/kustomization.yaml renamed to webhosting-operator/config/manager/controllerring/kustomization.yaml

@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
 resources:
-- clusterring.yaml
+- controllerring.yaml
 - sharder_rbac.yaml
 
 patches: