From ab4af1e96a0e8f62a48cfdd8d80e5987584b2fb7 Mon Sep 17 00:00:00 2001 From: Khwaja Faraz Ahmed Date: Sun, 28 Sep 2025 00:25:28 +0500 Subject: [PATCH 1/8] dummy --- package/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Dockerfile b/package/Dockerfile index a8d8947e..e4966a25 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -1,5 +1,5 @@ ARG BCI=registry.suse.com/bci/bci-base:15.6 -ARG GOLANG=registry.suse.com/bci/golang:1.24 +ARG GOLANG=registry.suse.com/bci/golang:1.25 ARG ALPINE=alpine:3.22 FROM ${GOLANG} AS e2e-ginkgo From 0773071cae1398f84c064b6a379cf584567c0a3a Mon Sep 17 00:00:00 2001 From: Khwaja Faraz Ahmed Date: Sun, 28 Sep 2025 00:09:43 +0500 Subject: [PATCH 2/8] bump go version to 1.25 --- Dockerfile.dapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index dd1dde26..37cb50b3 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,7 +1,7 @@ ARG KUBECTL=rancher/kubectl:v1.33.1 FROM ${KUBECTL} AS kubectl -FROM registry.suse.com/bci/golang:1.24 +FROM registry.suse.com/bci/golang:1.25 COPY --from=kubectl /bin/kubectl /usr/local/bin/kubectl From a7b95648d63a677d7da2d785ed56ef5bd3955241 Mon Sep 17 00:00:00 2001 From: Khwaja Faraz Ahmed Date: Tue, 30 Sep 2025 21:58:42 +0500 Subject: [PATCH 3/8] update dep [rebase] Signed-off-by: Khwaja Faraz Ahmed --- go.mod | 4 ++-- pkg/apis/go.mod | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 0edb76eb..5ceb9e93 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/rancher/system-upgrade-controller -go 1.24.6 +go 1.25.0 -toolchain go1.24.7 +toolchain go1.25.1 replace ( github.com/distribution/reference => github.com/distribution/reference v0.5.0 diff --git a/pkg/apis/go.mod b/pkg/apis/go.mod index 7b4b7058..b302fea6 100644 --- a/pkg/apis/go.mod +++ b/pkg/apis/go.mod @@ -1,8 +1,8 @@ module github.com/rancher/system-upgrade-controller/pkg/apis -go 1.24.0 +go 1.25.0 -toolchain go1.24.7 +toolchain go1.25.1 require ( github.com/kubereboot/kured v1.13.1 From 4669375b7336c49c32bf74357bd614f45bab1a39 Mon Sep 17 00:00:00 2001 From: Khwaja Faraz Ahmed Date: Sun, 5 Oct 2025 23:19:29 +0500 Subject: [PATCH 4/8] Update dockerfile components Signed-off-by: Khwaja Faraz Ahmed --- Dockerfile.dapper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 37cb50b3..61a7fa29 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -19,8 +19,8 @@ RUN if [ "${ARCH:-$(go env GOARCH)}" = "amd64" ]; then \ RUN mkdir -p /usr/local/lib/docker/cli-plugins; \ curl -o /usr/local/lib/docker/cli-plugins/docker-buildx -fsSL "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64"; \ chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx -RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3 && \ - go install github.com/elastic/crd-ref-docs@v0.1.0 +RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 && \ + go install github.com/elastic/crd-ref-docs@v0.2.0 ENV DAPPER_ENV REPO TAG DRONE_TAG ENV DAPPER_SOURCE /go/src/github.com/rancher/system-upgrade-controller/ ENV DAPPER_OUTPUT ./bin ./dist From 33c9814d490d7910c3dfd6b8d677d75452941d7a Mon Sep 17 00:00:00 2001 From: Khwaja Faraz Ahmed Date: Tue, 7 Oct 2025 01:28:20 +0500 Subject: [PATCH 5/8] run go generate Signed-off-by: Khwaja Faraz Ahmed --- pkg/crds/yaml/generated/upgrade.cattle.io_plans.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/crds/yaml/generated/upgrade.cattle.io_plans.yaml b/pkg/crds/yaml/generated/upgrade.cattle.io_plans.yaml index 482d2fd1..15d67420 100644 --- a/pkg/crds/yaml/generated/upgrade.cattle.io_plans.yaml +++ b/pkg/crds/yaml/generated/upgrade.cattle.io_plans.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.3 + controller-gen.kubebuilder.io/version: v0.19.0 name: plans.upgrade.cattle.io spec: group: upgrade.cattle.io From 76f78e2cac50505d8354ae1b6e40091d8171d934 Mon Sep 17 00:00:00 2001 From: Faraz Khawaja Date: Sun, 9 Nov 2025 13:50:01 +0500 Subject: [PATCH 6/8] Update golangci version Signed-off-by: Faraz Khawaja --- Dockerfile.dapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 61a7fa29..7866c3dd 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -10,7 +10,7 @@ ENV ARCH $DAPPER_HOST_ARCH ARG SONOBUOY_VERSION=0.57.3 RUN zypper -n install expect git jq docker vim less file curl wget iproute2 gawk RUN if [ "${ARCH:-$(go env GOARCH)}" = "amd64" ]; then \ - curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.64.8; \ + curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v2.6.1; \ curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.6.0/kustomize_v5.6.0_linux_amd64.tar.gz" | tar -xz -C /usr/local/bin; \ curl -sL "https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_${ARCH}.tar.gz" | tar -xz -C /usr/local/bin; \ curl -sL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose && \ From bcc5a9add72add45b78abbc6c49238b87cf2bd61 Mon Sep 17 00:00:00 2001 From: Khwaja Faraz Ahmed Date: Tue, 11 Nov 2025 20:51:07 +0500 Subject: [PATCH 7/8] Migration golangci config to v2 Signed-off-by: Khwaja Faraz Ahmed --- .golangci.bck.json | 18 +++++++++++++++ .golangci.json | 55 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 56 insertions(+), 17 deletions(-) create mode 100644 .golangci.bck.json diff --git a/.golangci.bck.json b/.golangci.bck.json new file mode 100644 index 00000000..5ba74944 --- /dev/null +++ b/.golangci.bck.json @@ -0,0 +1,18 @@ +{ + "linters": { + "disable-all": true, + "enable": [ + "govet", + "goimports", + "misspell", + "ineffassign", + "gofmt" + ] + }, + "run": { + "exclude-files": [ + "/zz_generated_" + ], + "timeout": "5m" + } +} \ No newline at end of file diff --git a/.golangci.json b/.golangci.json index 5ba74944..c79cebd4 100644 --- a/.golangci.json +++ b/.golangci.json @@ -1,18 +1,39 @@ { - "linters": { - "disable-all": true, - "enable": [ - "govet", - "goimports", - "misspell", - "ineffassign", - "gofmt" - ] - }, - "run": { - "exclude-files": [ - "/zz_generated_" - ], - "timeout": "5m" - } -} \ No newline at end of file + "formatters": { + "enable": [ + "gofmt", + "goimports" + ], + "exclusions": { + "generated": "lax", + "paths": [ + "third_party$", + "builtin$", + "examples$" + ] + } + }, + "linters": { + "default": "none", + "enable": [ + "govet", + "ineffassign", + "misspell" + ], + "exclusions": { + "generated": "lax", + "paths": [ + "third_party$", + "builtin$", + "examples$" + ], + "presets": [ + "comments", + "common-false-positives", + "legacy", + "std-error-handling" + ] + } + }, + "version": "2" +} From f758341e737d11d60f7f2f28e3d33392d31273d7 Mon Sep 17 00:00:00 2001 From: Faraz Khawaja Date: Wed, 12 Nov 2025 01:39:04 +0500 Subject: [PATCH 8/8] Delete .golangci.bck.json --- .golangci.bck.json | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .golangci.bck.json diff --git a/.golangci.bck.json b/.golangci.bck.json deleted file mode 100644 index 5ba74944..00000000 --- a/.golangci.bck.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "linters": { - "disable-all": true, - "enable": [ - "govet", - "goimports", - "misspell", - "ineffassign", - "gofmt" - ] - }, - "run": { - "exclude-files": [ - "/zz_generated_" - ], - "timeout": "5m" - } -} \ No newline at end of file