Merge pull request #97 from cybozu-go/prepare-deploy-manifests

Modify manifests for deployment.
cybozu-go · Nov 2, 2020 · 03b1206 · 03b1206
2 parents 99b344b + 56818ee
commit 03b1206
Show file tree

Hide file tree

Showing 31 changed files with 46 additions and 4,464 deletions.
diff --git a/Makefile b/Makefile
@@ -109,7 +109,6 @@ manifests: $(CONTROLLER_GEN)
 	  config/crd/bases/moco.cybozu.com_mysqlclusters.yaml
 	sed  -i -r 's/^( +)description: The IP protocol for this port\. Supports "TCP", "UDP", and "SCTP"\. Default is TCP\./\0\n\1default: TCP/' \
 	  config/crd/bases/moco.cybozu.com_mysqlclusters.yaml
-	cp config/crd/bases/moco.cybozu.com_mysqlclusters.yaml deploy/crd.yaml
 
 # Generate code
 .PHONY: generate

diff --git a/cmd/moco-controller/cmd/root.go b/cmd/moco-controller/cmd/root.go
@@ -42,7 +42,7 @@ var rootCmd = &cobra.Command{
 }
 
 const (
-	defaultInitContainerImage = "quay.io/cybozu/moco-conf-gen:1.0.0"
+	defaultInitContainerImage = "quay.io/cybozu/moco-conf-gen:0.3.0"
 	defaultCurlContainerImage = "quay.io/cybozu/ubuntu:18.04"
 )
 

diff --git a/config/certmanager/certificate.yaml b/config/certmanager/certificate.yaml
diff --git a/config/certmanager/kustomization.yaml b/config/certmanager/kustomization.yaml
diff --git a/config/certmanager/kustomizeconfig.yaml b/config/certmanager/kustomizeconfig.yaml
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -17,5 +17,5 @@ patchesStrategicMerge:
 # +kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.
-configurations:
-- kustomizeconfig.yaml
+# configurations:
+# - kustomizeconfig.yaml
diff --git a/config/crd/kustomizeconfig.yaml b/config/crd/kustomizeconfig.yaml
diff --git a/config/crd/patches/cainjection_in_mysqlclusters.yaml b/config/crd/patches/cainjection_in_mysqlclusters.yaml
diff --git a/config/crd/patches/webhook_in_mysqlclusters.yaml b/config/crd/patches/webhook_in_mysqlclusters.yaml
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
diff --git a/config/default/manager_webhook_patch.yaml b/config/default/manager_webhook_patch.yaml
diff --git a/config/default/webhookcainjection_patch.yaml b/config/default/webhookcainjection_patch.yaml
diff --git a/config/kustomization.yaml b/config/kustomization.yaml
@@ -0,0 +1,7 @@
+namespace: moco-system
+bases:
+- ./crd
+- ./rbac
+- ./manager
+resources:
+- namespace.yaml
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -1,37 +1,37 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    control-plane: controller-manager
-  name: system
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: moco-controller-manager
   namespace: system
   labels:
-    control-plane: controller-manager
+    control-plane: moco-controller-manager
+  annotations:
+    prometheus.io/port: "8080"
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: moco-controller-manager
   replicas: 1
   template:
     metadata:
       labels:
-        control-plane: controller-manager
+        control-plane: moco-controller-manager
     spec:
       containers:
-      - command:
-        - /manager
+      - name: manager
+        command:
+        - /moco-controller
         image: controller:latest
-        name: manager
         resources:
           limits:
             cpu: 4000m
             memory: 2Gi
           requests:
             cpu: 1000m
             memory: 512Mi
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
       terminationGracePeriodSeconds: 10
diff --git a/config/namespace.yaml b/config/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    control-plane: moco-controller-manager
+  name: moco-system
diff --git a/config/prometheus/kustomization.yaml b/config/prometheus/kustomization.yaml
diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
diff --git a/config/rbac/auth_proxy_client_clusterrole.yaml b/config/rbac/auth_proxy_client_clusterrole.yaml
diff --git a/config/rbac/auth_proxy_role.yaml b/config/rbac/auth_proxy_role.yaml
diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ var rootCmd = &cobra.Command{ @@
     }
     const (
-    	defaultInitContainerImage = "quay.io/cybozu/moco-conf-gen:1.0.0"
+    	defaultInitContainerImage = "quay.io/cybozu/moco-conf-gen:0.3.0"
     	defaultCurlContainerImage = "quay.io/cybozu/ubuntu:18.04"
     )
@@ Expand Down @@