Fix InstaScale ConfigMap configuration

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

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml
@@ -73,6 +73,9 @@ jobs:
           echo Deploying CodeFlare operator
           IMG="${REGISTRY_ADDRESS}"/codeflare-operator
           make image-push -e IMG="${IMG}"
+          # FIXME
+          kubectl create ns openshift-operators
+          kubectl apply -n openshift-operators -f config/default/instascale-configmap.yaml
           make deploy -e IMG="${IMG}"
           kubectl wait --timeout=120s --for=condition=Available=true deployment -n openshift-operators codeflare-operator-manager
 

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/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,7 @@ spec:
         - "--health-probe-bind-address=:8081"
         - "--metrics-bind-address=0.0.0.0:8082"
         - "--leader-elect"
-        - "--configs-namespace=codeflare-system"
+        - "--configs-namespace=openshift-operators"
         image: controller:latest
         imagePullPolicy: Always
         name: manager