Skip to content

Commit bea8fb3

Browse files
ezekiel-alexrodezekiel-alexrod
committed
operator,storage-operator: bump operator-sdk to v1.42.0
Following the guide https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.42.0/ : No migrations required for this release. Command launched in each operator directory: make metalk8s Command launched in the root directory: ./doit.sh codegen
1 parent a08700b commit bea8fb3

File tree

11 files changed

+199
-172
lines changed

11 files changed

+199
-172
lines changed

‎operator/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ endif
4848

4949
# Set the Operator SDK version to use. By default, what is installed on the system is used.
5050
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
51-
OPERATOR_SDK_VERSION ?= v1.41.0
51+
OPERATOR_SDK_VERSION ?= v1.42.0
5252

5353
# Image URL to use all building/pushing image targets
5454
IMG ?= controller:latest

‎operator/cmd/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ func main() {
162162
}
163163

164164
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
165-
Scheme: scheme,
166-
Metrics: metricsServerOptions,
165+
Scheme: scheme,
166+
Metrics: metricsServerOptions,
167167
WebhookServer: webhook.NewServer(webhook.Options{
168168
TLSOpts: webhookTLSOpts,
169169
}),

‎operator/config/crd/bases/metalk8s.scality.com_clusterconfigs.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: clusterconfigs.metalk8s.scality.com
88
spec:
99
group: metalk8s.scality.com
@@ -220,12 +220,7 @@ spec:
220220
- Unknown
221221
type: string
222222
type:
223-
description: |-
224-
type of condition in CamelCase or in foo.example.com/CamelCase.
225-
---
226-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
227-
useful (see .node.status.conditions), the ability to deconflict is important.
228-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
223+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
229224
maxLength: 316
230225
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
231226
type: string

‎operator/config/crd/bases/metalk8s.scality.com_virtualippools.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: virtualippools.metalk8s.scality.com
88
spec:
99
group: metalk8s.scality.com
@@ -175,12 +175,7 @@ spec:
175175
- Unknown
176176
type: string
177177
type:
178-
description: |-
179-
type of condition in CamelCase or in foo.example.com/CamelCase.
180-
---
181-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
182-
useful (see .node.status.conditions), the ability to deconflict is important.
183-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
178+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
184179
maxLength: 316
185180
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
186181
type: string

‎operator/config/rbac/role.yaml‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ rules:
88
- ""
99
resources:
1010
- configmaps
11+
- namespaces
1112
verbs:
1213
- create
1314
- delete
@@ -23,18 +24,6 @@ rules:
2324
verbs:
2425
- create
2526
- patch
26-
- apiGroups:
27-
- ""
28-
resources:
29-
- namespaces
30-
verbs:
31-
- create
32-
- delete
33-
- get
34-
- list
35-
- patch
36-
- update
37-
- watch
3827
- apiGroups:
3928
- ""
4029
resources:
@@ -59,31 +48,6 @@ rules:
5948
- metalk8s.scality.com
6049
resources:
6150
- clusterconfigs
62-
verbs:
63-
- create
64-
- delete
65-
- get
66-
- list
67-
- patch
68-
- update
69-
- watch
70-
- apiGroups:
71-
- metalk8s.scality.com
72-
resources:
73-
- clusterconfigs/finalizers
74-
verbs:
75-
- update
76-
- apiGroups:
77-
- metalk8s.scality.com
78-
resources:
79-
- clusterconfigs/status
80-
verbs:
81-
- get
82-
- patch
83-
- update
84-
- apiGroups:
85-
- metalk8s.scality.com
86-
resources:
8751
- virtualippools
8852
verbs:
8953
- create
@@ -96,12 +60,14 @@ rules:
9660
- apiGroups:
9761
- metalk8s.scality.com
9862
resources:
63+
- clusterconfigs/finalizers
9964
- virtualippools/finalizers
10065
verbs:
10166
- update
10267
- apiGroups:
10368
- metalk8s.scality.com
10469
resources:
70+
- clusterconfigs/status
10571
- virtualippools/status
10672
verbs:
10773
- get

‎operator/deploy/manifests.yaml‎

Lines changed: 10 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.15.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
labels:
77
app.kubernetes.io/created-by: metalk8s
88
app.kubernetes.io/part-of: metalk8s
@@ -222,12 +222,7 @@ spec:
222222
- Unknown
223223
type: string
224224
type:
225-
description: |-
226-
type of condition in CamelCase or in foo.example.com/CamelCase.
227-
---
228-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
229-
useful (see .node.status.conditions), the ability to deconflict is important.
230-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
225+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
231226
maxLength: 316
232227
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
233228
type: string
@@ -268,7 +263,7 @@ apiVersion: apiextensions.k8s.io/v1
268263
kind: CustomResourceDefinition
269264
metadata:
270265
annotations:
271-
controller-gen.kubebuilder.io/version: v0.15.0
266+
controller-gen.kubebuilder.io/version: v0.18.0
272267
labels:
273268
app.kubernetes.io/created-by: metalk8s
274269
app.kubernetes.io/part-of: metalk8s
@@ -443,12 +438,7 @@ spec:
443438
- Unknown
444439
type: string
445440
type:
446-
description: |-
447-
type of condition in CamelCase or in foo.example.com/CamelCase.
448-
---
449-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
450-
useful (see .node.status.conditions), the ability to deconflict is important.
451-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
441+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
452442
maxLength: 316
453443
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
454444
type: string
@@ -536,6 +526,7 @@ rules:
536526
- ""
537527
resources:
538528
- configmaps
529+
- namespaces
539530
verbs:
540531
- create
541532
- delete
@@ -551,18 +542,6 @@ rules:
551542
verbs:
552543
- create
553544
- patch
554-
- apiGroups:
555-
- ""
556-
resources:
557-
- namespaces
558-
verbs:
559-
- create
560-
- delete
561-
- get
562-
- list
563-
- patch
564-
- update
565-
- watch
566545
- apiGroups:
567546
- ""
568547
resources:
@@ -587,31 +566,6 @@ rules:
587566
- metalk8s.scality.com
588567
resources:
589568
- clusterconfigs
590-
verbs:
591-
- create
592-
- delete
593-
- get
594-
- list
595-
- patch
596-
- update
597-
- watch
598-
- apiGroups:
599-
- metalk8s.scality.com
600-
resources:
601-
- clusterconfigs/finalizers
602-
verbs:
603-
- update
604-
- apiGroups:
605-
- metalk8s.scality.com
606-
resources:
607-
- clusterconfigs/status
608-
verbs:
609-
- get
610-
- patch
611-
- update
612-
- apiGroups:
613-
- metalk8s.scality.com
614-
resources:
615569
- virtualippools
616570
verbs:
617571
- create
@@ -624,12 +578,14 @@ rules:
624578
- apiGroups:
625579
- metalk8s.scality.com
626580
resources:
581+
- clusterconfigs/finalizers
627582
- virtualippools/finalizers
628583
verbs:
629584
- update
630585
- apiGroups:
631586
- metalk8s.scality.com
632587
resources:
588+
- clusterconfigs/status
633589
- virtualippools/status
634590
verbs:
635591
- get
@@ -762,6 +718,7 @@ spec:
762718
initialDelaySeconds: 15
763719
periodSeconds: 20
764720
name: manager
721+
ports: []
765722
readinessProbe:
766723
httpGet:
767724
path: /readyz
@@ -780,6 +737,7 @@ spec:
780737
capabilities:
781738
drop:
782739
- ALL
740+
volumeMounts: []
783741
securityContext:
784742
runAsNonRoot: true
785743
seccompProfile:
@@ -796,3 +754,4 @@ spec:
796754
- effect: NoSchedule
797755
key: node-role.kubernetes.io/master
798756
operator: Exists
757+
volumes: []

‎operator/pkg/controller/clusterconfig/controlplane/ingress.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func (r *IngressReconciler) Reconcile(ctx context.Context) utils.SubReconcilerRe
176176
"BootstrapRetrievingError",
177177
message,
178178
)
179-
return utils.NeedRequeue(fmt.Errorf(message))
179+
return utils.NeedRequeue(fmt.Errorf("%s", message))
180180
}
181181

182182
for _, addr := range nodeList.Items[0].Status.Addresses {
@@ -193,7 +193,7 @@ func (r *IngressReconciler) Reconcile(ctx context.Context) utils.SubReconcilerRe
193193
"BootstrapIPRetrievingError",
194194
message,
195195
)
196-
return utils.NeedRequeue(fmt.Errorf(message))
196+
return utils.NeedRequeue(fmt.Errorf("%s", message))
197197
}
198198
}
199199
r.instance.Status.ControlPlane.Ingress.IP = ingressIP

‎storage-operator/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ endif
4848

4949
# Set the Operator SDK version to use. By default, what is installed on the system is used.
5050
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
51-
OPERATOR_SDK_VERSION ?= v1.41.0
51+
OPERATOR_SDK_VERSION ?= v1.42.0
5252

5353
# Image URL to use all building/pushing image targets
5454
IMG ?= controller:latest

‎storage-operator/cmd/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ func main() {
162162
}
163163

164164
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
165-
Scheme: scheme,
166-
Metrics: metricsServerOptions,
165+
Scheme: scheme,
166+
Metrics: metricsServerOptions,
167167
WebhookServer: webhook.NewServer(webhook.Options{
168168
TLSOpts: webhookTLSOpts,
169169
}),

0 commit comments

Comments
 (0)