diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98d2517f..d4d6a4e3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,7 +37,7 @@ jobs: - name: Setup uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: 1.24.x + go-version-file: 'go.mod' cache: true - name: Test diff --git a/Dockerfile b/Dockerfile index 6452c251..5f56d7f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.24 as builder +FROM golang:1.25 AS builder ARG VERSION WORKDIR /workspace diff --git a/Makefile b/Makefile index d072a105..d6280692 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.16.1 +CONTROLLER_TOOLS_VERSION ?= v0.19.0 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/go.mod b/go.mod index f32ca8b3..0c6463f4 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/gitops-tools/gitopssets-controller -go 1.24.0 - -toolchain go1.24.2 +go 1.25.0 require ( dario.cat/mergo v1.0.2 @@ -10,7 +8,7 @@ require ( github.com/cyphar/filepath-securejoin v0.4.1 github.com/fluxcd/image-reflector-controller/api v0.35.2 github.com/fluxcd/kustomize-controller/api v1.6.1 - github.com/fluxcd/pkg/apis/event v0.18.0 + github.com/fluxcd/pkg/apis/event v0.19.0 github.com/fluxcd/pkg/apis/meta v1.18.0 github.com/fluxcd/pkg/http/fetch v0.18.0 github.com/fluxcd/pkg/runtime v0.80.0 diff --git a/go.sum b/go.sum index 7ae0aa2d..0a158d63 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,8 @@ github.com/fluxcd/kustomize-controller/api v1.6.1 h1:8AOD+BWQwCLT+u5jgtGryZWkCes github.com/fluxcd/kustomize-controller/api v1.6.1/go.mod h1:b0i/KVz28tV8iuqlNHx7MW6ZtTcIbBELGLoKdaK+X8M= github.com/fluxcd/pkg/apis/acl v0.7.0 h1:dMhZJH+g6ZRPjs4zVOAN9vHBd1DcavFgcIFkg5ooOE0= github.com/fluxcd/pkg/apis/acl v0.7.0/go.mod h1:uv7pXXR/gydiX4MUwlQa7vS8JONEDztynnjTvY3JxKQ= -github.com/fluxcd/pkg/apis/event v0.18.0 h1:PNbWk9gvX8gMIi6VsJapnuDO+giLEeY+6olLVXvXFkk= -github.com/fluxcd/pkg/apis/event v0.18.0/go.mod h1:7S/DGboLolfbZ6stO6dcDhG1SfkPWQ9foCULvbiYpiA= +github.com/fluxcd/pkg/apis/event v0.19.0 h1:ZJU2voontkzp5rNYA4JMOu40S4tRcrWi4Do59EnyFwg= +github.com/fluxcd/pkg/apis/event v0.19.0/go.mod h1:deuIyUb6lh+Z1Ccvwwxhm1wNM3kpSo+vF1IgRnpaZfQ= github.com/fluxcd/pkg/apis/kustomize v1.11.0 h1:0IzDgxZkc4v+5SDNCvgZhfwfkdkQLPXCner7TNaJFWE= github.com/fluxcd/pkg/apis/kustomize v1.11.0/go.mod h1:j302mJGDww8cn9qvMsRQ0LJ1HPAPs/IlX7CSsoJV7BI= github.com/fluxcd/pkg/apis/meta v1.18.0 h1:ACHrMIjlcioE9GKS7NGk62KX4NshqNewr8sBwMcXABs=