Skip to content

Commit 8736d6c

Browse files
astefanuttiopenshift-merge-robot
authored andcommitted
Fix InstaScale ConfigMap configuration
1 parent 82a3277 commit 8736d6c

File tree

5 files changed

+6
-2
lines changed

5 files changed

+6
-2
lines changed

.github/workflows/e2e_tests.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ jobs:
7373
echo Deploying CodeFlare operator
7474
IMG="${REGISTRY_ADDRESS}"/codeflare-operator
7575
make image-push -e IMG="${IMG}"
76+
# FIXME
77+
kubectl create ns openshift-operators
78+
kubectl apply -n openshift-operators -f config/default/instascale-configmap.yaml
7679
make deploy -e IMG="${IMG}"
7780
kubectl wait --timeout=120s --for=condition=Available=true deployment -n openshift-operators codeflare-operator-manager
7881

config/default/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ bases:
2828
resources:
2929
# Add metrics service
3030
- metrics_service.yaml
31+
# TODO: refactor configuration
32+
- instascale-configmap.yaml
3133

3234
# Mount the controller config file for loading manager configurations
3335
# through a ComponentConfig type

config/manager/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
resources:
22
- manager.yaml
3-
- instascale-configmap.yaml
43

54
generatorOptions:
65
disableNameSuffixHash: true

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
- "--health-probe-bind-address=:8081"
3939
- "--metrics-bind-address=0.0.0.0:8082"
4040
- "--leader-elect"
41-
- "--configs-namespace=codeflare-system"
41+
- "--configs-namespace=openshift-operators"
4242
image: controller:latest
4343
imagePullPolicy: Always
4444
name: manager

0 commit comments

Comments
 (0)