Skip to content
Closed
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/actions/gen-install-scripts/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.24
FROM golang:1.25

ENV KUBECTL_VERSION 1.18.12
ENV KUSTOMIZE_VERSION 5.7.0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.post-install
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.23 as builder
FROM golang:1.25 as builder

ENV CGO_ENABLED=0
ENV GOOS=linux
Expand Down
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ HELM_REPO_URL = "https://mongodb.github.io/helm-charts"
HELM_AKO_INSTALL_NAME = local-ako-install
HELM_AKO_NAMESPACE = $(OPERATOR_NAMESPACE)

GO_BIN := $(shell go env GOPATH)/bin

.DEFAULT_GOAL := help
.PHONY: help
help: ## Show this help screen
Expand All @@ -169,7 +171,6 @@ build-licenses.csv: go.mod ## Track licenses in a CSV file
@echo "========================================"
export GOOS=linux
export GOARCH=amd64
GOTOOLCHAIN=local \
go run github.com/google/$(GO_LICENSES)@v$(GO_LICENSES_VERSION) csv --include_tests $(BASE_GO_PACKAGE)/... > licenses.csv
echo $(GOMOD_SHA) > $(LICENSES_GOMOD_SHA_FILE)

Expand All @@ -180,15 +181,14 @@ check-licenses: ## Check licenses are compliant with our restrictions
@echo "============================================"
export GOOS=linux
export GOARCH=amd64
GOTOOLCHAIN=local \
go run github.com/google/$(GO_LICENSES)@v$(GO_LICENSES_VERSION) check --include_tests \
--disallowed_types $(DISALLOWED_LICENSES) $(BASE_GO_PACKAGE)/...
@echo "--------------------"
@echo "Licenses check: PASS"

.PHONY: unit-test
unit-test:
go test -race -cover $(GO_UNIT_TEST_FOLDERS)
CGO_ENABLED=0 go test -race -cover $(GO_UNIT_TEST_FOLDERS)

## Run integration tests. Sample with labels: `make test/int GINKGO_FILTER_LABEL=AtlasProject`
test/int: envtest
Expand Down Expand Up @@ -279,7 +279,8 @@ generate: ${GO_SOURCES} ## Generate code
ifdef EXPERIMENTAL
controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./internal/nextapi/v1/..."
endif
mockery
go install github.com/vektra/mockery/[email protected]
$(GO_BIN)/mockery
$(MAKE) fmt

.PHONY: check-missing-files
Expand Down
5 changes: 2 additions & 3 deletions devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"yq-go@latest",
"[email protected]",
"jq@latest",
"path:flakes/go",
"github:NixOS/nixpkgs/nixpkgs-unstable#go",
"gotests@latest",
"act@latest",
"kubectl@latest",
Expand All @@ -19,11 +19,10 @@
"ginkgo@latest",
"[email protected]",
"shellcheck@latest",
"golangci-lint@2.0.0",
"github:NixOS/nixpkgs/nixpkgs-unstable#golangci-lint",
"[email protected]",
"[email protected]",
"awscli2@latest",
"go-mockery@2",
"docker-sbom@latest",
"openshift@latest",
"gci@latest"
Expand Down
100 changes: 6 additions & 94 deletions devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -529,101 +529,13 @@
"last_modified": "2025-09-13T06:53:53Z",
"resolved": "github:NixOS/nixpkgs/6d7ec06d6868ac6d94c371458fc2391ded9ff13d?lastModified=1757746433&narHash=sha256-fEvTiU4s9lWgW7mYEU%2F1QUPirgkn%2BodUBTaindgiziY%3D"
},
"go-mockery@2": {
"last_modified": "2025-07-13T22:45:35Z",
"resolved": "github:NixOS/nixpkgs/a421ac6595024edcfbb1ef950a3712b89161c359#go-mockery",
"source": "devbox-search",
"version": "2.53.3",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/gymm44dbi3sp824ghj28z7xdp5y0z8ij-go-mockery-2.53.3",
"default": true
}
],
"store_path": "/nix/store/gymm44dbi3sp824ghj28z7xdp5y0z8ij-go-mockery-2.53.3"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/7almddm7x5spkllll4avz0fd19slcvvj-go-mockery-2.53.3",
"default": true
}
],
"store_path": "/nix/store/7almddm7x5spkllll4avz0fd19slcvvj-go-mockery-2.53.3"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/xxd8ynzjqi4v0jahgzs9k45mj0ymcsns-go-mockery-2.53.3",
"default": true
}
],
"store_path": "/nix/store/xxd8ynzjqi4v0jahgzs9k45mj0ymcsns-go-mockery-2.53.3"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/p7cdcd71qnf8k6h1fyrsx42a768w02c2-go-mockery-2.53.3",
"default": true
}
],
"store_path": "/nix/store/p7cdcd71qnf8k6h1fyrsx42a768w02c2-go-mockery-2.53.3"
}
}
"github:NixOS/nixpkgs/nixpkgs-unstable#go": {
"last_modified": "2025-09-18T16:33:27Z",
"resolved": "github:NixOS/nixpkgs/f4b140d5b253f5e2a1ff4e5506edbf8267724bde?lastModified=1758213207&narHash=sha256-rqoqF0LEi%2B6ZT59tr%2BhTQlxVwrzQsET01U4uUdmqRtM%3D#go"
},
"[email protected]": {
"last_modified": "2025-03-25T17:32:05Z",
"resolved": "github:NixOS/nixpkgs/25d1b84f5c90632a623c48d83a2faf156451e6b1#golangci-lint",
"source": "devbox-search",
"version": "2.0.0",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/idv9cyl4i6w9n4sgc29kvqhywm04n1rz-golangci-lint-2.0.0",
"default": true
}
],
"store_path": "/nix/store/idv9cyl4i6w9n4sgc29kvqhywm04n1rz-golangci-lint-2.0.0"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/r0jxwvqvk2999dx04v3j9jgd46jscqc4-golangci-lint-2.0.0",
"default": true
}
],
"store_path": "/nix/store/r0jxwvqvk2999dx04v3j9jgd46jscqc4-golangci-lint-2.0.0"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/lsyy8arab3zvkpi8lr9303mf88y5k1rc-golangci-lint-2.0.0",
"default": true
}
],
"store_path": "/nix/store/lsyy8arab3zvkpi8lr9303mf88y5k1rc-golangci-lint-2.0.0"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/834gvbmhpwvy1d65r5x4xihkxm4g91ab-golangci-lint-2.0.0",
"default": true
}
],
"store_path": "/nix/store/834gvbmhpwvy1d65r5x4xihkxm4g91ab-golangci-lint-2.0.0"
}
}
"github:NixOS/nixpkgs/nixpkgs-unstable#golangci-lint": {
"last_modified": "2025-09-16T13:27:06Z",
"resolved": "github:NixOS/nixpkgs/08b8f92ac6354983f5382124fef6006cade4a1c1?lastModified=1758029226&narHash=sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI%3D#golangci-lint"
},
"gotests@latest": {
"last_modified": "2025-07-28T17:09:23Z",
Expand Down
2 changes: 1 addition & 1 deletion fast.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TODO: Eventually replace main Dockerfile
FROM golang:1.24 AS certs-source
FROM golang:1.25 AS certs-source
ARG GOTOOLCHAIN=auto

# Using rolling tag to stay on latest UBI 9
Expand Down
60 changes: 0 additions & 60 deletions flakes/go/flake.lock

This file was deleted.

23 changes: 0 additions & 23 deletions flakes/go/flake.nix

This file was deleted.

4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/mongodb/mongodb-atlas-kubernetes/v2

go 1.24.0

toolchain go1.24.7
go 1.25

require (
cloud.google.com/go/kms v1.23.0
Expand Down
2 changes: 1 addition & 1 deletion test/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Please push to quay.io/mongodb/mongodb-atlas-kubernetes-operator-test-app:v1

# Build the manager binary
FROM golang:1.24 as builder
FROM golang:1.25 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion test/app/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/mongodb/mongodb-atlas-kubernetes/test/app

go 1.24
go 1.25

require (
github.com/gorilla/mux v1.8.0
Expand Down
2 changes: 2 additions & 0 deletions test/helper/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import (
// If the command fails to run, the given test is being failed immediately.
func RunCommand(t *testing.T, name string, args ...string) io.Reader {
var result bytes.Buffer
// disabling linter: no need to pass context on a helper
// nolint:noctx
cmd := exec.Command(name, args...)
cmd.Stdout = &result
cmd.Stderr = &result
Expand Down
2 changes: 2 additions & 0 deletions test/helper/e2e/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ func ExecuteWithoutWriter(command string, args ...string) *gexec.Session {
}

func ExecuteCommand(reporter io.Writer, command string, args ...string) *gexec.Session {
// disabling linter: no need to pass context on a helper
// nolint:noctx
cmd := exec.Command(command, args...)
session, _ := gexec.Start(cmd, reporter, reporter)
return session
Expand Down
3 changes: 2 additions & 1 deletion test/helper/e2e2/operator/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ func NewOperator(env []string, stdout, stderr io.Writer, cmdArgs ...string) Oper
return NewEmbeddedOperator(run.Run, cmdArgs)
}
cmdLine := append(operatorCommand(), cmdArgs...)
//nolint:gosec
// disabling linter: no need to pass context on a helper
// nolint:gosec,noctx
cmd := exec.Command(cmdLine[0], cmdLine[1:]...)

// works around https://github.com/golang/go/issues/40467
Expand Down
4 changes: 2 additions & 2 deletions tools/ako2api/devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
}
},
"github:NixOS/nixpkgs/nixpkgs-unstable": {
"last_modified": "2025-09-05T01:14:44Z",
"resolved": "github:NixOS/nixpkgs/ca77296380960cd497a765102eeb1356eb80fed0?lastModified=1757034884&narHash=sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao%3D"
"last_modified": "2025-09-16T13:27:06Z",
"resolved": "github:NixOS/nixpkgs/08b8f92ac6354983f5382124fef6006cade4a1c1?lastModified=1758029226&narHash=sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI%3D"
},
"go@latest": {
"last_modified": "2025-07-28T17:09:23Z",
Expand Down
2 changes: 1 addition & 1 deletion tools/ako2api/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/mongodb/mongodb-atlas-kubernetes/tools/ako2api

go 1.24.7
go 1.25.1

require (
github.com/stretchr/testify v1.10.0
Expand Down
2 changes: 1 addition & 1 deletion tools/clean/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module tools/clean

go 1.24.0
go 1.25.1

require (
cloud.google.com/go/compute v1.46.0
Expand Down
2 changes: 1 addition & 1 deletion tools/crd2go/.github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.24'
go-version: '1.25'

- name: Build
run: go build -v ./...
Expand Down
2 changes: 1 addition & 1 deletion tools/crd2go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/mongodb/mongodb-atlas-kubernetes/tools/crd2go

go 1.24.3
go 1.25.1

require (
github.com/dave/jennifer v1.7.1
Expand Down
2 changes: 1 addition & 1 deletion tools/makejwt/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module tools/makejwt

go 1.24
go 1.25

require github.com/golang-jwt/jwt/v5 v5.3.0
2 changes: 1 addition & 1 deletion tools/metrics/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module tools/metrics

go 1.24
go 1.25

require (
github.com/google/go-github/v57 v57.0.0
Expand Down
Loading