From ec9e7a642a028abecdfe8ed1eac2f3c92bd3352d Mon Sep 17 00:00:00 2001 From: Anson Qian Date: Wed, 11 Mar 2026 19:44:35 -0400 Subject: [PATCH] chore: update AKSFlexNode to v0.0.17 and adjust Kubernetes version in user data templates --- cli/go.mod | 3 ++- cli/go.sum | 6 ++++-- cli/internal/config/nodebootstrap/nodebootstrap.go | 4 ++-- karpenter/go.mod | 3 ++- karpenter/go.sum | 6 ++++-- plugin/go.mod | 3 ++- plugin/go.sum | 6 ++++-- plugin/pkg/services/agentpools/userdata/flex/flex.go | 6 +++--- plugin/pkg/services/agentpools/userdata/ubuntu/ubuntu.go | 4 ++-- 9 files changed, 25 insertions(+), 16 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 05142cb..a27974d 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -23,7 +23,7 @@ require ( require ( buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1 // indirect - github.com/Azure/AKSFlexNode v0.0.16 // indirect + github.com/Azure/AKSFlexNode v0.0.17 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v7 v7.3.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v8 v8.2.0 // indirect @@ -62,6 +62,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.0 // indirect github.com/google/gnostic-models v0.7.0 // indirect + github.com/google/renameio/v2 v2.0.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index a4a1671..46b1372 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1,7 +1,7 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1 h1:4erM3WLgEG/HIBrpBDmRbs1puhd7p0z7kNXDuhHthwM= buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1/go.mod h1:novQBstnxcGpfKf8qGRATqn1anQKwMJIbH5Q581jibU= -github.com/Azure/AKSFlexNode v0.0.16 h1:f9lDFt+yV3sQMEvhGUIkPFqLL2opUTtyGFgbHTdqIQg= -github.com/Azure/AKSFlexNode v0.0.16/go.mod h1:qwNqscqJII+OQM5102L8qArjo9EttWkZKBplF+55eMI= +github.com/Azure/AKSFlexNode v0.0.17 h1:JUhJdNty03Cs0nMpQyulpB6i4O716cfjCtg7lmg8L10= +github.com/Azure/AKSFlexNode v0.0.17/go.mod h1:qwNqscqJII+OQM5102L8qArjo9EttWkZKBplF+55eMI= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4= @@ -119,6 +119,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 h1:EEHtgt9IwisQ2AZ4pIsMjahcegHh6rmhqxzIRQIyepY= github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U= +github.com/google/renameio/v2 v2.0.2 h1:qKZs+tfn+arruZZhQ7TKC/ergJunuJicWS6gLDt/dGw= +github.com/google/renameio/v2 v2.0.2/go.mod h1:OX+G6WHHpHq3NVj7cAOleLOwJfcQ1s3uUJQCrr78SWo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 h1:FbSCl+KggFl+Ocym490i/EyXF4lPgLoUtcSWquBM0Rs= diff --git a/cli/internal/config/nodebootstrap/nodebootstrap.go b/cli/internal/config/nodebootstrap/nodebootstrap.go index 753472d..e6c6d84 100644 --- a/cli/internal/config/nodebootstrap/nodebootstrap.go +++ b/cli/internal/config/nodebootstrap/nodebootstrap.go @@ -33,8 +33,8 @@ func init() { Command.Flags().BoolVar(&flagEnableNvidiaGPURuntime, "nvidia-gpu", false, "Enable Nvidia GPU runtime in containerd configuration.") Command.Flags().StringVar(&flagArch, "arch", "amd64", "CPU architecture for the flex node binary (e.g. amd64, arm64).") - Command.Flags().StringVar(&flagKubeVersion, "k8s-version", "1.33.3", - "Kubernetes version for the downloaded binaries (e.g. 1.33.3).") + Command.Flags().StringVar(&flagKubeVersion, "k8s-version", flex.DefaultKubeVer, + "Kubernetes version for the downloaded binaries.") Command.Flags().StringVar(&flagVariant, "variant", variantCloudInit, fmt.Sprintf("Output variant: %q produces cloud-init YAML user data, %q produces an equivalent standalone bash script.", variantCloudInit, variantScript)) } diff --git a/karpenter/go.mod b/karpenter/go.mod index 90d0539..477dee7 100644 --- a/karpenter/go.mod +++ b/karpenter/go.mod @@ -22,7 +22,7 @@ require ( require ( buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250425153114-8976f5be98c1.1 // indirect - github.com/Azure/AKSFlexNode v0.0.16 // indirect + github.com/Azure/AKSFlexNode v0.0.17 // indirect github.com/Azure/aks-middleware v0.0.42 // indirect github.com/Azure/azure-kusto-go v0.16.1 // indirect github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect @@ -120,6 +120,7 @@ require ( github.com/google/btree v1.1.3 // indirect github.com/google/gnostic-models v0.7.1 // indirect github.com/google/go-cmp v0.7.0 // indirect + github.com/google/renameio/v2 v2.0.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect diff --git a/karpenter/go.sum b/karpenter/go.sum index 63aeeb6..1bad2d2 100644 --- a/karpenter/go.sum +++ b/karpenter/go.sum @@ -2,8 +2,8 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-2025042515311 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250425153114-8976f5be98c1.1/go.mod h1:avRlCjnFzl98VPaeCtJ24RrV/wwHFzB8sWXhj26+n/U= dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= -github.com/Azure/AKSFlexNode v0.0.16 h1:f9lDFt+yV3sQMEvhGUIkPFqLL2opUTtyGFgbHTdqIQg= -github.com/Azure/AKSFlexNode v0.0.16/go.mod h1:qwNqscqJII+OQM5102L8qArjo9EttWkZKBplF+55eMI= +github.com/Azure/AKSFlexNode v0.0.17 h1:JUhJdNty03Cs0nMpQyulpB6i4O716cfjCtg7lmg8L10= +github.com/Azure/AKSFlexNode v0.0.17/go.mod h1:qwNqscqJII+OQM5102L8qArjo9EttWkZKBplF+55eMI= github.com/Azure/aks-middleware v0.0.42 h1:StRGz6OuQi6mht5LV9uwhWn74kEsFP1wvpYQnyUOKHM= github.com/Azure/aks-middleware v0.0.42/go.mod h1:7Y+wxZmS7p1K0FPreiO3+6Wr8YhYjWz9c50YohDQIQ4= github.com/Azure/azure-kusto-go v0.16.1 h1:vCBWcQghmC1qIErUUgVNWHxGhZVStu1U/hki6iBA14k= @@ -262,6 +262,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc= github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= +github.com/google/renameio/v2 v2.0.2 h1:qKZs+tfn+arruZZhQ7TKC/ergJunuJicWS6gLDt/dGw= +github.com/google/renameio/v2 v2.0.2/go.mod h1:OX+G6WHHpHq3NVj7cAOleLOwJfcQ1s3uUJQCrr78SWo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 h1:sGm2vDRFUrQJO/Veii4h4zG2vvqG6uWNkBHSTqXOZk0= diff --git a/plugin/go.mod b/plugin/go.mod index 2c35069..63852a3 100644 --- a/plugin/go.mod +++ b/plugin/go.mod @@ -3,7 +3,7 @@ module github.com/Azure/aks-flex/plugin go 1.26.0 require ( - github.com/Azure/AKSFlexNode v0.0.16 + github.com/Azure/AKSFlexNode v0.0.17 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v7 v7.3.0 @@ -63,6 +63,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.0 // indirect github.com/google/gnostic-models v0.7.0 // indirect + github.com/google/renameio/v2 v2.0.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 // indirect github.com/josharian/intern v1.0.0 // indirect diff --git a/plugin/go.sum b/plugin/go.sum index c7c0e57..619acde 100644 --- a/plugin/go.sum +++ b/plugin/go.sum @@ -1,7 +1,7 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1 h1:4erM3WLgEG/HIBrpBDmRbs1puhd7p0z7kNXDuhHthwM= buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1/go.mod h1:novQBstnxcGpfKf8qGRATqn1anQKwMJIbH5Q581jibU= -github.com/Azure/AKSFlexNode v0.0.16 h1:f9lDFt+yV3sQMEvhGUIkPFqLL2opUTtyGFgbHTdqIQg= -github.com/Azure/AKSFlexNode v0.0.16/go.mod h1:qwNqscqJII+OQM5102L8qArjo9EttWkZKBplF+55eMI= +github.com/Azure/AKSFlexNode v0.0.17 h1:JUhJdNty03Cs0nMpQyulpB6i4O716cfjCtg7lmg8L10= +github.com/Azure/AKSFlexNode v0.0.17/go.mod h1:qwNqscqJII+OQM5102L8qArjo9EttWkZKBplF+55eMI= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4= @@ -118,6 +118,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 h1:EEHtgt9IwisQ2AZ4pIsMjahcegHh6rmhqxzIRQIyepY= github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U= +github.com/google/renameio/v2 v2.0.2 h1:qKZs+tfn+arruZZhQ7TKC/ergJunuJicWS6gLDt/dGw= +github.com/google/renameio/v2 v2.0.2/go.mod h1:OX+G6WHHpHq3NVj7cAOleLOwJfcQ1s3uUJQCrr78SWo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 h1:FbSCl+KggFl+Ocym490i/EyXF4lPgLoUtcSWquBM0Rs= diff --git a/plugin/pkg/services/agentpools/userdata/flex/flex.go b/plugin/pkg/services/agentpools/userdata/flex/flex.go index 8e704d3..a1bd145 100644 --- a/plugin/pkg/services/agentpools/userdata/flex/flex.go +++ b/plugin/pkg/services/agentpools/userdata/flex/flex.go @@ -27,9 +27,9 @@ var bootstrapTmpl string var bootstrapTemplate = template.Must(template.New("bootstrap.sh").Parse(bootstrapTmpl)) const ( - flexNodeVersion = "v0.0.16" + flexNodeVersion = "v0.0.17" defaultArch = "amd64" - defaultKubeVer = "1.34.2" + DefaultKubeVer = "1.34.2" ) // Options configures how the flex node userdata is generated. @@ -65,7 +65,7 @@ func WithKubeadmConfig(cfg *kubeadmapi.Config) Option { func defaultOptions() *Options { return &Options{ - KubeVersion: defaultKubeVer, + KubeVersion: DefaultKubeVer, Arch: defaultArch, } } diff --git a/plugin/pkg/services/agentpools/userdata/ubuntu/ubuntu.go b/plugin/pkg/services/agentpools/userdata/ubuntu/ubuntu.go index b6a1e9a..3bd7dbc 100644 --- a/plugin/pkg/services/agentpools/userdata/ubuntu/ubuntu.go +++ b/plugin/pkg/services/agentpools/userdata/ubuntu/ubuntu.go @@ -28,8 +28,8 @@ func UserData(kubeadmConfig *kubeadmapi.Config) (*cloudinit.UserData, error) { APT: &cloudinit.APT{ Sources: map[string]*cloudinit.APTSource{ "kubernetes": { - Source: "deb https://pkgs.k8s.io/core:/stable:/v1.33/deb/ /", - KeyID: "DE15B14486CD377B9E876E1A234654DA9A296436", // curl -sL https://pkgs.k8s.io/core:/stable:/v1.33/deb/Release.key | gpg --show-keys + Source: "deb https://pkgs.k8s.io/core:/stable:/v1.34/deb/ /", + KeyID: "DE15B14486CD377B9E876E1A234654DA9A296436", // curl -sL https://pkgs.k8s.io/core:/stable:/v1.34/deb/Release.key | gpg --show-keys }, }, },