Merge pull request #146 from qinqon/kustomize-base-per-overlay

kustomize: Create different base per overlay

config/base/kustomization.yaml

@@ -1,10 +1,3 @@
 bases: 
  - ../rbac
  - ../manager
- - ../secret
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patchesStrategicMerge:
-- manager_tenant_kubeconfig_secret_patch.yaml

config/default/kustomization.yaml

@@ -0,0 +1,25 @@
+bases: 
+ - ../base
+
+patchesJson6902:
+- patch: |-
+    - op: add
+      path: /metadata/namespace
+      value: kube-system
+    - op: add
+      path: /subjects/0/namespace
+      value: default
+  target:
+    group: rbac.authorization.k8s.io
+    version: v1
+    kind: RoleBinding
+    name: kccm-extension-apiserver-authorization-reader
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+configMapGenerator:
+- name: cloud-config
+  namespace: default
+  files:
+  - cloud-config

config/isolated/kustomization.yaml

@@ -0,0 +1,33 @@
+bases: 
+ - ../base
+
+patches:
+- patch: |-
+    - op: add
+      path: /spec/template/spec/containers/0/args/-
+      value: --authentication-skip-lookup=true
+  target:
+    kind: Deployment
+
+patchesStrategicMerge:
+- |-
+  apiVersion: rbac.authorization.k8s.io/v1
+  kind: ClusterRole
+  metadata:
+    name: kccm
+  $patch: delete
+- |-
+  apiVersion: rbac.authorization.k8s.io/v1
+  kind: ClusterRoleBinding
+  metadata:
+    name: kccm
+  $patch: delete
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+configMapGenerator:
+- name: cloud-config
+  namespace: default
+  files:
+  - cloud-config

config/manager/manager.yaml

@@ -42,6 +42,12 @@ spec:
       - configMap:
           name: cloud-config
         name: cloud-config
+      - secret:
+          secretName: kubeconfig
+          items:
+            - key: kubeconfig
+              path: value
+        name: kubeconfig
       nodeSelector:
         node-role.kubernetes.io/master: ""
       tolerations:

config/overlays/default/kustomization.yaml

@@ -1,26 +1,3 @@
-namespace: default
-bases: 
- - ../../base
-
-patchesJson6902:
-- patch: |-
-    - op: add
-      path: /metadata/namespace
-      value: kube-system
-    - op: add
-      path: /subjects/0/namespace
-      value: default
-  target:
-    group: rbac.authorization.k8s.io
-    version: v1
-    kind: RoleBinding
-    name: kccm-extension-apiserver-authorization-reader
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-configMapGenerator:
-- name: cloud-config
-  namespace: default
-  files:
-  - cloud-config
+bases:
+  - ../../secret 
+  - ../../default

config/overlays/isolated/kustomization.yaml

@@ -1,34 +1,3 @@
-namespace: default
-bases: 
- - ../../base
-
-patches:
-- patch: |-
-    - op: add
-      path: /spec/template/spec/containers/0/args/-
-      value: --authentication-skip-lookup=true
-  target:
-    kind: Deployment
-
-patchesStrategicMerge:
-- |-
-  apiVersion: rbac.authorization.k8s.io/v1
-  kind: ClusterRole
-  metadata:
-    name: kccm
-  $patch: delete
-- |-
-  apiVersion: rbac.authorization.k8s.io/v1
-  kind: ClusterRoleBinding
-  metadata:
-    name: kccm
-  $patch: delete
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-configMapGenerator:
-- name: cloud-config
-  namespace: default
-  files:
-  - cloud-config
+bases:
+  - ../../secret 
+  - ../../isolated

config/overlays/kubevirtci/kustomization.yaml

@@ -1,6 +1,7 @@
 namespace: kvcluster
 bases: 
-- ../isolated
+- ../../secret
+- ../../isolated
 
 patchesStrategicMerge:
 - manager_image_patch.yaml