Merge pull request #23 from timebertt/fix-config

Fix names of with-dns overlay

Author: timebertt

webhosting-operator/config/manager/default/kustomization.yaml

@@ -21,6 +21,7 @@ images:
   newTag: latest
 
 resources:
+- namespace.yaml
 - manager.yaml
 - ../crds
 - ../rbac

webhosting-operator/config/manager/default/manager.yaml

@@ -1,8 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: system
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:

webhosting-operator/config/manager/default/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: system

webhosting-operator/config/manager/with-dns/controller_manager_config.yaml renamed to webhosting-operator/config/manager/with-dns/config.yaml

@@ -5,9 +5,10 @@ generatorOptions:
   disableNameSuffixHash: true
 
 configMapGenerator:
-- files:
-  - controller_manager_config.yaml
-  name: manager-config
+- name: webhosting-operator
+  namespace: webhosting-system
+  files:
+  - config.yaml
 
 patches:
 - path: manager_patch.yaml

webhosting-operator/config/manager/with-dns/kustomization.yaml

@@ -1,20 +1,20 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: operator
-  namespace: system
+  name: webhosting-operator
+  namespace: webhosting-system
 spec:
   template:
     spec:
       containers:
       - name: manager
         args:
-        - --config=/controller_manager_config.yaml
+        - --config=/config.yaml
         volumeMounts:
-        - name: manager-config
-          mountPath: /controller_manager_config.yaml
-          subPath: controller_manager_config.yaml
+        - name: config
+          mountPath: /config.yaml
+          subPath: config.yaml
       volumes:
-      - name: manager-config
+      - name: config
         configMap:
-          name: manager-config
+          name: webhosting-operator