From 31ab57bddb6b900cd11333029e58ce4a6ebcf88d Mon Sep 17 00:00:00 2001 From: Gianluca Mardente Date: Mon, 11 May 2026 21:37:06 +0200 Subject: [PATCH] (bug) set agent-in-mgmt-cluster also for the init containers When in agentless mode, set correct option for addon-controller init container This PR also advances to golang v1.26.3 --- .github/workflows/main.yaml | 6 +++--- Dockerfile | 2 +- go.mod | 4 ++-- go.sum | 6 ++---- hack/tools/go.mod | 2 +- internal/controller/utils.go | 16 ++++++++++++++++ 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 9ab8690..7e0e1f0 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0 with: - go-version: 1.26.2 + go-version: 1.26.3 - name: Build run: make build - name: FMT @@ -37,7 +37,7 @@ jobs: - name: Set up Go uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0 with: - go-version: 1.26.2 + go-version: 1.26.3 - name: ut run: make test env: @@ -50,7 +50,7 @@ jobs: - name: Set up Go uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0 with: - go-version: 1.26.2 + go-version: 1.26.3 - name: fv run: make create-cluster fv env: diff --git a/Dockerfile b/Dockerfile index 1f3b5c2..852d117 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.26.2 AS builder +FROM golang:1.26.3 AS builder ARG BUILDOS ARG TARGETARCH diff --git a/go.mod b/go.mod index 9d87db4..4dbaa55 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/projectsveltos/shard-controller -go 1.26.2 +go 1.26.3 require ( github.com/TwiN/go-color v1.4.1 @@ -11,7 +11,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/projectsveltos/libsveltos v1.9.0 github.com/spf13/pflag v1.0.10 - golang.org/x/text v0.36.0 + golang.org/x/text v0.37.0 k8s.io/api v0.36.0 k8s.io/apiextensions-apiserver v0.36.0 k8s.io/apimachinery v0.36.0 diff --git a/go.sum b/go.sum index 839bffd..16fb40d 100644 --- a/go.sum +++ b/go.sum @@ -196,8 +196,8 @@ golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY= golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY= -golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= -golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= @@ -241,8 +241,6 @@ k8s.io/kube-openapi v0.0.0-20260427204847-8949caaa1199 h1:sWu4Td5mgJlwunsUydnhKE k8s.io/kube-openapi v0.0.0-20260427204847-8949caaa1199/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0= k8s.io/streaming v0.36.0 h1:agnTxU+NFulUrtYzXUGKO3ndEa8jKwht1Kwn9nu9x+4= k8s.io/streaming v0.36.0/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s= -k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 h1:kBawHLSnx/mYHmRnNUf9d4CpjREbeZuxoSGOX/J+aYM= -k8s.io/utils v0.0.0-20260319190234-28399d86e0b5/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk= k8s.io/utils v0.0.0-20260507154919-ff6756f316d2 h1:wU4tMEhLGgIbLvXQb1cfN+EcM0wf7zC6CPF+C79jroc= k8s.io/utils v0.0.0-20260507154919-ff6756f316d2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 h1:hSfpvjjTQXQY2Fol2CS0QHMNs/WI1MOSGzCm1KhM5ec= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index eae57ca..97d5633 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module github.com/projectsveltos/addon-controller/hack/tools -go 1.26.2 +go 1.26.3 require ( github.com/a8m/envsubst v1.4.3 diff --git a/internal/controller/utils.go b/internal/controller/utils.go index f754337..3aefb6c 100644 --- a/internal/controller/utils.go +++ b/internal/controller/utils.go @@ -499,6 +499,22 @@ func setOptions(deplTemplate []byte) ([]byte, error) { "--agent-in-mgmt-cluster=true") } + for i := range depl.Spec.Template.Spec.InitContainers { + for j := range depl.Spec.Template.Spec.InitContainers[i].Args { + args := &depl.Spec.Template.Spec.InitContainers[i].Args[j] + if strings.Contains(*args, "agent-in-mgmt-cluster") { + lastIdx := len(depl.Spec.Template.Spec.InitContainers[i].Args) - 1 + depl.Spec.Template.Spec.InitContainers[i].Args[j] = depl.Spec.Template.Spec.InitContainers[i].Args[lastIdx] + depl.Spec.Template.Spec.InitContainers[i].Args = depl.Spec.Template.Spec.InitContainers[i].Args[:lastIdx] + break + } + } + + depl.Spec.Template.Spec.InitContainers[i].Args = append( + depl.Spec.Template.Spec.InitContainers[i].Args, + "--agent-in-mgmt-cluster=true") + } + // Create a buffer to store the encoded JSON data. buffer := bytes.NewBuffer([]byte{})