Fix InstaScale ConfigMap configuration

project-codeflare · Aug 11, 2023 · c3a4d52 · c3a4d52
1 parent 5b47d6a
commit c3a4d52
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
diff --git a/config/manager/instascale-configmap.yaml → config/default/instascale-configmap.yaml b/config/manager/instascale-configmap.yaml → config/default/instascale-configmap.yaml
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -28,6 +28,8 @@ bases:
 resources:
 # Add metrics service
 - metrics_service.yaml
+# TODO: refactor configuration
+- instascale-configmap.yaml
 
 # Mount the controller config file for loading manager configurations
 # through a ComponentConfig type

diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml
@@ -10,6 +10,7 @@ spec:
       - name: manager
         args:
         - "--config=controller_manager_config.yaml"
+        - "--configs-namespace=openshift-operators"
         volumeMounts:
         - name: manager-config
           mountPath: /controller_manager_config.yaml

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -1,6 +1,5 @@
 resources:
 - manager.yaml
-- instascale-configmap.yaml
 
 generatorOptions:
   disableNameSuffixHash: true

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -38,7 +38,6 @@ spec:
         - "--health-probe-bind-address=:8081"
         - "--metrics-bind-address=0.0.0.0:8082"
         - "--leader-elect"
-        - "--configs-namespace=codeflare-system"
         image: controller:latest
         imagePullPolicy: Always
         name: manager