Skip to content
Open
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
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ SHELL:=/usr/bin/env bash
#
# Go.
#
GO_VERSION ?= 1.24.7
GO_DIRECTIVE_VERSION ?= 1.24.0
GO_VERSION ?= 1.25.3
GO_DIRECTIVE_VERSION ?= 1.23.0
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)

# Ensure correct toolchain is used
Expand Down Expand Up @@ -554,6 +554,7 @@ generate-go-openapi: $(OPENAPI_GEN) ## Generate openapi go code for runtime SDK
.PHONY: generate-modules
generate-modules: ## Run go mod tidy to ensure modules are up to date
go mod tidy
cd ./api/core; go mod tidy
cd $(TOOLS_DIR); go mod tidy
cd $(TEST_DIR); go mod tidy

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

tilt_helper_dockerfile_header = """
# Tilt image
FROM golang:1.24.7 as tilt-helper
FROM golang:1.25.3 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.24
RUN go install github.com/go-delve/delve/cmd/dlv@v1.25
# 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 @@ -183,7 +183,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
"""

tilt_dockerfile_header = """
FROM golang:1.24.7 as tilt
FROM golang:1.25.3 as tilt
WORKDIR /
COPY --from=tilt-helper /process.txt .
COPY --from=tilt-helper /start.sh .
Expand Down
154 changes: 0 additions & 154 deletions api/addons/v1beta1/conversion.go

This file was deleted.

108 changes: 0 additions & 108 deletions api/addons/v1beta1/conversion_test.go

This file was deleted.

Loading