chore: migrate to policy/v1

Dcard · Oct 2, 2023 · 344b40c · 344b40c
1 parent 760d584
commit 344b40c
Show file tree

Hide file tree

Showing 19 changed files with 692 additions and 690 deletions.
diff --git a/deploy/manager/dev/10_controller_pdb.yaml b/deploy/manager/dev/10_controller_pdb.yaml
@@ -1,4 +1,4 @@
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: scylla-manager-controller

diff --git a/deploy/manager/prod/10_controller_pdb.yaml b/deploy/manager/prod/10_controller_pdb.yaml
@@ -1,4 +1,4 @@
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: scylla-manager-controller

diff --git a/deploy/operator/10_operator.pdb.yaml b/deploy/operator/10_operator.pdb.yaml
@@ -1,4 +1,4 @@
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: scylla-operator

diff --git a/deploy/operator/10_webhookserver.pdb.yaml b/deploy/operator/10_webhookserver.pdb.yaml
@@ -1,4 +1,4 @@
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: webhook-server

diff --git a/examples/common/manager.yaml b/examples/common/manager.yaml
@@ -5,7 +5,7 @@ metadata:
 aggregationRule:
   clusterRoleSelectors:
     - matchLabels:
-        rbac.operator.scylladb.com/aggregate-to-scylla-manager-controller: "true"
+        rbac.operator.scylladb.com/aggregate-to-scylla-manager-controller: 'true'
 rules: []
 
 ---
@@ -14,80 +14,80 @@ kind: ClusterRole
 metadata:
   name: scylladb:controller:aggregate-to-manager-controller
   labels:
-    rbac.operator.scylladb.com/aggregate-to-scylla-manager-controller: "true"
+    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
+  - 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
@@ -96,7 +96,7 @@ metadata:
   name: scylla-manager
 
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: scylla-manager-controller
@@ -144,14 +144,14 @@ metadata:
   namespace: scylla-manager
 spec:
   ports:
-  - name: api
-    port: 80
-    protocol: TCP
-    targetPort: 5080
-  - name: metrics
-    port: 5090
-    protocol: TCP
-    targetPort: 5090
+    - 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
@@ -186,9 +186,9 @@ roleRef:
   kind: ClusterRole
   name: scylladb:controller:manager-controller
 subjects:
-- kind: ServiceAccount
-  name: scylla-manager-controller
-  namespace: scylla-manager
+  - kind: ServiceAccount
+    name: scylla-manager-controller
+    namespace: scylla-manager
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -201,9 +201,9 @@ roleRef:
   kind: ClusterRole
   name: scyllacluster-member
 subjects:
-- kind: ServiceAccount
-  name: scylla-manager-cluster-member
-  namespace: scylla-manager
+  - kind: ServiceAccount
+    name: scylla-manager-cluster-member
+    namespace: scylla-manager
 
 ---
 apiVersion: apps/v1
@@ -230,25 +230,25 @@ spec:
     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
+        - 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
 
 ---
@@ -276,30 +276,30 @@ spec:
     spec:
       serviceAccountName: scylla-manager
       containers:
-      - name: scylla-manager
-        image: docker.io/scylladb/scylla-manager:2.3.0
-        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
+        - name: scylla-manager
+          image: docker.io/scylladb/scylla-manager:2.3.0
+          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:
+        - configMap:
+            name: scylla-manager-config
           name: scylla-manager-config
-        name: scylla-manager-config
 
 ---
 apiVersion: scylla.scylladb.com/v1
@@ -317,16 +317,17 @@ spec:
   datacenter:
     name: manager-dc
     racks:
-    - name: manager-rack
-      members: 1
-      storage:
-        capacity: 5Gi
-      resources:
-        limits:
-          cpu: 1
-          memory: 200Mi
-        requests:
-          cpu: 1
-          memory: 200Mi
+      - name: manager-rack
+        members: 1
+        storage:
+          capacity: 5Gi
+        resources:
+          limits:
+            cpu: 1
+            memory: 200Mi
+          requests:
+            cpu: 1
+            memory: 200Mi
 
 ---
+