From 312f4cbef1f1c744158fe3a9e22b3b755f5aa89c Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Mon, 11 Mar 2024 17:44:34 +0000 Subject: [PATCH] Fix up permissions in chart --- charts/operator/templates/clusterrole-edit.yaml | 2 +- charts/operator/templates/clusterrole-operator.yaml | 2 +- charts/operator/templates/clusterrole-view.yaml | 2 +- tools/functional_test.sh | 7 ++----- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/charts/operator/templates/clusterrole-edit.yaml b/charts/operator/templates/clusterrole-edit.yaml index bb823e9..9326869 100644 --- 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 index a9cc65b..bde3580 100644 --- 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 index fd40b99..d8bcf78 100644 --- 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 index c0dea14..0d3dcae 100755 --- 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 \ No newline at end of file +kubectl get schedule caas-cluster -o yaml