change manager to egress-controller in manifests

Signed-off-by: gotti <[email protected]>

Makefile

@@ -44,8 +44,8 @@ help: ## Display this help.
 ##@ Development
 
 .PHONY: manifests
-manifests: controller-gen yq ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+manifests: controller-gen $(YQ) ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
+	$(CONTROLLER_GEN) rbac:roleName=egress-controller-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	$(YQ) -i 'del(.spec.versions.[].schema.openAPIV3Schema.properties.spec.properties.template | .. |select(key == "description"))' config/crd/bases/pona.cybozu.com_egresses.yaml
 
 .PHONY: generate

config/default/metrics_service.yaml

@@ -2,10 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: egress-controller
     app.kubernetes.io/name: pona
     app.kubernetes.io/managed-by: kustomize
-  name: controller-manager-metrics-service
+  name: egress-controller-metrics-service
   namespace: system
 spec:
   ports:
@@ -14,4 +14,4 @@ spec:
     protocol: TCP
     targetPort: 8443
   selector:
-    control-plane: controller-manager
+    control-plane: egress-controller

config/manager/manager.yaml → config/manager/egress-controller.yaml

@@ -2,31 +2,31 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: egress-controller
     app.kubernetes.io/name: pona
     app.kubernetes.io/managed-by: kustomize
   name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: egress-controller
   namespace: system
   labels:
-    control-plane: controller-manager
+    control-plane: egress-controller
     app.kubernetes.io/name: pona
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: egress-controller
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: egress-controller
     spec:
       # TODO(user): Uncomment the following code to configure the nodeAffinity expression
       # according to the platforms which are supported by your solution.
@@ -90,5 +90,5 @@ spec:
           requests:
             cpu: 10m
             memory: 64Mi
-      serviceAccountName: controller-manager
+      serviceAccountName: egress-controller
       terminationGracePeriodSeconds: 10

config/manager/kustomization.yaml

@@ -1,5 +1,5 @@
 resources:
-- manager.yaml
+- egress-controller.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:

config/prometheus/monitor.yaml

@@ -3,10 +3,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: egress-controller
     app.kubernetes.io/name: pona
     app.kubernetes.io/managed-by: kustomize
-  name: controller-manager-metrics-monitor
+  name: egress-controller-metrics-monitor
   namespace: system
 spec:
   endpoints:
@@ -27,4 +27,4 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: egress-controller

config/rbac/leader_election_role_binding.yaml

@@ -11,5 +11,5 @@ roleRef:
   name: leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: egress-controller
   namespace: system

config/rbac/metrics_auth_role_binding.yaml

@@ -8,5 +8,5 @@ roleRef:
   name: metrics-auth-role
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: egress-controller
   namespace: system

config/rbac/role.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: manager-role
+  name: egress-controller-role
 rules:
 - apiGroups:
   - apps

config/rbac/role_binding.yaml

@@ -4,12 +4,12 @@ metadata:
   labels:
     app.kubernetes.io/name: pona
     app.kubernetes.io/managed-by: kustomize
-  name: manager-rolebinding
+  name: egress-controller-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: manager-role
+  name: egress-controller-role
 subjects:
 - kind: ServiceAccount
-  name: controller-manager
+  name: egress-controller
   namespace: system

config/rbac/service_account.yaml

@@ -4,5 +4,5 @@ metadata:
   labels:
     app.kubernetes.io/name: pona
     app.kubernetes.io/managed-by: kustomize
-  name: controller-manager
+  name: egress-controller
   namespace: system

test/e2e/e2e_test.go

@@ -60,17 +60,17 @@ var _ = Describe("controller", Ordered, func() {
 			_, err = utils.Run(cmd)
 			ExpectWithOffset(1, err).NotTo(HaveOccurred())
 
-			By("deploying the controller-manager")
+			By("deploying the egress-controller")
 			cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))
 			_, err = utils.Run(cmd)
 			ExpectWithOffset(1, err).NotTo(HaveOccurred())
 
-			By("validating that the controller-manager pod is running as expected")
+			By("validating that the egress-controller pod is running as expected")
 			verifyControllerUp := func() error {
 				// Get pod name
 
 				cmd = exec.Command("kubectl", "get",
-					"pods", "-l", "control-plane=controller-manager",
+					"pods", "-l", "control-plane=egress-controller",
 					"-o", "go-template={{ range .items }}"+
 						"{{ if not .metadata.deletionTimestamp }}"+
 						"{{ .metadata.name }}"+
@@ -85,7 +85,7 @@ var _ = Describe("controller", Ordered, func() {
 					return fmt.Errorf("expect 1 controller pods running, but got %d", len(podNames))
 				}
 				controllerPodName = podNames[0]
-				ExpectWithOffset(2, controllerPodName).Should(ContainSubstring("controller-manager"))
+				ExpectWithOffset(2, controllerPodName).Should(ContainSubstring("egress-controller"))
 
 				// Validate pod status
 				cmd = exec.Command("kubectl", "get",