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/pr-golangci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # tag=v6.1.1
with:
version: v1.60.2
version: v1.64.3
args: --out-format=colored-line-number
working-directory: ${{matrix.working-directory}}
11 changes: 11 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -373,3 +373,14 @@ issues:
- linters:
- govet
text: "non-constant format string in call to sigs\\.k8s\\.io\\/cluster-api\\/util\\/conditions\\."
# Ignore ginkgolinter suggestions
- linters:
- ginkgolinter
text: "(wrong error assertion|wrong comparison assertion)"
path: "(^.*_test\\.go$|^test/e2e/.*\\.go$)"
# Ignore intrange suggestions in targeted files only
- linters:
- intrange
text: "for loop can be changed to `i := range machineList`"
path: "(^exp/internal/controllers/machinepool_controller_phases\\.go$|^internal/controllers/machineset/machineset_controller\\.go$)"

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
#
# Go.
#
GO_VERSION ?= 1.23.12
GO_VERSION ?= 1.24.10
GO_DIRECTIVE_VERSION ?= 1.22.0
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)

Expand Down
6 changes: 3 additions & 3 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ def load_provider_tiltfiles():

tilt_helper_dockerfile_header = """
# Tilt image
FROM golang:1.23.12 as tilt-helper
FROM golang:1.24.10 as tilt-helper
# Install delve. Note this should be kept in step with the Go release minor version.
RUN go install github.com/go-delve/delve/cmd/dlv@v1.22
RUN go install github.com/go-delve/delve/cmd/dlv@v1.24
# Support live reloading with Tilt
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh && \
wget --output-document /start.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/start.sh && \
Expand All @@ -195,7 +195,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
"""

tilt_dockerfile_header = """
FROM golang:1.23.12 as tilt
FROM golang:1.24.10 as tilt
WORKDIR /
COPY --from=tilt-helper /process.txt .
COPY --from=tilt-helper /start.sh .
Expand Down
12 changes: 2 additions & 10 deletions exp/addons/internal/controllers/clusterresourceset_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,7 @@ func (r *ClusterResourceSetReconciler) getOrCreateClusterResourceSetBinding(ctx
// getConfigMap retrieves any ConfigMap from the given name and namespace.
func getConfigMap(ctx context.Context, c client.Client, configmapName types.NamespacedName) (*corev1.ConfigMap, error) {
configMap := &corev1.ConfigMap{}
configMapKey := client.ObjectKey{
Namespace: configmapName.Namespace,
Name: configmapName.Name,
}
if err := c.Get(ctx, configMapKey, configMap); err != nil {
if err := c.Get(ctx, configmapName, configMap); err != nil {
return nil, err
}

Expand All @@ -161,11 +157,7 @@ func getConfigMap(ctx context.Context, c client.Client, configmapName types.Name
// getSecret retrieves any Secret from the given secret name and namespace.
func getSecret(ctx context.Context, c client.Client, secretName types.NamespacedName) (*corev1.Secret, error) {
secret := &corev1.Secret{}
secretKey := client.ObjectKey{
Namespace: secretName.Namespace,
Name: secretName.Name,
}
if err := c.Get(ctx, secretKey, secret); err != nil {
if err := c.Get(ctx, secretName, secret); err != nil {
return nil, err
}

Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
publish = "docs/book/book"

[build.environment]
GO_VERSION = "1.23.12"
GO_VERSION = "1.24.10"

# Standard Netlify redirects
[[redirects]]
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/cluster_upgrade_runtimesdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ func beforeClusterDeleteHandler(ctx context.Context, c client.Client, cluster ty
var blocked = true

// If the Cluster is not found it has been deleted and the hook is unblocked.
if apierrors.IsNotFound(c.Get(ctx, client.ObjectKey{Name: cluster.Name, Namespace: cluster.Namespace}, &clusterv1.Cluster{})) {
if apierrors.IsNotFound(c.Get(ctx, cluster, &clusterv1.Cluster{})) {
blocked = false
}
return blocked
Expand Down
Loading