Merge #63

63: Update templated files to rev 2c23b61 r=soenkeliebau a=stackable-bot Automatically created PR based on commit 2c23b61c3469f76c2e733c8e3fe4e7e40bdb801e in stackabletech/operator-templating repo. Original commit message: Fix Zookeeper-operator RBAC rules (#38) * Pluralize znodes in RBAC * Allow getting named objects Co-authored-by: Stacky McStackface <[email protected]> Co-authored-by: Stacky McStackface <[email protected]>
stackabletech · Dec 21, 2021 · b4ec6b7 · b4ec6b7
2 parents 4b1d877 + 776f3b0
commit b4ec6b7
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 4 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -16,7 +16,7 @@ env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: '0'
   CARGO_PROFILE_DEV_DEBUG: '0'
-  RUSTFLAGS: "-D warnings -W rust-2021-compatibility"
+  RUSTFLAGS: "-D warnings"
 
 jobs:
 

diff --git a/Makefile b/Makefile
@@ -3,6 +3,9 @@
 # DON'T MANUALLY EDIT THIS FILE
 # =============
 
+# This script requires https://github.com/mikefarah/yq (not to be confused with https://github.com/kislyuk/yq)
+# It is available from Nixpkgs as `yq-go` (`nix shell nixpkgs#yq-go`)
+
 .PHONY: docker chart-lint compile-chart
 
 TAG    := $(shell git rev-parse --short HEAD)
@@ -19,12 +22,12 @@ compile-chart: version crds config
 
 chart-clean:
 	rm -rf deploy/helm/druid-operator/configs
+	rm -rf deploy/helm/druid-operator/crds
 	rm -rf deploy/helm/druid-operator/templates/crds.yaml
 
 version:
 	yq eval -i '.version = ${VERSION} | .appVersion = ${VERSION}' deploy/helm/druid-operator/Chart.yaml
 
-
 config: deploy/helm/druid-operator/configs
 
 deploy/helm/druid-operator/configs:
@@ -34,7 +37,7 @@ crds: deploy/helm/druid-operator/crds/crds.yaml
 
 deploy/helm/druid-operator/crds/crds.yaml:
 	mkdir -p deploy/helm/druid-operator/crds
-	cat deploy/crd/*.yaml | yq e '.metadata.annotations["helm.sh/resource-policy"]="keep"' - > ${@}
+	cat deploy/crd/*.yaml | yq eval '.metadata.annotations["helm.sh/resource-policy"]="keep"' - > ${@}
 
 chart-lint: compile-chart
 	docker run -it -v $(shell pwd):/build/helm-charts -w /build/helm-charts quay.io/helmpack/chart-testing:v3.4.0  ct lint --config deploy/helm/chart_testing.yaml

diff --git a/deploy/helm/druid-operator/templates/deployment.yaml b/deploy/helm/druid-operator/templates/deployment.yaml
@@ -58,4 +58,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
diff --git a/deploy/helm/druid-operator/templates/roles.yaml b/deploy/helm/druid-operator/templates/roles.yaml
@@ -24,12 +24,27 @@ rules:
     resources:
       - pods
       - configmaps
+      - services
+      - endpoints
     verbs:
       - create
       - delete
+      - get
       - list
+      - patch
+      - update
       - watch
+  - apiGroups:
+      - apps
+    resources:
+      - statefulsets
+    verbs:
+      - create
+      - delete
+      - list
+      - patch
       - update
+      - watch
   - apiGroups:
       - batch
     resources:
@@ -38,6 +53,8 @@ rules:
       - create
       - get
       - list
+      - patch
+      - update
       - watch
   - apiGroups:
       - apiextensions.k8s.io

diff --git a/deploy/manifests/roles.yaml b/deploy/manifests/roles.yaml
@@ -25,12 +25,27 @@ rules:
     resources:
       - pods
       - configmaps
+      - services
+      - endpoints
     verbs:
       - create
       - delete
+      - get
       - list
+      - patch
+      - update
       - watch
+  - apiGroups:
+      - apps
+    resources:
+      - statefulsets
+    verbs:
+      - create
+      - delete
+      - list
+      - patch
       - update
+      - watch
   - apiGroups:
       - batch
     resources:
@@ -39,6 +54,8 @@ rules:
       - create
       - get
       - list
+      - patch
+      - update
       - watch
   - apiGroups:
       - apiextensions.k8s.io

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -21,3 +21,4 @@ RUN groupadd -g 1000 stackable && adduser -u 1000 -g stackable -c 'Stackable Ope
 USER 1000:1000
 
 ENTRYPOINT ["/stackable-druid-operator"]
+CMD ["run"]