Adapt Makefile to exclude CSI and add v1beta1 changes to CSV (Dynatrace#633)

* Adapt Makefile to exclude CSI and add v1beta1 changes to CSV

* Change according to Review

Author: luhi-DT

Makefile

@@ -169,9 +169,13 @@ manifests: controller-gen kustomize
 	$(KUSTOMIZE) build config/crd | cat - config/deploy/openshift/openshift.yaml > temp
 	mv temp config/deploy/openshift/openshift.yaml
 
+ifeq ($(OUT), olm)
+	cat config/deploy/kubernetes/kubernetes.yaml > config/deploy/kubernetes/kubernetes-$(OUT).yaml
+	cat config/deploy/openshift/openshift.yaml > config/deploy/openshift/openshift-$(OUT).yaml
+else
 	cat config/deploy/kubernetes/kubernetes.yaml config/deploy/kubernetes/kubernetes-csi.yaml > config/deploy/kubernetes/kubernetes-$(OUT).yaml
 	cat config/deploy/openshift/openshift.yaml config/deploy/openshift/openshift-csi.yaml > config/deploy/openshift/openshift-$(OUT).yaml
-
+endif
 	make reset-kustomization-files
 
 reset-kustomization-files: kustomize
@@ -245,14 +249,14 @@ endif
 SERVICE_ACCOUNTS=--extra-service-accounts dynatrace-dynakube-oneagent
 SERVICE_ACCOUNTS+=--extra-service-accounts dynatrace-dynakube-oneagent-unprivileged
 SERVICE_ACCOUNTS+=--extra-service-accounts dynatrace-kubernetes-monitoring
-SERVICE_ACCOUNTS+=--extra-service-accounts dynatrace-activegate
 
 # Generate bundle manifests and metadata, then validate generated files.
-.PHONY: bundle
-bundle: export OLM=true
-bundle: export OUT=olm
-bundle: manifests kustomize
-	operator-sdk generate kustomize manifests -q
+.PHONY: bundle bundle-olm
+# to avoid necessity of calling make bundle with OUT=olm
+bundle:
+	make bundle-olm OLM=true OUT=olm
+bundle-olm: manifests kustomize
+	operator-sdk generate kustomize manifests -q --apis-dir ./src/api/
 	cd config/deploy/$(PLATFORM) && $(KUSTOMIZE) edit set image "quay.io/dynatrace/dynatrace-operator:snapshot"=$(OLM_IMAGE)
 	$(KUSTOMIZE) build config/olm/$(PLATFORM) | operator-sdk generate bundle --overwrite --version $(VERSION) $(SERVICE_ACCOUNTS) $(BUNDLE_METADATA_OPTS)
 	make OUT=all reset-kustomization-files
@@ -295,7 +299,7 @@ bundle-build:
 	docker build -f ./config/olm/$(PLATFORM)/bundle-$(VERSION).Dockerfile -t $(BUNDLE_IMG) ./config/olm/$(PLATFORM)/
 
 setup-pre-commit:
-	$(info WARNING Make sure that golangci-lint is installed, for more info see https://golangci-lint.run/usage/install/")
+	$(info WARNING "Make sure that golangci-lint is installed, for more info see https://golangci-lint.run/usage/install/")
 	GO111MODULE=off go get github.com/daixiang0/gci
 	GO111MODULE=off go get golang.org/x/tools/cmd/goimports
 	cp ./.github/pre-commit ./.git/hooks/pre-commit

PROJECT

@@ -2,14 +2,16 @@ domain: com
 layout:
 - go.kubebuilder.io/v3
 plugins:
-  go.sdk.operatorframework.io/v3: {}
+  manifests.sdk.operatorframework.io/v2: {}
+  scorecard.sdk.operatorframework.io/v2: {}
 projectName: dynatrace-operator
 repo: github.com/Dynatrace/dynatrace-operator
 resources:
 - api:
     crdVersion: v1
     namespaced: true
   group: dynatrace
+  domain: com
   kind: DynaKube
   path: github.com/Dynatrace/dynatrace-operator/src/api/v1alpha1
   version: v1alpha1
@@ -20,9 +22,11 @@ resources:
     crdVersion: v1
     namespaced: true
   group: dynatrace
+  domain: com
   kind: DynaKube
   path: github.com/Dynatrace/dynatrace-operator/src/api/v1beta1
   version: v1beta1
+  controller: true
   webhooks:
     conversion: true
     webhookVersion: v1

config/helm/chart/default/templates/Common/operator/clusterrole-operator.yaml

@@ -89,4 +89,15 @@ rules:
     verbs:
       - get
       - update
+  {{- if eq (default false .Values.olm) true}}
+  - apiGroups:
+      - security.openshift.io
+    resourceNames:
+      - host
+      - privileged
+    resources:
+      - securitycontextconstraints
+    verbs:
+      - use
+  {{ end }}
 {{ end }}

config/helm/chart/default/templates/Common/webhook/clusterrole-webhook.yaml

@@ -83,4 +83,15 @@ rules:
       - deploymentconfigs
     verbs:
       - get
+  {{- if eq (default false .Values.olm) true}}
+  - apiGroups:
+      - security.openshift.io
+    resourceNames:
+      - host
+      - privileged
+    resources:
+      - securitycontextconstraints
+    verbs:
+      - use
+  {{ end }}
 {{ end }}