Move aggregated deploy manifests to deploy folder

Makefile

@@ -456,9 +456,12 @@ verify-helm-charts:
 
 update-deploy: tmp_dir:=$(shell mktemp -d)
 update-deploy:
-	$(call generate-operator-manifests,helm/deploy/operator.yaml,deploy/operator,$(tmp_dir))
-	$(call generate-manager-manifests-prod,helm/deploy/manager_prod.yaml,deploy/manager/prod,$(tmp_dir))
-	$(call generate-manager-manifests-dev,deploy/manager/dev)
+	$(call generate-operator-manifests,helm/deploy/operator.yaml,./deploy/operator,$(tmp_dir))
+	$(call concat-manifests,$(sort $(wildcard deploy/operator/*.yaml)),./deploy/operator.yaml)
+	$(call generate-manager-manifests-prod,helm/deploy/manager_prod.yaml,./deploy/manager/prod,$(tmp_dir))
+	$(call concat-manifests,$(sort $(wildcard ./deploy/manager/prod/*.yaml)),./deploy/manager-prod.yaml)
+	$(call generate-manager-manifests-dev,./deploy/manager/dev)
+	$(call concat-manifests,$(sort $(wildcard ./deploy/manager/dev/*.yaml)),./deploy/manager-dev.yaml)
 .PHONY: update-deploy
 
 verify-deploy: tmp_dir :=$(shell mktemp -d)
@@ -469,42 +472,22 @@ verify-deploy:
 	cp -r deploy/operator/. $(tmp_dir)/operator/.
 	$(call generate-operator-manifests,helm/deploy/operator.yaml,$(tmp_dir)/operator,$(tmp_dir_generate))
 	$(diff) -r '$(tmp_dir)'/operator deploy/operator
+	$(call concat-manifests,$(sort $(wildcard ./deploy/operator/*.yaml)),'$(tmp_dir)'/operator.yaml)
+	$(diff) '$(tmp_dir)'/operator.yaml deploy/operator.yaml
 
 	cp -r deploy/manager/prod/. $(tmp_dir)/manager/prod/.
 	$(call generate-manager-manifests-prod,helm/deploy/manager_prod.yaml,$(tmp_dir)/manager/prod,$(tmp_dir_generate))
 	$(diff) -r '$(tmp_dir)'/manager/prod deploy/manager/prod
+	$(call concat-manifests,$(sort $(wildcard ./deploy/manager/prod/*.yaml)),'$(tmp_dir)'/manager-prod.yaml)
+	$(diff) '$(tmp_dir)'/manager-prod.yaml deploy/manager-prod.yaml
 
 	$(call generate-manager-manifests-dev,$(tmp_dir)/manager/dev)
 	$(diff) -r '$(tmp_dir)'/manager/dev deploy/manager/dev
+	$(call concat-manifests,$(sort $(wildcard ./deploy/manager/dev/*.yaml)),'$(tmp_dir)'/manager-dev.yaml)
+	$(diff) '$(tmp_dir)'/manager-dev.yaml deploy/manager-dev.yaml
 
 .PHONY: verify-deploy
 
-update-examples-operator:
-	$(call concat-manifests,$(sort $(wildcard deploy/operator/*.yaml)),examples/common/operator.yaml)
-.PHONY: update-examples-operator
-
-verify-example-operator: tmp_file := $(shell mktemp)
-verify-example-operator:
-	$(call concat-manifests,$(sort $(wildcard deploy/operator/*.yaml)),$(tmp_file))
-	$(diff) '$(tmp_file)' examples/common/operator.yaml || (echo 'Operator example is not up-to date. Please run `make update-examples-operator` to update it.' && false)
-.PHONY: verify-example-operator
-
-update-examples-manager:
-	$(call concat-manifests,$(sort $(wildcard deploy/manager/prod/*.yaml)),examples/common/manager.yaml)
-.PHONY: update-examples-manager
-
-verify-example-manager: tmp_file :=$(shell mktemp)
-verify-example-manager:
-	$(call concat-manifests,$(sort $(wildcard deploy/manager/prod/*.yaml)),$(tmp_file))
-	$(diff) '$(tmp_file)' examples/common/manager.yaml || (echo 'Manager example is not up-to date. Please run `make update-examples-manager` to update it.' && false)
-.PHONY: verify-example-manager
-
-update-examples: update-examples-manager update-examples-operator
-.PHONY: update-examples
-
-verify-examples: verify-example-manager verify-example-operator
-.PHONY: verify-examples
-
 verify-links:
 	@set -euEo pipefail; broken_links=( $$( find . -type l ! -exec test -e {} \; -print ) ); \
 	if [[ -n "$${broken_links[@]}" ]]; then \
@@ -514,10 +497,10 @@ verify-links:
 	fi;
 .PHONY: verify-links
 
-verify: verify-gofmt verify-codegen verify-crds verify-helm-schemas verify-helm-charts verify-deploy verify-examples verify-govet verify-helm-lint verify-links
+verify: verify-gofmt verify-codegen verify-crds verify-helm-schemas verify-helm-charts verify-deploy verify-govet verify-helm-lint verify-links
 .PHONY: verify
 
-update: update-gofmt update-codegen update-crds update-helm-schemas update-helm-charts update-deploy update-examples
+update: update-gofmt update-codegen update-crds update-helm-schemas update-helm-charts update-deploy
 .PHONY: update
 
 test-unit:

deploy/manager-dev.yaml

@@ -0,0 +1,306 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: scylladb:controller:manager-controller
+aggregationRule:
+  clusterRoleSelectors:
+    - matchLabels:
+        rbac.operator.scylladb.com/aggregate-to-scylla-manager-controller: "true"
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: scylladb:controller:aggregate-to-manager-controller
+  labels:
+    rbac.operator.scylladb.com/aggregate-to-scylla-manager-controller: "true"
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - apps
+  resources:
+  - statefulsets
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - scylla.scylladb.com
+  resources:
+  - scyllaclusters
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - scylla.scylladb.com
+  resources:
+  - scyllaclusters/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: scylla-manager
+
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: scylla-manager-controller
+  namespace: scylla-manager
+spec:
+  minAvailable: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: scylla-manager-controller
+      app.kubernetes.io/instance: scylla-manager
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: scylla-manager-controller
+  namespace: scylla-manager
+  labels:
+    app.kubernetes.io/name: scylla-manager-controller
+    app.kubernetes.io/instance: scylla-manager
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: scylla-manager-config
+  namespace: scylla-manager
+data:
+  scylla-manager.yaml: |-
+    http: :5080
+    logger:
+      level: info
+    database:
+      hosts:
+      - scylla-manager-cluster-manager-dc-manager-rack-0
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/name: scylla-manager
+    app.kubernetes.io/instance: scylla-manager
+  name: scylla-manager
+  namespace: scylla-manager
+spec:
+  ports:
+  - name: api
+    port: 80
+    protocol: TCP
+    targetPort: 5080
+  - name: metrics
+    port: 5090
+    protocol: TCP
+    targetPort: 5090
+  selector:
+    app.kubernetes.io/name: scylla-manager
+    app.kubernetes.io/instance: scylla-manager
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: scylla-manager
+  namespace: scylla-manager
+  labels:
+    app.kubernetes.io/name: scylla-manager
+    app.kubernetes.io/instance: scylla-manager
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: scylladb:controller:manager-controller
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: scylladb:controller:manager-controller
+subjects:
+- kind: ServiceAccount
+  name: scylla-manager-controller
+  namespace: scylla-manager
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: scylla-manager-controller
+  namespace: scylla-manager
+  labels:
+    app.kubernetes.io/name: scylla-manager-controller
+    app.kubernetes.io/instance: scylla-manager
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: scylla-manager-controller
+      app.kubernetes.io/instance: scylla-manager
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: scylla-manager-controller
+        app.kubernetes.io/instance: scylla-manager
+    spec:
+      serviceAccountName: scylla-manager-controller
+      containers:
+      - name: scylla-manager-controller
+        image: docker.io/scylladb/scylla-operator:latest
+        imagePullPolicy: IfNotPresent
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        args:
+        - manager-controller
+        - --loglevel=2
+        resources:
+          requests:
+            cpu: 10m
+            memory: 20Mi
+      terminationGracePeriodSeconds: 10
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: scylla-manager
+  namespace: scylla-manager
+  labels:
+    app.kubernetes.io/name: scylla-manager
+    app.kubernetes.io/instance: scylla-manager
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: scylla-manager
+      app.kubernetes.io/instance: scylla-manager
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: scylla-manager
+        app.kubernetes.io/instance: scylla-manager
+    spec:
+      serviceAccountName: scylla-manager
+      containers:
+      - name: scylla-manager
+        image: docker.io/scylladb/scylla-manager:3.1.2
+        imagePullPolicy: IfNotPresent
+        command:
+        - /usr/bin/scylla-manager
+        args:
+        - --config-file=/mnt/etc/scylla-manager/scylla-manager.yaml
+        resources:
+          requests:
+            cpu: 10m
+            memory: 20Mi
+        volumeMounts:
+        - mountPath: /mnt/etc/scylla-manager
+          name: scylla-manager-config
+        readinessProbe:
+          httpGet:
+            path: /api/v1/clusters
+            port: 5080
+          periodSeconds: 10
+          timeoutSeconds: 3
+      volumes:
+      - configMap:
+          name: scylla-manager-config
+        name: scylla-manager-config
+
+---
+apiVersion: scylla.scylladb.com/v1
+kind: ScyllaCluster
+metadata:
+  name: scylla-manager-cluster
+  namespace: scylla-manager
+spec:
+  version: 5.2.7
+  agentVersion: 3.1.2
+  repository: docker.io/scylladb/scylla
+  agentRepository: docker.io/scylladb/scylla-manager-agent
+  developerMode: true
+  cpuset: false
+  datacenter:
+    name: manager-dc
+    racks:
+      - name: manager-rack
+        members: 1
+        storage:
+          capacity: 5Gi
+        resources:
+          limits:
+            cpu: 200m
+            memory: 200Mi
+          requests:
+            cpu: 10m
+            memory: 100Mi
+
+---