Skip to content

Commit cce2ef5

Browse files
majst01majst01
authored
Update duros-go to v3.15, lb-csi to v1.19 and all csi sidecars (#95)
1 parent 8dc8792 commit cce2ef5

File tree

5 files changed

+125
-120
lines changed

5 files changed

+125
-120
lines changed

‎.github/workflows/docker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
cache: false
3939

4040
- name: Lint
41-
uses: golangci/golangci-lint-action@v7
41+
uses: golangci/golangci-lint-action@v8
4242
with:
4343
args: --build-tags integration --timeout=5m
4444

‎controllers/images.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package controllers
22

33
const (
4-
lbCSIPluginImage = "docker.lightbitslabs.com/lightos-csi/lb-csi-plugin:1.18.0"
5-
lbDiscoveryClientImage = "docker.lightbitslabs.com/lightos-csi/lb-nvme-discovery-client:1.18.0"
6-
csiProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v5.2.0"
7-
csiAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.8.1"
8-
csiResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.13.2"
9-
csiNodeDriverRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0"
10-
snapshotControllerImage = "registry.k8s.io/sig-storage/snapshot-controller:v8.2.1"
11-
csiSnapshotterImage = "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.1"
4+
lbCSIPluginImage = "docker.lightbitslabs.com/lightos-csi/lb-csi-plugin:1.19.0"
5+
lbDiscoveryClientImage = "docker.lightbitslabs.com/lightos-csi/lb-nvme-discovery-client:1.19.0"
6+
csiProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v5.3.0"
7+
csiAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.9.0"
8+
csiResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.14.0"
9+
csiNodeDriverRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0"
10+
snapshotControllerImage = "registry.k8s.io/sig-storage/snapshot-controller:v8.3.0"
11+
csiSnapshotterImage = "registry.k8s.io/sig-storage/csi-snapshotter:v8.3.0"
1212
)

‎controllers/resources.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/types"
2525
"k8s.io/apimachinery/pkg/util/intstr"
2626
"k8s.io/apimachinery/pkg/util/wait"
27-
"k8s.io/utils/pointer"
27+
"k8s.io/utils/ptr"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3030

@@ -575,11 +575,11 @@ var (
575575
{Name: discoveryClientDirVolume.Name, MountPath: "/etc/discovery-client/discovery.d"},
576576
},
577577
SecurityContext: &corev1.SecurityContext{
578-
Privileged: pointer.Bool(true),
578+
Privileged: ptr.To(true),
579579
Capabilities: &corev1.Capabilities{
580580
Add: []corev1.Capability{"SYS_ADMIN"},
581581
},
582-
AllowPrivilegeEscalation: pointer.Bool(true),
582+
AllowPrivilegeEscalation: ptr.To(true),
583583
},
584584
Resources: defaultResourceLimits,
585585
}
@@ -588,7 +588,7 @@ var (
588588
Name: "init-nvme-tcp",
589589
Image: lbCSIPluginImage,
590590
ImagePullPolicy: corev1.PullIfNotPresent,
591-
SecurityContext: &corev1.SecurityContext{Privileged: pointer.Bool(true)},
591+
SecurityContext: &corev1.SecurityContext{Privileged: ptr.To(true)},
592592
VolumeMounts: []corev1.VolumeMount{
593593
{Name: modulesDirVolume.Name, MountPath: "/lib/modules", MountPropagation: &mountPropagationHostToContainer},
594594
},
@@ -605,8 +605,8 @@ var (
605605
Image: lbCSIPluginImage,
606606
ImagePullPolicy: corev1.PullIfNotPresent,
607607
SecurityContext: &corev1.SecurityContext{
608-
Privileged: pointer.Bool(true),
609-
AllowPrivilegeEscalation: pointer.Bool(true),
608+
Privileged: ptr.To(true),
609+
AllowPrivilegeEscalation: ptr.To(true),
610610
Capabilities: &corev1.Capabilities{Add: []corev1.Capability{"SYS_ADMIN"}},
611611
},
612612
Args: []string{"-P"},
@@ -889,8 +889,8 @@ func (r *DurosReconciler) deployCSI(ctx context.Context, projectID string, scs [
889889
csiDriver := &storage.CSIDriver{ObjectMeta: metav1.ObjectMeta{Name: provisioner}}
890890
op, err := controllerutil.CreateOrUpdate(ctx, r.Shoot, csiDriver, func() error {
891891
csiDriver.Spec = storage.CSIDriverSpec{
892-
AttachRequired: pointer.Bool(true),
893-
PodInfoOnMount: pointer.Bool(true),
892+
AttachRequired: ptr.To(true),
893+
PodInfoOnMount: ptr.To(true),
894894
}
895895
return nil
896896
})
@@ -905,8 +905,8 @@ func (r *DurosReconciler) deployCSI(ctx context.Context, projectID string, scs [
905905
csiDriver := &storagev1beta1.CSIDriver{ObjectMeta: metav1.ObjectMeta{Name: provisioner}}
906906
op, err := controllerutil.CreateOrUpdate(ctx, r.Shoot, csiDriver, func() error {
907907
csiDriver.Spec = storagev1beta1.CSIDriverSpec{
908-
AttachRequired: pointer.Bool(true),
909-
PodInfoOnMount: pointer.Bool(true),
908+
AttachRequired: ptr.To(true),
909+
PodInfoOnMount: ptr.To(true),
910910
}
911911
return nil
912912
})
@@ -985,7 +985,7 @@ func (r *DurosReconciler) deployCSI(ctx context.Context, projectID string, scs [
985985
sts.Spec = apps.StatefulSetSpec{
986986
Selector: &metav1.LabelSelector{MatchLabels: controllerRoleLabels},
987987
ServiceName: "lb-csi-ctrl-svc",
988-
Replicas: pointer.Int32(1),
988+
Replicas: ptr.To(int32(1)),
989989
Template: corev1.PodTemplateSpec{
990990
ObjectMeta: metav1.ObjectMeta{Labels: controllerRoleLabels},
991991
Spec: corev1.PodSpec{
@@ -1050,7 +1050,7 @@ func (r *DurosReconciler) deployCSI(ctx context.Context, projectID string, scs [
10501050
op, err = controllerutil.CreateOrUpdate(ctx, r.Shoot, obj, func() error {
10511051
obj.Annotations = annotations
10521052
obj.Provisioner = provisioner
1053-
obj.AllowVolumeExpansion = pointer.Bool(true)
1053+
obj.AllowVolumeExpansion = ptr.To(true)
10541054
obj.Parameters = map[string]string{
10551055
"mgmt-scheme": "grpcs",
10561056
"compression": "disabled",

‎go.mod‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
module github.com/metal-stack/duros-controller
22

3-
go 1.24
3+
go 1.24.0
4+
5+
toolchain go1.24.4
46

57
require (
6-
github.com/go-logr/logr v1.4.2
8+
github.com/go-logr/logr v1.4.3
79
github.com/golang-jwt/jwt/v5 v5.2.2
810
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
9-
github.com/metal-stack/duros-go v0.5.4
11+
github.com/metal-stack/duros-go v0.5.5
1012
github.com/metal-stack/v v1.0.3
11-
google.golang.org/grpc v1.72.2
12-
k8s.io/api v0.28.9
13-
k8s.io/apimachinery v0.28.9
14-
k8s.io/client-go v0.28.9
15-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
16-
sigs.k8s.io/controller-runtime v0.16.6
13+
google.golang.org/grpc v1.73.0
14+
k8s.io/api v0.33.2
15+
k8s.io/apimachinery v0.33.2
16+
k8s.io/client-go v0.33.2
17+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
18+
sigs.k8s.io/controller-runtime v0.21.0
1719
)
1820

1921
require (
@@ -23,20 +25,18 @@ require (
2325
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2426
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2527
github.com/fsnotify/fsnotify v1.9.0 // indirect
26-
github.com/go-logr/zapr v1.3.0 // indirect
27-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
28+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
29+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
2830
github.com/go-openapi/jsonreference v0.21.0 // indirect
29-
github.com/go-openapi/swag v0.23.0 // indirect
31+
github.com/go-openapi/swag v0.23.1 // indirect
3032
github.com/gogo/protobuf v1.3.2 // indirect
31-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
3233
github.com/golang/protobuf v1.5.4 // indirect
34+
github.com/google/btree v1.1.3 // indirect
3335
github.com/google/gnostic-models v0.6.9 // indirect
3436
github.com/google/go-cmp v0.7.0 // indirect
35-
github.com/google/gofuzz v1.2.0 // indirect
3637
github.com/google/uuid v1.6.0 // indirect
3738
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
3839
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
39-
github.com/imdario/mergo v0.3.16 // indirect
4040
github.com/josharian/intern v1.0.0 // indirect
4141
github.com/json-iterator/go v1.1.12 // indirect
4242
github.com/mailru/easyjson v0.9.0 // indirect
@@ -45,32 +45,33 @@ require (
4545
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4646
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
4747
github.com/onsi/gomega v1.37.0 // indirect
48+
github.com/pkg/errors v0.9.1 // indirect
4849
github.com/prometheus/client_golang v1.22.0 // indirect
4950
github.com/prometheus/client_model v0.6.2 // indirect
5051
github.com/prometheus/common v0.64.0 // indirect
5152
github.com/prometheus/procfs v0.16.1 // indirect
5253
github.com/spf13/pflag v1.0.6 // indirect
53-
go.uber.org/goleak v1.3.0 // indirect
54-
go.uber.org/zap v1.27.0 // indirect
55-
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
56-
golang.org/x/net v0.40.0 // indirect
54+
github.com/x448/float16 v0.8.4 // indirect
55+
golang.org/x/net v0.41.0 // indirect
5756
golang.org/x/oauth2 v0.30.0 // indirect
57+
golang.org/x/sync v0.15.0 // indirect
5858
golang.org/x/sys v0.33.0 // indirect
5959
golang.org/x/term v0.32.0 // indirect
60-
golang.org/x/text v0.25.0 // indirect
61-
golang.org/x/time v0.11.0 // indirect
60+
golang.org/x/text v0.26.0 // indirect
61+
golang.org/x/time v0.12.0 // indirect
62+
golang.org/x/tools v0.34.0 // indirect
6263
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
63-
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
64-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
64+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
65+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
6566
google.golang.org/protobuf v1.36.6 // indirect
67+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6668
gopkg.in/inf.v0 v0.9.1 // indirect
67-
gopkg.in/yaml.v2 v2.4.0 // indirect
6869
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.28.9 // indirect
70-
k8s.io/component-base v0.28.9 // indirect
71-
k8s.io/klog/v2 v2.110.1 // indirect
72-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
73-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
74-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
70+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
71+
k8s.io/klog/v2 v2.130.1 // indirect
72+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
73+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
74+
sigs.k8s.io/randfill v1.0.0 // indirect
75+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
7576
sigs.k8s.io/yaml v1.4.0 // indirect
7677
)

0 commit comments

Comments
 (0)