Fix up permissions in chart

azimuth-cloud · Mar 11, 2024 · 312f4cb · 312f4cb
1 parent f807e5c
commit 312f4cb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/charts/operator/templates/clusterrole-edit.yaml b/charts/operator/templates/clusterrole-edit.yaml
@@ -10,6 +10,6 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
 rules:
   # Grant access to the azimuth-schedule objects
-  - apiGroups: ["schedule.azimuth.stackhpc.com"]
+  - apiGroups: ["scheduling.azimuth.stackhpc.com"]
     resources: ["*"]
     verbs: ["*"]
diff --git a/charts/operator/templates/clusterrole-operator.yaml b/charts/operator/templates/clusterrole-operator.yaml
@@ -15,7 +15,7 @@ rules:
     resources: ["events"]
     verbs: ["create"]
   # Required by azimuth-schedule
-  - apiGroups: ["schedule.azimuth.stackhpc.com"]
+  - apiGroups: ["scheduling.azimuth.stackhpc.com"]
     resources: ["*"]
     verbs: ["*"]
   - apiGroups: ["caas.azimuth.stackhpc.com"]

diff --git a/charts/operator/templates/clusterrole-view.yaml b/charts/operator/templates/clusterrole-view.yaml
@@ -8,6 +8,6 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
 rules:
   # Grant access to the azimuth-schedule objects
-  - apiGroups: ["schedule.azimuth.stackhpc.com"]
+  - apiGroups: ["scheduling.azimuth.stackhpc.com"]
     resources: ["*"]
     verbs: ["get", "list", "watch"]
diff --git a/tools/functional_test.sh b/tools/functional_test.sh
@@ -13,14 +13,11 @@ helm upgrade azimuth-schedule-operator ./charts/operator \
   --install \
   --wait \
   --timeout 10m \
-  --set-string image.tag=${GITHUB_SHA::7} \
-  --set-string config.ansibleRunnerImage.tag=${GITHUB_SHA::7} \
-  --set-string ara.image.tag=${GITHUB_SHA::7} \
-  --set-string config.consulUrl=fakeconsul
+  --set-string image.tag=${GITHUB_SHA::7}
 
 until [ `kubectl get crds | grep schedule | wc -l` -gt 1 ]; do echo "wait for crds"; sleep 5; done
 kubectl get crds
 
 kubectl apply -f $SCRIPT_DIR/test_schedule.yaml
 # until kubectl wait --for=jsonpath='{.status.phase}'=Available clustertype quick-test; do echo "wait for status to appear"; sleep 5; done
-kubectl get schedule caas-cluster -o yaml
+kubectl get schedule caas-cluster -o yaml