Skip to content

Commit 344b40c

Browse files
committed
chore: migrate to policy/v1
1 parent 760d584 commit 344b40c

File tree

19 files changed

+692
-690
lines changed

19 files changed

+692
-690
lines changed

deploy/manager/dev/10_controller_pdb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: policy/v1beta1
1+
apiVersion: policy/v1
22
kind: PodDisruptionBudget
33
metadata:
44
name: scylla-manager-controller

deploy/manager/prod/10_controller_pdb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: policy/v1beta1
1+
apiVersion: policy/v1
22
kind: PodDisruptionBudget
33
metadata:
44
name: scylla-manager-controller

deploy/operator/10_operator.pdb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: policy/v1beta1
1+
apiVersion: policy/v1
22
kind: PodDisruptionBudget
33
metadata:
44
name: scylla-operator

deploy/operator/10_webhookserver.pdb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: policy/v1beta1
1+
apiVersion: policy/v1
22
kind: PodDisruptionBudget
33
metadata:
44
name: webhook-server

examples/common/manager.yaml

Lines changed: 142 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
aggregationRule:
66
clusterRoleSelectors:
77
- matchLabels:
8-
rbac.operator.scylladb.com/aggregate-to-scylla-manager-controller: "true"
8+
rbac.operator.scylladb.com/aggregate-to-scylla-manager-controller: 'true'
99
rules: []
1010

1111
---
@@ -14,80 +14,80 @@ kind: ClusterRole
1414
metadata:
1515
name: scylladb:controller:aggregate-to-manager-controller
1616
labels:
17-
rbac.operator.scylladb.com/aggregate-to-scylla-manager-controller: "true"
17+
rbac.operator.scylladb.com/aggregate-to-scylla-manager-controller: 'true'
1818
rules:
19-
- apiGroups:
20-
- ""
21-
resources:
22-
- events
23-
verbs:
24-
- create
25-
- patch
26-
- update
27-
- apiGroups:
28-
- ""
29-
resources:
30-
- secrets
31-
verbs:
32-
- get
33-
- list
34-
- watch
35-
- apiGroups:
36-
- ""
37-
resources:
38-
- services
39-
verbs:
40-
- get
41-
- list
42-
- apiGroups:
43-
- apps
44-
resources:
45-
- statefulsets
46-
verbs:
47-
- get
48-
- list
49-
- apiGroups:
50-
- scylla.scylladb.com
51-
resources:
52-
- scyllaclusters
53-
verbs:
54-
- get
55-
- list
56-
- watch
57-
- apiGroups:
58-
- scylla.scylladb.com
59-
resources:
60-
- scyllaclusters/status
61-
verbs:
62-
- get
63-
- list
64-
- patch
65-
- update
66-
- watch
67-
- apiGroups:
68-
- ""
69-
resources:
70-
- configmaps
71-
verbs:
72-
- create
73-
- delete
74-
- get
75-
- list
76-
- patch
77-
- update
78-
- watch
79-
- apiGroups:
80-
- coordination.k8s.io
81-
resources:
82-
- leases
83-
verbs:
84-
- create
85-
- delete
86-
- get
87-
- list
88-
- patch
89-
- update
90-
- watch
19+
- apiGroups:
20+
- ''
21+
resources:
22+
- events
23+
verbs:
24+
- create
25+
- patch
26+
- update
27+
- apiGroups:
28+
- ''
29+
resources:
30+
- secrets
31+
verbs:
32+
- get
33+
- list
34+
- watch
35+
- apiGroups:
36+
- ''
37+
resources:
38+
- services
39+
verbs:
40+
- get
41+
- list
42+
- apiGroups:
43+
- apps
44+
resources:
45+
- statefulsets
46+
verbs:
47+
- get
48+
- list
49+
- apiGroups:
50+
- scylla.scylladb.com
51+
resources:
52+
- scyllaclusters
53+
verbs:
54+
- get
55+
- list
56+
- watch
57+
- apiGroups:
58+
- scylla.scylladb.com
59+
resources:
60+
- scyllaclusters/status
61+
verbs:
62+
- get
63+
- list
64+
- patch
65+
- update
66+
- watch
67+
- apiGroups:
68+
- ''
69+
resources:
70+
- configmaps
71+
verbs:
72+
- create
73+
- delete
74+
- get
75+
- list
76+
- patch
77+
- update
78+
- watch
79+
- apiGroups:
80+
- coordination.k8s.io
81+
resources:
82+
- leases
83+
verbs:
84+
- create
85+
- delete
86+
- get
87+
- list
88+
- patch
89+
- update
90+
- watch
9191

9292
---
9393
apiVersion: v1
@@ -96,7 +96,7 @@ metadata:
9696
name: scylla-manager
9797

9898
---
99-
apiVersion: policy/v1beta1
99+
apiVersion: policy/v1
100100
kind: PodDisruptionBudget
101101
metadata:
102102
name: scylla-manager-controller
@@ -144,14 +144,14 @@ metadata:
144144
namespace: scylla-manager
145145
spec:
146146
ports:
147-
- name: api
148-
port: 80
149-
protocol: TCP
150-
targetPort: 5080
151-
- name: metrics
152-
port: 5090
153-
protocol: TCP
154-
targetPort: 5090
147+
- name: api
148+
port: 80
149+
protocol: TCP
150+
targetPort: 5080
151+
- name: metrics
152+
port: 5090
153+
protocol: TCP
154+
targetPort: 5090
155155
selector:
156156
app.kubernetes.io/name: scylla-manager
157157
app.kubernetes.io/instance: scylla-manager
@@ -186,9 +186,9 @@ roleRef:
186186
kind: ClusterRole
187187
name: scylladb:controller:manager-controller
188188
subjects:
189-
- kind: ServiceAccount
190-
name: scylla-manager-controller
191-
namespace: scylla-manager
189+
- kind: ServiceAccount
190+
name: scylla-manager-controller
191+
namespace: scylla-manager
192192

193193
---
194194
apiVersion: rbac.authorization.k8s.io/v1
@@ -201,9 +201,9 @@ roleRef:
201201
kind: ClusterRole
202202
name: scyllacluster-member
203203
subjects:
204-
- kind: ServiceAccount
205-
name: scylla-manager-cluster-member
206-
namespace: scylla-manager
204+
- kind: ServiceAccount
205+
name: scylla-manager-cluster-member
206+
namespace: scylla-manager
207207

208208
---
209209
apiVersion: apps/v1
@@ -230,25 +230,25 @@ spec:
230230
spec:
231231
serviceAccountName: scylla-manager-controller
232232
containers:
233-
- name: scylla-manager-controller
234-
image: docker.io/scylladb/scylla-operator:latest
235-
imagePullPolicy: IfNotPresent
236-
env:
237-
- name: POD_NAME
238-
valueFrom:
239-
fieldRef:
240-
fieldPath: metadata.name
241-
- name: POD_NAMESPACE
242-
valueFrom:
243-
fieldRef:
244-
fieldPath: metadata.namespace
245-
args:
246-
- manager-controller
247-
- --loglevel=2
248-
resources:
249-
requests:
250-
cpu: 10m
251-
memory: 20Mi
233+
- name: scylla-manager-controller
234+
image: docker.io/scylladb/scylla-operator:latest
235+
imagePullPolicy: IfNotPresent
236+
env:
237+
- name: POD_NAME
238+
valueFrom:
239+
fieldRef:
240+
fieldPath: metadata.name
241+
- name: POD_NAMESPACE
242+
valueFrom:
243+
fieldRef:
244+
fieldPath: metadata.namespace
245+
args:
246+
- manager-controller
247+
- --loglevel=2
248+
resources:
249+
requests:
250+
cpu: 10m
251+
memory: 20Mi
252252
terminationGracePeriodSeconds: 10
253253

254254
---
@@ -276,30 +276,30 @@ spec:
276276
spec:
277277
serviceAccountName: scylla-manager
278278
containers:
279-
- name: scylla-manager
280-
image: docker.io/scylladb/scylla-manager:2.3.0
281-
imagePullPolicy: IfNotPresent
282-
command:
283-
- /usr/bin/scylla-manager
284-
args:
285-
- --config-file=/mnt/etc/scylla-manager/scylla-manager.yaml
286-
resources:
287-
requests:
288-
cpu: 10m
289-
memory: 20Mi
290-
volumeMounts:
291-
- mountPath: /mnt/etc/scylla-manager
292-
name: scylla-manager-config
293-
readinessProbe:
294-
httpGet:
295-
path: /api/v1/clusters
296-
port: 5080
297-
periodSeconds: 10
298-
timeoutSeconds: 3
279+
- name: scylla-manager
280+
image: docker.io/scylladb/scylla-manager:2.3.0
281+
imagePullPolicy: IfNotPresent
282+
command:
283+
- /usr/bin/scylla-manager
284+
args:
285+
- --config-file=/mnt/etc/scylla-manager/scylla-manager.yaml
286+
resources:
287+
requests:
288+
cpu: 10m
289+
memory: 20Mi
290+
volumeMounts:
291+
- mountPath: /mnt/etc/scylla-manager
292+
name: scylla-manager-config
293+
readinessProbe:
294+
httpGet:
295+
path: /api/v1/clusters
296+
port: 5080
297+
periodSeconds: 10
298+
timeoutSeconds: 3
299299
volumes:
300-
- configMap:
300+
- configMap:
301+
name: scylla-manager-config
301302
name: scylla-manager-config
302-
name: scylla-manager-config
303303

304304
---
305305
apiVersion: scylla.scylladb.com/v1
@@ -317,16 +317,17 @@ spec:
317317
datacenter:
318318
name: manager-dc
319319
racks:
320-
- name: manager-rack
321-
members: 1
322-
storage:
323-
capacity: 5Gi
324-
resources:
325-
limits:
326-
cpu: 1
327-
memory: 200Mi
328-
requests:
329-
cpu: 1
330-
memory: 200Mi
320+
- name: manager-rack
321+
members: 1
322+
storage:
323+
capacity: 5Gi
324+
resources:
325+
limits:
326+
cpu: 1
327+
memory: 200Mi
328+
requests:
329+
cpu: 1
330+
memory: 200Mi
331331

332332
---
333+

0 commit comments

Comments
 (0)