Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
cache: false

- name: Lint
uses: golangci/golangci-lint-action@v7
uses: golangci/golangci-lint-action@v8
with:
args: --build-tags integration --timeout=5m

Expand Down
16 changes: 8 additions & 8 deletions controllers/images.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package controllers

const (
lbCSIPluginImage = "docker.lightbitslabs.com/lightos-csi/lb-csi-plugin:1.18.0"
lbDiscoveryClientImage = "docker.lightbitslabs.com/lightos-csi/lb-nvme-discovery-client:1.18.0"
csiProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v5.2.0"
csiAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.8.1"
csiResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.13.2"
csiNodeDriverRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0"
snapshotControllerImage = "registry.k8s.io/sig-storage/snapshot-controller:v8.2.1"
csiSnapshotterImage = "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.1"
lbCSIPluginImage = "docker.lightbitslabs.com/lightos-csi/lb-csi-plugin:1.19.0"
lbDiscoveryClientImage = "docker.lightbitslabs.com/lightos-csi/lb-nvme-discovery-client:1.19.0"
csiProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v5.3.0"
csiAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.9.0"
csiResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.14.0"
csiNodeDriverRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0"
snapshotControllerImage = "registry.k8s.io/sig-storage/snapshot-controller:v8.3.0"
csiSnapshotterImage = "registry.k8s.io/sig-storage/csi-snapshotter:v8.3.0"
)
24 changes: 12 additions & 12 deletions controllers/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

Expand Down Expand Up @@ -471,7 +471,7 @@
},
Resources: defaultResourceLimits,
SecurityContext: &corev1.SecurityContext{
AllowPrivilegeEscalation: pointer.Bool(false),

Check failure on line 474 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
Expand All @@ -490,7 +490,7 @@
},
Resources: defaultResourceLimits,
SecurityContext: &corev1.SecurityContext{
AllowPrivilegeEscalation: pointer.Bool(false),

Check failure on line 493 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
Expand All @@ -509,7 +509,7 @@
},
Resources: defaultResourceLimits,
SecurityContext: &corev1.SecurityContext{
AllowPrivilegeEscalation: pointer.Bool(false),

Check failure on line 512 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
Expand All @@ -528,7 +528,7 @@
},
Resources: defaultResourceLimits,
SecurityContext: &corev1.SecurityContext{
AllowPrivilegeEscalation: pointer.Bool(false),

Check failure on line 531 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
Expand All @@ -541,7 +541,7 @@
Args: []string{"--leader-election=false", "--v=5"},
Resources: defaultResourceLimits,
SecurityContext: &corev1.SecurityContext{
AllowPrivilegeEscalation: pointer.Bool(false),

Check failure on line 544 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
Expand All @@ -560,7 +560,7 @@
},
Resources: defaultResourceLimits,
SecurityContext: &corev1.SecurityContext{
AllowPrivilegeEscalation: pointer.Bool(false),

Check failure on line 563 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
Expand All @@ -575,11 +575,11 @@
{Name: discoveryClientDirVolume.Name, MountPath: "/etc/discovery-client/discovery.d"},
},
SecurityContext: &corev1.SecurityContext{
Privileged: pointer.Bool(true),
Privileged: ptr.To(true),
Capabilities: &corev1.Capabilities{
Add: []corev1.Capability{"SYS_ADMIN"},
},
AllowPrivilegeEscalation: pointer.Bool(true),
AllowPrivilegeEscalation: ptr.To(true),
},
Resources: defaultResourceLimits,
}
Expand All @@ -588,7 +588,7 @@
Name: "init-nvme-tcp",
Image: lbCSIPluginImage,
ImagePullPolicy: corev1.PullIfNotPresent,
SecurityContext: &corev1.SecurityContext{Privileged: pointer.Bool(true)},
SecurityContext: &corev1.SecurityContext{Privileged: ptr.To(true)},
VolumeMounts: []corev1.VolumeMount{
{Name: modulesDirVolume.Name, MountPath: "/lib/modules", MountPropagation: &mountPropagationHostToContainer},
},
Expand All @@ -605,8 +605,8 @@
Image: lbCSIPluginImage,
ImagePullPolicy: corev1.PullIfNotPresent,
SecurityContext: &corev1.SecurityContext{
Privileged: pointer.Bool(true),
AllowPrivilegeEscalation: pointer.Bool(true),
Privileged: ptr.To(true),
AllowPrivilegeEscalation: ptr.To(true),
Capabilities: &corev1.Capabilities{Add: []corev1.Capability{"SYS_ADMIN"}},
},
Args: []string{"-P"},
Expand Down Expand Up @@ -649,7 +649,7 @@
},
Resources: defaultResourceLimits,
SecurityContext: &corev1.SecurityContext{
AllowPrivilegeEscalation: pointer.Bool(false),

Check failure on line 652 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
Expand Down Expand Up @@ -889,8 +889,8 @@
csiDriver := &storage.CSIDriver{ObjectMeta: metav1.ObjectMeta{Name: provisioner}}
op, err := controllerutil.CreateOrUpdate(ctx, r.Shoot, csiDriver, func() error {
csiDriver.Spec = storage.CSIDriverSpec{
AttachRequired: pointer.Bool(true),
PodInfoOnMount: pointer.Bool(true),
AttachRequired: ptr.To(true),
PodInfoOnMount: ptr.To(true),
}
return nil
})
Expand All @@ -905,8 +905,8 @@
csiDriver := &storagev1beta1.CSIDriver{ObjectMeta: metav1.ObjectMeta{Name: provisioner}}
op, err := controllerutil.CreateOrUpdate(ctx, r.Shoot, csiDriver, func() error {
csiDriver.Spec = storagev1beta1.CSIDriverSpec{
AttachRequired: pointer.Bool(true),
PodInfoOnMount: pointer.Bool(true),
AttachRequired: ptr.To(true),
PodInfoOnMount: ptr.To(true),
}
return nil
})
Expand Down Expand Up @@ -985,7 +985,7 @@
sts.Spec = apps.StatefulSetSpec{
Selector: &metav1.LabelSelector{MatchLabels: controllerRoleLabels},
ServiceName: "lb-csi-ctrl-svc",
Replicas: pointer.Int32(1),
Replicas: ptr.To(int32(1)),
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Labels: controllerRoleLabels},
Spec: corev1.PodSpec{
Expand All @@ -993,9 +993,9 @@
ServiceAccountName: ctrlServiceAccount().Name,
PriorityClassName: "system-cluster-critical",
SecurityContext: &corev1.PodSecurityContext{
FSGroup: pointer.Int64(65534),

Check failure on line 996 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
RunAsUser: pointer.Int64(65534),

Check failure on line 997 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
RunAsNonRoot: pointer.Bool(true),

Check failure on line 998 in controllers/resources.go

View workflow job for this annotation

GitHub Actions / Docker Build

undefined: pointer
},
Volumes: []corev1.Volume{
socketDirVolume,
Expand Down Expand Up @@ -1050,7 +1050,7 @@
op, err = controllerutil.CreateOrUpdate(ctx, r.Shoot, obj, func() error {
obj.Annotations = annotations
obj.Provisioner = provisioner
obj.AllowVolumeExpansion = pointer.Bool(true)
obj.AllowVolumeExpansion = ptr.To(true)
obj.Parameters = map[string]string{
"mgmt-scheme": "grpcs",
"compression": "disabled",
Expand Down
61 changes: 31 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
module github.com/metal-stack/duros-controller

go 1.24
go 1.24.0

toolchain go1.24.4

require (
github.com/go-logr/logr v1.4.2
github.com/go-logr/logr v1.4.3
github.com/golang-jwt/jwt/v5 v5.2.2
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
github.com/metal-stack/duros-go v0.5.4
github.com/metal-stack/duros-go v0.5.5
github.com/metal-stack/v v1.0.3
google.golang.org/grpc v1.72.2
k8s.io/api v0.28.9
k8s.io/apimachinery v0.28.9
k8s.io/client-go v0.28.9
k8s.io/utils v0.0.0-20230505201702-9f6742963106
sigs.k8s.io/controller-runtime v0.16.6
google.golang.org/grpc v1.73.0
k8s.io/api v0.33.2
k8s.io/apimachinery v0.33.2
k8s.io/client-go v0.33.2
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/controller-runtime v0.21.0
)

require (
Expand All @@ -23,20 +25,18 @@ require (
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
Expand All @@ -45,32 +45,33 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
github.com/onsi/gomega v1.37.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.22.0 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.64.0 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
go.uber.org/goleak v1.3.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
golang.org/x/net v0.40.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.15.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.34.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.28.9 // indirect
k8s.io/component-base v0.28.9 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
k8s.io/apiextensions-apiserver v0.33.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading