Skip to content

Commit 23dc439

Browse files
authored
chore: bump go to 1.22.4 (#131)
* use `go` in version `1.22.4` * bump controller-gen and generated manifests with new controller-gen * bump golangci-lint and fix minor findings * minor version bump of prometheus/client_golang and go-playground/validator --------- Signed-off-by: Mario Constanti <[email protected]>
1 parent 60bb007 commit 23dc439

18 files changed

+243
-203
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: '1.21.5'
24+
go-version: '1.22.4'
2525

2626
- name: make verify
2727
run: make verify

.github/workflows/foss.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go 1.x
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: '1.21.5'
19+
go-version: '1.22.4'
2020
id: go
2121

2222
- name: Checkout code

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- run: git fetch --force --tags
3030
- uses: actions/setup-go@v5
3131
with:
32-
go-version: '1.21.5'
32+
go-version: '1.22.4'
3333

3434
# - name: Synopsys Detect
3535
# run: |

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22
# Build the manager binary
3-
FROM golang:1.21.9 as builder
3+
FROM golang:1.22.4 as builder
44
ARG TARGETOS
55
ARG TARGETARCH
66

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@ KIND ?= $(LOCALBIN)/kind
175175

176176
## Tool Versions
177177
KUSTOMIZE_VERSION ?= v5.0.1
178-
CONTROLLER_TOOLS_VERSION ?= v0.12.0
179-
GOLANGCI_LINT_VERSION ?= v1.55.2
178+
CONTROLLER_TOOLS_VERSION ?= v0.15.0
179+
GOLANGCI_LINT_VERSION ?= v1.59.1
180180
MOCKGEN_VERSION ?= v0.4.0
181181
GORELEASER_VERSION ?= v1.21.0
182182
MDTOC_VERSION ?= v1.1.0
183183
SLICE_VERSION ?= v1.2.6
184-
NANCY_VERSION ?= v1.0.42
184+
NANCY_VERSION ?= v1.0.46
185185
KBOM_VERSION ?= v0.5.1
186186
KIND_VERSION ?= v0.22.0
187187

api/v1alpha1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/garm-operator.mercedes-benz.com_enterprises.yaml

+42-36
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.12.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: enterprises.garm-operator.mercedes-benz.com
88
spec:
99
group: garm-operator.mercedes-benz.com
@@ -44,14 +44,19 @@ spec:
4444
description: Enterprise is the Schema for the enterprises API
4545
properties:
4646
apiVersion:
47-
description: 'APIVersion defines the versioned schema of this representation
48-
of an object. Servers should convert recognized schemas to the latest
49-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
47+
description: |-
48+
APIVersion defines the versioned schema of this representation of an object.
49+
Servers should convert recognized schemas to the latest internal value, and
50+
may reject unrecognized values.
51+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5052
type: string
5153
kind:
52-
description: 'Kind is a string value representing the REST resource this
53-
object represents. Servers may infer this from the endpoint the client
54-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
54+
description: |-
55+
Kind is a string value representing the REST resource this object represents.
56+
Servers may infer this from the endpoint the client submits requests to.
57+
Cannot be updated.
58+
In CamelCase.
59+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
5560
type: string
5661
metadata:
5762
type: object
@@ -85,42 +90,42 @@ spec:
8590
conditions:
8691
items:
8792
description: "Condition contains details for one aspect of the current
88-
state of this API Resource. --- This struct is intended for direct
89-
use as an array at the field path .status.conditions. For example,
90-
\n type FooStatus struct{ // Represents the observations of a
91-
foo's current state. // Known .status.conditions.type are: \"Available\",
92-
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
93-
// +listType=map // +listMapKey=type Conditions []metav1.Condition
94-
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
95-
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
93+
state of this API Resource.\n---\nThis struct is intended for
94+
direct use as an array at the field path .status.conditions. For
95+
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
96+
observations of a foo's current state.\n\t // Known .status.conditions.type
97+
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
98+
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
99+
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
100+
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
101+
\ // other fields\n\t}"
96102
properties:
97103
lastTransitionTime:
98-
description: lastTransitionTime is the last time the condition
99-
transitioned from one status to another. This should be when
100-
the underlying condition changed. If that is not known, then
101-
using the time when the API field changed is acceptable.
104+
description: |-
105+
lastTransitionTime is the last time the condition transitioned from one status to another.
106+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
102107
format: date-time
103108
type: string
104109
message:
105-
description: message is a human readable message indicating
106-
details about the transition. This may be an empty string.
110+
description: |-
111+
message is a human readable message indicating details about the transition.
112+
This may be an empty string.
107113
maxLength: 32768
108114
type: string
109115
observedGeneration:
110-
description: observedGeneration represents the .metadata.generation
111-
that the condition was set based upon. For instance, if .metadata.generation
112-
is currently 12, but the .status.conditions[x].observedGeneration
113-
is 9, the condition is out of date with respect to the current
114-
state of the instance.
116+
description: |-
117+
observedGeneration represents the .metadata.generation that the condition was set based upon.
118+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
119+
with respect to the current state of the instance.
115120
format: int64
116121
minimum: 0
117122
type: integer
118123
reason:
119-
description: reason contains a programmatic identifier indicating
120-
the reason for the condition's last transition. Producers
121-
of specific condition types may define expected values and
122-
meanings for this field, and whether the values are considered
123-
a guaranteed API. The value should be a CamelCase string.
124+
description: |-
125+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
126+
Producers of specific condition types may define expected values and meanings for this field,
127+
and whether the values are considered a guaranteed API.
128+
The value should be a CamelCase string.
124129
This field may not be empty.
125130
maxLength: 1024
126131
minLength: 1
@@ -134,11 +139,12 @@ spec:
134139
- Unknown
135140
type: string
136141
type:
137-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
138-
--- Many .condition.type values are consistent across resources
139-
like Available, but because arbitrary conditions can be useful
140-
(see .node.status.conditions), the ability to deconflict is
141-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
142+
description: |-
143+
type of condition in CamelCase or in foo.example.com/CamelCase.
144+
---
145+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
146+
useful (see .node.status.conditions), the ability to deconflict is important.
147+
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
142148
maxLength: 316
143149
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])$
144150
type: string

config/crd/bases/garm-operator.mercedes-benz.com_images.yaml

+17-10
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.12.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: images.garm-operator.mercedes-benz.com
88
spec:
99
group: garm-operator.mercedes-benz.com
@@ -30,24 +30,31 @@ spec:
3030
description: Image is the Schema for the images API
3131
properties:
3232
apiVersion:
33-
description: 'APIVersion defines the versioned schema of this representation
34-
of an object. Servers should convert recognized schemas to the latest
35-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
33+
description: |-
34+
APIVersion defines the versioned schema of this representation of an object.
35+
Servers should convert recognized schemas to the latest internal value, and
36+
may reject unrecognized values.
37+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3638
type: string
3739
kind:
38-
description: 'Kind is a string value representing the REST resource this
39-
object represents. Servers may infer this from the endpoint the client
40-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
40+
description: |-
41+
Kind is a string value representing the REST resource this object represents.
42+
Servers may infer this from the endpoint the client submits requests to.
43+
Cannot be updated.
44+
In CamelCase.
45+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4146
type: string
4247
metadata:
4348
type: object
4449
spec:
4550
description: ImageSpec defines the desired state of Image
4651
properties:
4752
tag:
48-
description: Tag is the Name of the image in its registry e.g. - in
49-
openstack it can be the image name or id - in k8s it can be the
50-
docker image name + tag
53+
description: |-
54+
Tag is the Name of the image in its registry
55+
e.g.
56+
- in openstack it can be the image name or id
57+
- in k8s it can be the docker image name + tag
5158
type: string
5259
type: object
5360
status:

0 commit comments

Comments
 (0)