Refactor kustomize configs

hack/update-manifests.sh

@@ -6,7 +6,7 @@ IMAGE_TAG=${IMAGE_TAG:='latest'}
 autogen_warning="# This is an auto-generated file. DO NOT EDIT"
 
 echo $autogen_warning > manifests/install.yaml
-kustomize build manifests/cluster-install >> manifests/install.yaml
+kustomize build manifests/overlays/cluster-install >> manifests/install.yaml
 
 echo $autogen_warning > manifests/namespace-install.yaml
-kustomize build manifests/namespace-install >> manifests/namespace-install.yaml
+kustomize build manifests/overlays/namespace-install >> manifests/namespace-install.yaml

manifests/base/kustomization.yaml

@@ -0,0 +1,9 @@
+namespace: argo
+
+resources:
+- 01a_workflow-crd.yaml
+- 02a_workflow-controller-sa.yaml
+- 02e_workflow-controller-deployment.yaml
+- 03a_argo-ui-sa.yaml
+- 03d_argo-ui-deployment.yaml
+- 03e_argo-ui-service.yaml

manifests/namespace-install.yaml

@@ -17,16 +17,19 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: argo-ui
+  namespace: argo
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: argo
+  namespace: argo
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: argo-role
+  namespace: argo
 rules:
 - apiGroups:
   - ""
@@ -73,6 +76,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: argo-ui-role
+  namespace: argo
 rules:
 - apiGroups:
   - ""
@@ -103,25 +107,29 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: argo-binding
+  namespace: argo
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: argo-role
 subjects:
 - kind: ServiceAccount
   name: argo
+  namespace: argo
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: argo-ui-binding
+  namespace: argo
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: argo-ui-role
 subjects:
 - kind: ServiceAccount
   name: argo-ui
+  namespace: argo
 ---
 apiVersion: v1
 data:
@@ -130,11 +138,13 @@ data:
 kind: ConfigMap
 metadata:
   name: workflow-controller-configmap
+  namespace: argo
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: argo-ui
+  namespace: argo
 spec:
   ports:
   - port: 80
@@ -146,6 +156,7 @@ apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: argo-ui
+  namespace: argo
 spec:
   selector:
     matchLabels:
@@ -157,6 +168,8 @@ spec:
     spec:
       containers:
       - env:
+        - name: FORCE_NAMESPACE_ISOLATION
+          value: "true"
         - name: ARGO_NAMESPACE
           valueFrom:
             fieldRef:
@@ -168,14 +181,15 @@ spec:
           value: "false"
         - name: BASE_HREF
           value: /
-        image: argoproj/argoui:v2.2.1
+        image: argoproj/argoui:v2.2.1-37808b1
         name: argo-ui
       serviceAccountName: argo-ui
 ---
 apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: workflow-controller
+  namespace: argo
 spec:
   selector:
     matchLabels:

manifests/overlays/cluster-install/kustomization.yaml

@@ -0,0 +1,11 @@
+namespace: argo
+bases:
+- ../../base
+resources:
+- ./03b_argo-ui-clusterrole.yaml
+- ./03c_argo-ui-clusterrolebinding.yaml
+- ./02b_workflow-controller-clusterrole.yaml
+- ./02c_workflow-controller-clusterrolebinding.yaml
+- ./02d_workflow-controller-configmap.yaml
+
+- ../../base/01b_workflow-aggregate-roles.yaml

manifests/namespace-install/overlays/03d_argo-ui-deployment.yaml → manifests/overlays/namespace-install/03d_argo-ui-deployment.yaml

@@ -7,6 +7,7 @@ spec:
     spec:
       containers:
         - name: argo-ui
+          image: argoproj/argoui:v2.2.1-37808b1
           env:
           - name: FORCE_NAMESPACE_ISOLATION
             value: "true"

manifests/overlays/namespace-install/kustomization.yaml

@@ -0,0 +1,11 @@
+namespace: argo
+bases:
+- ../../base
+resources:
+- ./03b_argo-ui-role.yaml
+- ./03c_argo-ui-rolebinding.yaml
+- ./02b_workflow-controller-role.yaml
+- ./02c_workflow-controller-rolebinding.yaml
+- ./02d_workflow-controller-configmap.yaml
+patches:
+- ./03d_argo-ui-deployment.yaml