fix: allow config "v1" (#5803)

Azure · Feb 11, 2025 · 9f4e118 · 9f4e118
1 parent 694dc12
commit 9f4e118
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/aks-node-controller/README.md b/aks-node-controller/README.md
@@ -12,7 +12,7 @@ Here is an example of how to retrieve node bootstrapping parameters and use the
 
 ```go
 config := &aksnodeconfigv1.Configuration{
-    Version: "v0",
+    Version: "v1",
     // fill in the rest of the fields
 }
 customData, err := nodeconfigutils.CustomData(config)

diff --git a/aks-node-controller/app.go b/aks-node-controller/app.go
@@ -94,10 +94,16 @@ func (a *App) Provision(ctx context.Context, flags ProvisionFlags) error {
 	if err != nil {
 		return fmt.Errorf("unmarshal provision config: %w", err)
 	}
-	if config.Version != "v0" {
+	// TODO: "v0" were a mistake. We are not going to have different logic maintaining both v0 and v1
+	// Disallow "v0" after some time (allow some time to update consumers)
+	if config.Version != "v0" && config.Version != "v1" {
 		return fmt.Errorf("unsupported version: %s", config.Version)
 	}
 
+	if config.Version == "v0" {
+		slog.Error("v0 version is deprecated, please use v1 instead")
+	}
+
 	cmd, err := parser.BuildCSECmd(ctx, config)
 	if err != nil {
 		return fmt.Errorf("build CSE command: %w", err)

diff --git a/aks-node-controller/parser/testdata/test_aksnodeconfig.json b/aks-node-controller/parser/testdata/test_aksnodeconfig.json
@@ -1,5 +1,5 @@
 {
-    "version": "v0",
+    "version": "v1",
     "bootstrapping_config": {
         "bootstrapping_auth_method": "BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN"
     },

diff --git a/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_missing.json b/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_missing.json
@@ -1,5 +1,5 @@
 {
-    "version": "v0",
+    "version": "v1",
     "bootstrapping_config": {
         "bootstrapping_auth_method": "BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN"
     },

diff --git a/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_unexpected.json b/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_unexpected.json
@@ -1,5 +1,5 @@
 {
-    "version": "v0",
+    "version": "v1",
     "bootstrapping_config": {
         "bootstrapping_auth_method": "BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN"
     },