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 .custom-gcl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# with all the plugins listed below.
#
# See: https://golangci-lint.run/plugins/module-plugins/
version: v2.12.2
version: v2.15.0
plugins:
# logcheck validates structured logging calls and parameters (e.g., balanced key-value pairs)
- module: "sigs.k8s.io/logtools"
Expand Down
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM mcr.microsoft.com/devcontainers/go:1.26-trixie@sha256:638cb8e8c040d29fbd0bb9a0d174b10aef96683437f839048d091eb337a8ea85
FROM mcr.microsoft.com/devcontainers/go:1.27-trixie@sha256:32aad7e9eefed4fe99987cc4efef2f9723bd57c556f171143ecf65e0ba855ff3

USER vscode

# Each CLI below drops its zsh completion here; the dir is on zsh's default $fpath.
RUN sudo mkdir -p /usr/local/share/zsh/site-functions

# renovate: datasource=github-releases depName=golangci/golangci-lint
ARG GOLANGCI_VERSION=v2.14.0
ARG GOLANGCI_VERSION=v2.15.0
# Fetch the install script pinned to the release tag (not HEAD) before piping to sh.
RUN curl -sSfL "https://raw.githubusercontent.com/golangci/golangci-lint/${GOLANGCI_VERSION}/install.sh" \
| sudo sh -s -- -b /usr/local/bin ${GOLANGCI_VERSION} \
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN curl -sSfLo /tmp/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/l
&& kubectl completion zsh | sudo tee /usr/local/share/zsh/site-functions/_kubectl >/dev/null

# renovate: datasource=github-releases depName=kubernetes-sigs/kustomize extractVersion=^kustomize/(?<version>v.+)$
ARG KUSTOMIZE_VERSION=v5.8.1
ARG KUSTOMIZE_VERSION=v5.8.3
RUN curl -sSfLo /tmp/kustomize.tar.gz "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" \
&& tar -C /tmp -xzf /tmp/kustomize.tar.gz kustomize \
&& sudo install -m 0755 /tmp/kustomize /usr/local/bin/kustomize \
Expand Down
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ linters:
disable:
- omitzero
- newexpr
- embedlit
exclusions:
generated: lax
rules:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ how it is built and why see [DESIGN.md](DESIGN.md).

The repository ships a devcontainer (`.devcontainer/`) with Go and the pinned tooling
(golangci-lint, kind, kubebuilder, kubectl, kustomize) already installed. Outside the
devcontainer you need Go 1.26+ and those tools on your `PATH` for the full workflow.
devcontainer you need Go 1.27+ and those tools on your `PATH` for the full workflow.

Everyday commands:

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.26@sha256:d52df9c279840adf958d017ebb275651ed8338b953d39817bc3633a2e6b1bbcc AS builder
FROM golang:1.27@sha256:2920bb124f1a2e12a1d39f0cab756ae0068441ee1da7655dec7f5e374944095b AS builder
ARG TARGETOS
ARG TARGETARCH

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint

## Tool Versions
# renovate: datasource=github-releases depName=kubernetes-sigs/kustomize extractVersion=^kustomize/(?<version>.*)$
KUSTOMIZE_VERSION ?= v5.8.1
KUSTOMIZE_VERSION ?= v5.8.3
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
CONTROLLER_TOOLS_VERSION ?= v0.21.0
CONTROLLER_TOOLS_VERSION ?= v0.23.0

#ENVTEST_VERSION is the controller-runtime version to use for setup-envtest, derived from go.mod
ENVTEST_VERSION ?= $(shell v='$(call gomodver,sigs.k8s.io/controller-runtime)'; \
Expand All @@ -211,7 +211,7 @@ ENVTEST_K8S_VERSION ?= $(shell v='$(call gomodver,k8s.io/api)'; \
printf '%s\n' "$$v" | sed -E 's/^v?[0-9]+\.([0-9]+).*/1.\1/')

# renovate: datasource=github-releases depName=golangci/golangci-lint
GOLANGCI_LINT_VERSION ?= v2.14.0
GOLANGCI_LINT_VERSION ?= v2.15.0

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.21.0
controller-gen.kubebuilder.io/version: v0.23.0
name: noderemediationpolicies.warden.scality.com
spec:
group: warden.scality.com
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/scality/node-warden-operator

go 1.26.5
go 1.27.3

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The minimum Go version is now 1.27.3, but the devcontainer still uses mcr.microsoft.com/devcontainers/go:1.26-trixie (.devcontainer/Dockerfile:1), and CONTRIBUTING.md:11 still says "Go 1.26+". Bump the devcontainer base image to 1.27-trixie. Then change the doc to "Go 1.27+" so it doesn't go stale.


require (
github.com/onsi/ginkgo/v2 v2.29.0
Expand Down
Loading