change yurt app manager yaml (#191)

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

config/yurt-app-manager/default/kustomization.yaml

@@ -6,7 +6,7 @@ namespace: kube-system
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: yurtapp-
+namePrefix: yurt-app-
 
 # Labels to add to all resources and selectors.
 #commonLabels:
@@ -26,7 +26,7 @@ bases:
 
 patchesStrategicMerge:
   # Protect the /metrics endpoint by putting it behind auth.
-  # If you want your controller-manager to expose the /metrics
+  # If you want your yurt-app-manager to expose the /metrics
   # endpoint w/o any authn/z, please comment the following line.
 # - manager_auth_proxy_patch.yaml
 

config/yurt-app-manager/default/manager_auth_proxy_patch.yaml

@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
 spec:
   template:

config/yurt-app-manager/default/manager_webhook_patch.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
 spec:
   template:
@@ -20,4 +20,4 @@ spec:
       - name: cert
         secret:
           defaultMode: 420
-          secretName: yurtapp-webhook-certs
+          secretName: yurt-app-webhook-certs

config/yurt-app-manager/manager/manager.yaml

@@ -2,25 +2,25 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: yurt-app-manager
   name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
   labels:
-    control-plane: controller-manager
+    control-plane: yurt-app-manager
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: yurt-app-manager
   replicas: 1
   template:
     metadata:
       labels:
-        control-plane: controller-manager
+        control-plane: yurt-app-manager
     spec:
       tolerations:
       nodeSelector:

config/yurt-app-manager/manager/patches.yaml

@@ -2,6 +2,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
 

config/yurt-app-manager/prometheus/monitor.yaml

@@ -4,13 +4,13 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
-  name: controller-manager-metrics-monitor
+    control-plane: yurt-app-manager
+  name: manager-metrics-monitor
   namespace: system
 spec:
   endpoints:
     - path: /metrics
       port: https
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: yurt-app-manager

config/yurt-app-manager/rbac/auth_proxy_service.yaml

@@ -2,13 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
-  name: controller-manager-metrics-service
+    control-plane: yurt-app-manager
+  name: manager-metrics-service
   namespace: system
 spec:
   ports:
   - name: https
     port: 8443
     targetPort: https
   selector:
-    control-plane: controller-manager
+    control-plane: yurt-app-manager

config/yurt-app-manager/release/yurt-app-manager-v0.3.0.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: yurt-app-manager
   name: system
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
@@ -350,7 +350,7 @@ status:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: yurtapp-leader-election-role
+  name: yurt-app-leader-election-role
   namespace: kube-system
 rules:
 - apiGroups:
@@ -384,7 +384,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: yurtapp-manager-role
+  name: yurt-app-manager-role
 rules:
 - apiGroups:
   - admissionregistration.k8s.io
@@ -564,12 +564,12 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: yurtapp-leader-election-rolebinding
+  name: yurt-app-leader-election-rolebinding
   namespace: kube-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: yurtapp-leader-election-role
+  name: yurt-app-leader-election-role
 subjects:
 - kind: ServiceAccount
   name: default
@@ -578,11 +578,11 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: yurtapp-manager-rolebinding
+  name: yurt-app-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: yurtapp-manager-role
+  name: yurt-app-manager-role
 subjects:
 - kind: ServiceAccount
   name: default
@@ -591,37 +591,37 @@ subjects:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: yurtapp-webhook-certs
+  name: yurt-app-webhook-certs
   namespace: kube-system
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: yurtapp-webhook-service
+  name: yurt-app-webhook-service
   namespace: kube-system
 spec:
   ports:
   - port: 443
     targetPort: 9876
   selector:
-    control-plane: controller-manager
+    control-plane: yurt-app-manager
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    control-plane: controller-manager
-  name: yurtapp-controller-manager
+    control-plane: yurt-app-manager
+  name: yurt-app-manager
   namespace: kube-system
 spec:
   replicas: 1
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: yurt-app-manager
   template:
     metadata:
       labels:
-        control-plane: controller-manager
+        control-plane: yurt-app-manager
     spec:
       containers:
       - args:
@@ -645,18 +645,18 @@ spec:
       - name: cert
         secret:
           defaultMode: 420
-          secretName: yurtapp-webhook-certs
+          secretName: yurt-app-webhook-certs
 ---
 apiVersion: admissionregistration.k8s.io/v1beta1
 kind: MutatingWebhookConfiguration
 metadata:
   creationTimestamp: null
-  name: yurtapp-mutating-webhook-configuration
+  name: yurt-app-mutating-webhook-configuration
 webhooks:
 - clientConfig:
     caBundle: Cg==
     service:
-      name: yurtapp-webhook-service
+      name: yurt-app-webhook-service
       namespace: kube-system
       path: /mutate-apps-openyurt-io-v1alpha1-nodepool
   failurePolicy: Fail
@@ -674,7 +674,7 @@ webhooks:
 - clientConfig:
     caBundle: Cg==
     service:
-      name: yurtapp-webhook-service
+      name: yurt-app-webhook-service
       namespace: kube-system
       path: /mutate-apps-openyurt-io-v1alpha1-uniteddeployment
   failurePolicy: Fail
@@ -694,12 +694,12 @@ apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration
 metadata:
   creationTimestamp: null
-  name: yurtapp-validating-webhook-configuration
+  name: yurt-app-validating-webhook-configuration
 webhooks:
 - clientConfig:
     caBundle: Cg==
     service:
-      name: yurtapp-webhook-service
+      name: yurt-app-webhook-service
       namespace: kube-system
       path: /validate-apps-openyurt-io-v1alpha1-nodepool
   failurePolicy: Fail
@@ -718,7 +718,7 @@ webhooks:
 - clientConfig:
     caBundle: Cg==
     service:
-      name: yurtapp-webhook-service
+      name: yurt-app-webhook-service
       namespace: kube-system
       path: /validate-apps-openyurt-io-v1alpha1-uniteddeployment
   failurePolicy: Fail

config/yurt-app-manager/webhook/service.yaml

@@ -9,4 +9,4 @@ spec:
     - port: 443
       targetPort: 9876 
   selector:
-    control-plane: controller-manager
+    control-plane: yurt-app-manager

pkg/yurtappmanager/webhook/util/configuration/configuration.go

@@ -31,8 +31,8 @@ import (
 )
 
 const (
-	mutatingWebhookConfigurationName   = "yurtapp-mutating-webhook-configuration"
-	validatingWebhookConfigurationName = "yurtapp-validating-webhook-configuration"
+	mutatingWebhookConfigurationName   = "yurt-app-mutating-webhook-configuration"
+	validatingWebhookConfigurationName = "yurt-app-validating-webhook-configuration"
 )
 
 func Ensure(c client.Client, handlers map[string]webhookutil.Handler, caBundle []byte) error {

pkg/yurtappmanager/webhook/util/controller/webhook_controller.go

@@ -46,8 +46,8 @@ import (
 )
 
 var (
-	mutatingWebhookConfigurationName   = "yurtapp-mutating-webhook-configuration"
-	validatingWebhookConfigurationName = "yurtapp-validating-webhook-configuration"
+	mutatingWebhookConfigurationName   = "yurt-app-mutating-webhook-configuration"
+	validatingWebhookConfigurationName = "yurt-app-validating-webhook-configuration"
 
 	namespace  = webhookutil.GetNamespace()
 	secretName = webhookutil.GetSecretName()

pkg/yurtappmanager/webhook/util/util.go

@@ -39,14 +39,14 @@ func GetSecretName() string {
 	if name := os.Getenv("SECRET_NAME"); len(name) > 0 {
 		return name
 	}
-	return "yurtapp-webhook-certs"
+	return "yurt-app-webhook-certs"
 }
 
 func GetServiceName() string {
 	if name := os.Getenv("SERVICE_NAME"); len(name) > 0 {
 		return name
 	}
-	return "yurtapp-webhook-service"
+	return "yurt-app-webhook-service"
 }
 
 func GetPort() int {
@@ -65,5 +65,5 @@ func GetCertDir() string {
 	if p := os.Getenv("WEBHOOK_CERT_DIR"); len(p) > 0 {
 		return p
 	}
-	return "/tmp/yurtapp-webhook-certs"
+	return "/tmp/yurt-app-webhook-certs"
 }