Skip to content

Commit ca84947

Browse files
majst01majst01
authored
Lb csi v1.18 (#90)
1 parent eacf219 commit ca84947

File tree

6 files changed

+115
-112
lines changed

6 files changed

+115
-112
lines changed

‎.github/workflows/docker.yaml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@ jobs:
3838
cache: false
3939

4040
- name: Lint
41-
uses: golangci/golangci-lint-action@v6
41+
uses: golangci/golangci-lint-action@v7
4242
with:
43-
args: --build-tags integration -p bugs -p unused --timeout=5m
43+
args: --build-tags integration --timeout=5m
4444

45-
- name: Make tag
46-
run: |
47-
[ "${GITHUB_EVENT_NAME}" == 'pull_request' ] && echo "tag=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV || true
48-
[ "${GITHUB_EVENT_NAME}" == 'release' ] && echo "tag=${GITHUB_REF##*/}" >> $GITHUB_ENV || true
49-
[ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true
45+
- name: Docker meta
46+
id: meta
47+
uses: docker/metadata-action@v5
48+
with:
49+
images: |
50+
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
5051
5152
- name: Test and build
5253
run: |
@@ -58,4 +59,4 @@ jobs:
5859
with:
5960
context: .
6061
push: true
61-
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.tag }}
62+
tags: ${{ steps.meta.outputs.tags }}

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GITVERSION := $(shell git describe --long --all)
1010
BUILDDATE := $(shell date -Iseconds)
1111
VERSION := $(or ${VERSION},devel)
1212

13-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
13+
CONTROLLER_TOOLS_VERSION ?= v0.17.2
1414
LOCALBIN ?= $(shell pwd)/bin
1515
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
1616

‎controllers/images.go‎

Lines changed: 6 additions & 6 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.17.0"
5-
lbDiscoveryClientImage = "docker.lightbitslabs.com/lightos-csi/lb-nvme-discovery-client:1.17.0"
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"
66
csiProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v5.2.0"
7-
csiAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.8.0"
8-
csiResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.13.1"
7+
csiAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.8.1"
8+
csiResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.13.2"
99
csiNodeDriverRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0"
10-
snapshotControllerImage = "registry.k8s.io/sig-storage/snapshot-controller:v8.2.0"
11-
csiSnapshotterImage = "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.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"
1212
)

‎controllers/resources.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ func (r *DurosReconciler) deployCSI(ctx context.Context, projectID string, scs [
10011001

10021002
obj := &storage.StorageClass{ObjectMeta: metav1.ObjectMeta{Name: sc.Name}}
10031003
op, err = controllerutil.CreateOrUpdate(ctx, r.Shoot, obj, func() error {
1004-
obj.ObjectMeta.Annotations = annotations
1004+
obj.Annotations = annotations
10051005
obj.Provisioner = provisioner
10061006
obj.AllowVolumeExpansion = pointer.Bool(true)
10071007
obj.Parameters = map[string]string{
@@ -1060,7 +1060,7 @@ func (r *DurosReconciler) deployCSI(ctx context.Context, projectID string, scs [
10601060
}
10611061
snapobj := &snapshotv1.VolumeSnapshotClass{ObjectMeta: metav1.ObjectMeta{Name: "partition-snapshot"}}
10621062
op, err := controllerutil.CreateOrUpdate(ctx, r.Shoot, snapobj, func() error {
1063-
snapobj.ObjectMeta.Annotations = snapannotations
1063+
snapobj.Annotations = snapannotations
10641064
snapobj.Driver = provisioner
10651065
snapobj.DeletionPolicy = snapshotv1.VolumeSnapshotContentDelete
10661066
snapobj.Parameters = map[string]string{
@@ -1076,7 +1076,7 @@ func (r *DurosReconciler) deployCSI(ctx context.Context, projectID string, scs [
10761076
if err != nil {
10771077
return err
10781078
}
1079-
log.Info("snapshotstorageclass", "name", snapobj.ObjectMeta.Name, "operation", op)
1079+
log.Info("snapshotstorageclass", "name", snapobj.Name, "operation", op)
10801080

10811081
}
10821082

‎go.mod‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/metal-stack/duros-controller
22

3-
go 1.23
3+
go 1.24
44

55
require (
66
github.com/go-logr/logr v1.4.2
7-
github.com/golang-jwt/jwt/v5 v5.2.1
7+
github.com/golang-jwt/jwt/v5 v5.2.2
88
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
99
github.com/metal-stack/duros-go v0.5.4
1010
github.com/metal-stack/v v1.0.3
11-
google.golang.org/grpc v1.70.0
11+
google.golang.org/grpc v1.72.2
1212
k8s.io/api v0.28.9
1313
k8s.io/apimachinery v0.28.9
1414
k8s.io/client-go v0.28.9
@@ -20,9 +20,9 @@ require (
2020
github.com/beorn7/perks v1.0.1 // indirect
2121
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2222
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
23-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
24-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
25-
github.com/fsnotify/fsnotify v1.8.0 // indirect
23+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
24+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
25+
github.com/fsnotify/fsnotify v1.9.0 // indirect
2626
github.com/go-logr/zapr v1.3.0 // indirect
2727
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2828
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -31,40 +31,38 @@ require (
3131
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
3232
github.com/golang/protobuf v1.5.4 // indirect
3333
github.com/google/gnostic-models v0.6.9 // indirect
34-
github.com/google/go-cmp v0.6.0 // indirect
34+
github.com/google/go-cmp v0.7.0 // indirect
3535
github.com/google/gofuzz v1.2.0 // indirect
3636
github.com/google/uuid v1.6.0 // indirect
37-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 // indirect
37+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
3838
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
3939
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
42-
github.com/klauspost/compress v1.17.11 // indirect
43-
github.com/mailru/easyjson v0.7.7 // indirect
42+
github.com/mailru/easyjson v0.9.0 // indirect
4443
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4544
github.com/modern-go/reflect2 v1.0.2 // indirect
4645
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
47-
github.com/onsi/ginkgo/v2 v2.22.2 // indirect
48-
github.com/onsi/gomega v1.36.2 // indirect
49-
github.com/pkg/errors v0.9.1 // indirect
50-
github.com/prometheus/client_golang v1.20.5 // indirect
51-
github.com/prometheus/client_model v0.6.1 // indirect
52-
github.com/prometheus/common v0.62.0 // indirect
53-
github.com/prometheus/procfs v0.15.1 // indirect
46+
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
47+
github.com/onsi/gomega v1.37.0 // indirect
48+
github.com/prometheus/client_golang v1.22.0 // indirect
49+
github.com/prometheus/client_model v0.6.2 // indirect
50+
github.com/prometheus/common v0.64.0 // indirect
51+
github.com/prometheus/procfs v0.16.1 // indirect
5452
github.com/spf13/pflag v1.0.6 // indirect
5553
go.uber.org/goleak v1.3.0 // indirect
5654
go.uber.org/zap v1.27.0 // indirect
57-
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
58-
golang.org/x/net v0.35.0 // indirect
59-
golang.org/x/oauth2 v0.26.0 // indirect
60-
golang.org/x/sys v0.30.0 // indirect
61-
golang.org/x/term v0.29.0 // indirect
62-
golang.org/x/text v0.22.0 // indirect
63-
golang.org/x/time v0.10.0 // indirect
64-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
65-
google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6 // indirect
66-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect
67-
google.golang.org/protobuf v1.36.5 // indirect
55+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
56+
golang.org/x/net v0.40.0 // indirect
57+
golang.org/x/oauth2 v0.30.0 // indirect
58+
golang.org/x/sys v0.33.0 // indirect
59+
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
62+
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
65+
google.golang.org/protobuf v1.36.6 // indirect
6866
gopkg.in/inf.v0 v0.9.1 // indirect
6967
gopkg.in/yaml.v2 v2.4.0 // indirect
7068
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)