Skip to content

Commit d8a63c4

Browse files
authored
Update go to 1.22 (#67)
1 parent f1ea68e commit d8a63c4

File tree

7 files changed

+68
-71
lines changed

7 files changed

+68
-71
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Build the duros-controller binary
2-
FROM golang:1.21 as builder
2+
FROM golang:1.22 as builder
33

44
ENV KUBEBUILDER_DOWNLOAD_URL=https://github.com/kubernetes-sigs/kubebuilder/releases/download
5-
ENV KUBEBUILDER_VER=v3.4.1
5+
ENV KUBEBUILDER_VER=v3.14.0
66
RUN set -ex \
77
&& mkdir -p /usr/local/bin \
88
&& curl -L ${KUBEBUILDER_DOWNLOAD_URL}/v${KUBEBUILDER_VER}/kubebuilder_linux_amd64 -o /usr/local/bin/kubebuilder \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ifeq (, $(shell which controller-gen))
8787
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
8888
cd $$CONTROLLER_GEN_TMP_DIR ;\
8989
go mod init tmp ;\
90-
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.0 ;\
90+
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 ;\
9191
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
9292
}
9393
CONTROLLER_GEN=$(GOBIN)/controller-gen

api/v1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/storage.metal-stack.io_duros.yaml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
97
name: duros.storage.metal-stack.io
108
spec:
119
group: storage.metal-stack.io
@@ -29,14 +27,19 @@ spec:
2927
description: Duros is the Schema for the Duros API
3028
properties:
3129
apiVersion:
32-
description: 'APIVersion defines the versioned schema of this representation
33-
of an object. Servers should convert recognized schemas to the latest
34-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
30+
description: |-
31+
APIVersion defines the versioned schema of this representation of an object.
32+
Servers should convert recognized schemas to the latest internal value, and
33+
may reject unrecognized values.
34+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3535
type: string
3636
kind:
37-
description: 'Kind is a string value representing the REST resource this
38-
object represents. Servers may infer this from the endpoint the client
39-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
37+
description: |-
38+
Kind is a string value representing the REST resource this object represents.
39+
Servers may infer this from the endpoint the client submits requests to.
40+
Cannot be updated.
41+
In CamelCase.
42+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4043
type: string
4144
metadata:
4245
type: object
@@ -114,9 +117,3 @@ spec:
114117
storage: true
115118
subresources:
116119
status: {}
117-
status:
118-
acceptedNames:
119-
kind: ""
120-
plural: ""
121-
conditions: []
122-
storedVersions: []

go.mod

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

3-
go 1.21
3+
go 1.22
44

55
require (
6-
github.com/go-logr/logr v1.3.0
6+
github.com/go-logr/logr v1.4.1
77
github.com/go-logr/zapr v1.3.0
88
github.com/golang-jwt/jwt/v4 v4.5.0
99
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
10-
github.com/metal-stack/duros-go v0.4.4
11-
github.com/metal-stack/metal-lib v0.14.1
10+
github.com/metal-stack/duros-go v0.4.5
11+
github.com/metal-stack/metal-lib v0.14.4
1212
github.com/metal-stack/v v1.0.3
1313
go.uber.org/zap v1.26.0
14-
google.golang.org/grpc v1.60.1
14+
google.golang.org/grpc v1.61.1
1515
k8s.io/api v0.26.10
1616
k8s.io/apimachinery v0.28.2
1717
k8s.io/client-go v0.26.10
@@ -23,7 +23,7 @@ require (
2323
github.com/beorn7/perks v1.0.1 // indirect
2424
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2525
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
2727
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
2828
github.com/fsnotify/fsnotify v1.7.0 // indirect
2929
github.com/go-openapi/jsonpointer v0.20.0 // indirect
@@ -36,7 +36,7 @@ require (
3636
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
3737
github.com/google/go-cmp v0.6.0 // indirect
3838
github.com/google/gofuzz v1.2.0 // indirect
39-
github.com/google/uuid v1.5.0 // indirect
39+
github.com/google/uuid v1.6.0 // indirect
4040
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
4141
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
4242
github.com/imdario/mergo v0.3.16 // indirect
@@ -56,17 +56,17 @@ require (
5656
github.com/prometheus/procfs v0.12.0 // indirect
5757
github.com/spf13/pflag v1.0.5 // indirect
5858
go.uber.org/multierr v1.11.0 // indirect
59-
golang.org/x/net v0.19.0 // indirect
60-
golang.org/x/oauth2 v0.15.0 // indirect
61-
golang.org/x/sys v0.16.0 // indirect
62-
golang.org/x/term v0.16.0 // indirect
59+
golang.org/x/net v0.21.0 // indirect
60+
golang.org/x/oauth2 v0.17.0 // indirect
61+
golang.org/x/sys v0.17.0 // indirect
62+
golang.org/x/term v0.17.0 // indirect
6363
golang.org/x/text v0.14.0 // indirect
6464
golang.org/x/time v0.5.0 // indirect
6565
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
6666
google.golang.org/appengine v1.6.8 // indirect
67-
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
68-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
69-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
67+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
68+
google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect
69+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
7070
google.golang.org/protobuf v1.32.0 // indirect
7171
gopkg.in/inf.v0 v0.9.1 // indirect
7272
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)