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
3 changes: 2 additions & 1 deletion cli/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions cli/go.sum
Original file line number Diff line number Diff line change
@@ -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=
Expand Down Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions cli/internal/config/nodebootstrap/nodebootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
3 changes: 2 additions & 1 deletion karpenter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions karpenter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
3 changes: 2 additions & 1 deletion plugin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions plugin/go.sum
Original file line number Diff line number Diff line change
@@ -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=
Expand Down Expand Up @@ -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=
Expand Down
6 changes: 3 additions & 3 deletions plugin/pkg/services/agentpools/userdata/flex/flex.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -65,7 +65,7 @@ func WithKubeadmConfig(cfg *kubeadmapi.Config) Option {

func defaultOptions() *Options {
return &Options{
KubeVersion: defaultKubeVer,
KubeVersion: DefaultKubeVer,
Arch: defaultArch,
}
}
Expand Down
4 changes: 2 additions & 2 deletions plugin/pkg/services/agentpools/userdata/ubuntu/ubuntu.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
},
},
Expand Down
Loading