Skip to content

Commit 8ded132

Browse files
committed
(chore) advance golang version to v1.24.1
1 parent c77a11d commit 8ded132

File tree

8 files changed

+15
-24
lines changed

8 files changed

+15
-24
lines changed

.github/workflows/main.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Go
1919
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2020
with:
21-
go-version: 1.23.6
21+
go-version: 1.24.1
2222
- name: Build
2323
run: make build
2424
- name: FMT
@@ -37,7 +37,7 @@ jobs:
3737
- name: Set up Go
3838
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3939
with:
40-
go-version: 1.23.6
40+
go-version: 1.24.1
4141
- name: ut
4242
run: make test
4343
env:
@@ -50,7 +50,7 @@ jobs:
5050
- name: Set up Go
5151
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
5252
with:
53-
go-version: 1.23.6
53+
go-version: 1.24.1
5454
- name: Free Disk Space (Ubuntu)
5555
uses: jlumbroso/free-disk-space@main
5656
with:
@@ -78,7 +78,7 @@ jobs:
7878
- name: Set up Go
7979
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
8080
with:
81-
go-version: 1.23.6
81+
go-version: 1.24.1
8282
- name: Free Disk Space (Ubuntu)
8383
uses: jlumbroso/free-disk-space@main
8484
with:
@@ -106,7 +106,7 @@ jobs:
106106
- name: Set up Go
107107
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
108108
with:
109-
go-version: 1.23.6
109+
go-version: 1.24.1
110110
- name: Free Disk Space (Ubuntu)
111111
uses: jlumbroso/free-disk-space@main
112112
with:
@@ -134,7 +134,7 @@ jobs:
134134
- name: Set up Go
135135
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
136136
with:
137-
go-version: 1.23.6
137+
go-version: 1.24.1
138138
- name: Free Disk Space (Ubuntu)
139139
uses: jlumbroso/free-disk-space@main
140140
with:

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23.6 AS builder
2+
FROM golang:1.24.1 AS builder
33

44
ARG BUILDOS
55
ARG TARGETARCH

Dockerfile_WithGit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23.6 AS builder
2+
FROM golang:1.24.1 AS builder
33

44
ARG BUILDOS
55
ARG TARGETARCH

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ KIND := $(TOOLS_BIN_DIR)/kind
7272
KUBECTL := $(TOOLS_BIN_DIR)/kubectl
7373

7474
GOVULNCHECK_VERSION := "v1.1.3"
75-
GOLANGCI_LINT_VERSION := "v1.63.0"
75+
GOLANGCI_LINT_VERSION := "v1.64.7"
7676
CLUSTERCTL_VERSION := "v1.9.5"
7777

7878
KUSTOMIZE_VER := v5.3.0

api/v1beta1/zz_generated.deepcopy.go

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

controllers/handlers_utils.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -1656,11 +1656,7 @@ func computePolicyHash(policy *unstructured.Unstructured) (string, error) {
16561656
// getConfigMap retrieves any ConfigMap from the given name and namespace.
16571657
func getConfigMap(ctx context.Context, c client.Client, configmapName types.NamespacedName) (*corev1.ConfigMap, error) {
16581658
configMap := &corev1.ConfigMap{}
1659-
configMapKey := client.ObjectKey{
1660-
Namespace: configmapName.Namespace,
1661-
Name: configmapName.Name,
1662-
}
1663-
if err := c.Get(ctx, configMapKey, configMap); err != nil {
1659+
if err := c.Get(ctx, configmapName, configMap); err != nil {
16641660
return nil, err
16651661
}
16661662

@@ -1672,11 +1668,7 @@ func getConfigMap(ctx context.Context, c client.Client, configmapName types.Name
16721668
// getSecret retrieves any Secret from the given secret name and namespace.
16731669
func getSecret(ctx context.Context, c client.Client, secretName types.NamespacedName) (*corev1.Secret, error) {
16741670
secret := &corev1.Secret{}
1675-
secretKey := client.ObjectKey{
1676-
Namespace: secretName.Namespace,
1677-
Name: secretName.Name,
1678-
}
1679-
if err := c.Get(ctx, secretKey, secret); err != nil {
1671+
if err := c.Get(ctx, secretName, secret); err != nil {
16801672
return nil, err
16811673
}
16821674

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/projectsveltos/addon-controller
22

3-
go 1.23.6
3+
go 1.24.1
44

55
require (
66
github.com/Masterminds/semver/v3 v3.3.1

hack/tools/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/projectsveltos/addon-controller/hack/tools
22

3-
go 1.23.6
3+
go 1.24.1
44

55
require (
66
github.com/a8m/envsubst v1.4.2

0 commit comments

Comments
 (0)