chore: automated PR to update ReleaseNotes for 202411.03.0 VHD

.devcontainer/devcontainer.json

@@ -3,9 +3,10 @@
 {
 	"name": "Go",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/go:1-1.20-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/go:1-1.22-bullseye",
 	"features": {
-		"ghcr.io/devcontainers-contrib/features/protoc:1": {}
+		"ghcr.io/devcontainers-contrib/features/protoc:1": {},
+		"ghcr.io/devcontainers/features/azure-cli:1": {}
 	},
 
 	// Features to add to the dev container. More info: https://containers.dev/features.

.github/renovate.json

@@ -87,6 +87,13 @@
     {
       "matchPackageNames": ["moby-runc", "moby-containerd"],
       "extractVersion": "^v?(?<version>.+)$"
+    },
+    {      
+      "matchPackageNames": ["aks/aks-gpu-cuda", "aks/aks-gpu-grid"],      
+      "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-(?<prerelease>\\d{14})$",
+      "automerge": false,      
+      "enabled": true,
+      "ignoreUnstable": false
     }
   ],
   "customManagers": [

.github/workflows/golangci-lint.yml

@@ -4,6 +4,10 @@ on:
     branches:
       - master
       - main
+  pull_request:
+    branches:
+      - master
+      - main
 
 permissions:
   contents: read

.pipelines/.vsts-vhd-automation.yaml

@@ -5,6 +5,10 @@ parameters:
 - name: VHD_BUILD_ID
   displayName: VHD Build ID
   type: string
+- name: PRTargetBranch
+  displayName: PR Target Branch
+  type: string
+  default: master
 - name: ImageBump
   displayName: Image Bump + Create Official Branch
   type: boolean
@@ -43,6 +47,7 @@ stages:
           GITHUB_PAT: $(GITHUB_PAT)
           IMAGE_VERSION: $(IMAGE_VERSION)
           VHD_BUILD_ID: ${{ parameters.VHD_BUILD_ID }}
+          PR_TARGET_BRANCH: ${{ parameters.PRTargetBranch }}
         displayName: 'Bump image version and create official branch'
   - stage: generate_release_notes
     dependsOn: []
@@ -66,6 +71,7 @@ stages:
           IMAGE_VERSION: $(IMAGE_VERSION)
           VHD_BUILD_ID: ${{ parameters.VHD_BUILD_ID }}
           SKIP_LATEST: $(SKIP_LATEST_RELEASE_NOTES_UPDATE)
+          PR_TARGET_BRANCH: ${{ parameters.PRTargetBranch }}
         displayName: 'Generate release notes'
   - stage: create_release
     dependsOn: []

.pipelines/.vsts-vhd-builder.yaml

@@ -4,6 +4,7 @@ pr:
   branches:
     include:
     - master
+    - dev
   paths:
     include:
     - schemas

.pipelines/e2e.yaml

@@ -3,11 +3,13 @@ trigger:
   branches:
     include:
       - master
+      - dev
 pr:
   branches:
     include:
       - master
       - official/*
+      - dev
   paths:
     include:
       - .pipelines/e2e.yaml

.pipelines/templates/.set-image-version-template.yaml

@@ -7,7 +7,12 @@ parameters:
 
 steps:
 - bash: |
-    [ -n "$IMAGE_VERSION_OVERRIDE" ] && echo "IMAGE_VERSION_OVERRIDE is set to $IMAGE_VERSION_OVERRIDE" && exit 0
+    if [ -n "$IMAGE_VERSION_OVERRIDE" ]; then
+      echo "IMAGE_VERSION_OVERRIDE is set to $IMAGE_VERSION_OVERRIDE"
+      echo "##vso[task.setvariable variable=IMAGE_VERSION]$IMAGE_VERSION_OVERRIDE"
+      exit 0
+    fi
+
     source vhdbuilder/scripts/automate_generate_version.sh
     echo "setting image version to $GENERATED_IMAGE_VERSION"
     echo "##vso[task.setvariable variable=IMAGE_VERSION]$GENERATED_IMAGE_VERSION"

Makefile

@@ -180,11 +180,11 @@ endif
 ginkgoBuild: generate
 	make -C ./test/e2e ginkgo-build
 
-test: test-node-bootstrapper
+test: test-aks-node-controller
 	go test ./...
 
-test-node-bootstrapper:
-	pushd node-bootstrapper && go test ./... && popd
+test-aks-node-controller:
+	pushd aks-node-controller && go test ./... && popd
 
 .PHONY: test-style
 test-style: validate-go validate-shell validate-copyright-headers

aks-node-controller/.gitignore

@@ -0,0 +1 @@
+aks-node-controller

node-bootstrapper/app.go → aks-node-controller/app.go

@@ -12,8 +12,8 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/Azure/agentbaker/node-bootstrapper/parser"
-	nbcontractv1 "github.com/Azure/agentbaker/pkg/proto/nbcontract/v1"
+	"github.com/Azure/agentbaker/aks-node-controller/parser"
+	aksnodeconfigv1 "github.com/Azure/agentbaker/pkg/proto/aksnodeconfig/v1"
 )
 
 type App struct {
@@ -31,13 +31,13 @@ type ProvisionFlags struct {
 }
 
 func (a *App) Run(ctx context.Context, args []string) int {
-	slog.Info("node-bootstrapper started")
+	slog.Info("aks-node-controller started")
 	err := a.run(ctx, args)
 	exitCode := errToExitCode(err)
 	if exitCode == 0 {
-		slog.Info("node-bootstrapper finished successfully")
+		slog.Info("aks-node-controller finished successfully")
 	} else {
-		slog.Error("node-bootstrapper failed", "error", err)
+		slog.Error("aks-node-controller failed", "error", err)
 	}
 	return exitCode
 }
@@ -69,7 +69,7 @@ func (a *App) Provision(ctx context.Context, flags ProvisionFlags) error {
 		return fmt.Errorf("open proision file %s: %w", flags.ProvisionConfig, err)
 	}
 
-	config := &nbcontractv1.Configuration{}
+	config := &aksnodeconfigv1.Configuration{}
 	err = json.Unmarshal(inputJSON, config)
 	if err != nil {
 		return fmt.Errorf("unmarshal provision config: %w", err)

node-bootstrapper/app_test.go → aks-node-controller/app_test.go

@@ -43,12 +43,12 @@ func TestApp_Run(t *testing.T) {
 	}{
 		{
 			name:     "missing command argument",
-			args:     []string{"node-bootstrapper"},
+			args:     []string{"aks-node-controller"},
 			wantExit: 1,
 		},
 		{
 			name:     "unknown command",
-			args:     []string{"node-bootstrapper", "unknown"},
+			args:     []string{"aks-node-controller", "unknown"},
 			wantExit: 1,
 		},
 		{
@@ -58,7 +58,7 @@ func TestApp_Run(t *testing.T) {
 		},
 		{
 			name: "provision command with valid flag",
-			args: []string{"node-bootstrapper", "provision", "--provision-config=parser/testdata/test_nbc.json"},
+			args: []string{"aks-node-controller", "provision", "--provision-config=parser/testdata/test_nbc.json"},
 			setupMocks: func(mc *MockCmdRunner) {
 				mc.RunFunc = func(cmd *exec.Cmd) error {
 					return nil
@@ -68,7 +68,7 @@ func TestApp_Run(t *testing.T) {
 		},
 		{
 			name: "provision command with command runner error",
-			args: []string{"node-bootstrapper", "provision", "--provision-config=parser/testdata/test_nbc.json"},
+			args: []string{"aks-node-controller", "provision", "--provision-config=parser/testdata/test_nbc.json"},
 			setupMocks: func(mc *MockCmdRunner) {
 				mc.RunFunc = func(cmd *exec.Cmd) error {
 					return &ExitError{Code: 666}

node-bootstrapper/go.mod → aks-node-controller/go.mod

@@ -1,4 +1,4 @@
-module github.com/Azure/agentbaker/node-bootstrapper
+module github.com/Azure/agentbaker/aks-node-controller
 
 go 1.22.2
 

node-bootstrapper/main.go → aks-node-controller/main.go

@@ -10,7 +10,7 @@ import (
 // Some options are intentionally non-configurable to avoid customization by users
 // it will help us to avoid introducing any breaking changes in the future.
 const (
-	LogFile = "/var/log/azure/node-bootstrapper.log"
+	LogFile = "/var/log/azure/aks-node-controller.log"
 )
 
 func main() {