Fix broken makefile, adapt K8s manifests for STFU rework (#33)

* Fix broken makefile, adapt K8s manifests for STFU rework * Restore accidentally hardcoded reference to zookeeper * Revert to mikefarah's yq * Supply `run` default argument in Dockerfile * Allow patching objects

Author: nightkr

template/Makefile.j2

@@ -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/{[ operator.product_string }]-operator/configs
+rm -rf deploy/helm/{[ operator.product_string }]-operator/crds
 rm -rf deploy/helm/{[ operator.product_string }]-operator/templates/crds.yaml
 
 version:
 yq eval -i '.version = ${VERSION} | .appVersion = ${VERSION}' deploy/helm/{[ operator.product_string }]-operator/Chart.yaml
 
-
 config: deploy/helm/{[ operator.product_string }]-operator/configs
 
 deploy/helm/{[ operator.product_string }]-operator/configs:
@@ -34,7 +37,7 @@ crds: deploy/helm/{[ operator.product_string }]-operator/crds/crds.yaml
 
 deploy/helm/{[ operator.product_string }]-operator/crds/crds.yaml:
 mkdir -p deploy/helm/{[ operator.product_string }]-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

template/deploy/helm/[[product]]-operator/templates/deployment.yaml

@@ -58,4 +58,4 @@ spec:
  {{- with .Values.tolerations }}
  tolerations:
  {{- toYaml . | nindent 8 }}
- {{- end }}
+ {{- end }}

template/deploy/helm/[[product]]-operator/templates/roles.yaml.j2

@@ -73,12 +73,26 @@ rules:
  resources:
  - pods
  - configmaps
+ - services
+ - endpoints
  verbs:
  - create
  - delete
  - list
+ - patch
+ - update
  - watch
+ - apiGroups:
+ - apps
+ resources:
+ - statefulsets
+ verbs:
+ - create
+ - delete
+ - list
+ - patch
  - update
+ - watch
  - apiGroups:
  - batch
  resources:
@@ -87,6 +101,8 @@ rules:
  - create
  - get
  - list
+ - patch
+ - update
  - watch
  - apiGroups:
  - apiextensions.k8s.io
@@ -119,6 +135,9 @@ rules:
  - {{ include "operator.name" . }}.stackable.tech
  resources:
  - {{ include "operator.name" . }}clusters
+{[% if operator.product_string in ['zookeeper']%}]
+ - {{ include "operator.name" . }}znode
+{[% endif %}]
  verbs:
  - get
  - list

template/docker/Dockerfile.j2

@@ -23,3 +23,4 @@ RUN groupadd -g 1000 stackable && adduser -u 1000 -g stackable -c 'Stackable Ope
 USER 1000:1000
 
 ENTRYPOINT ["/stackable-{[ operator.product_string }]-operator"]
+CMD ["run"]