fix tilt managed cluster default k8s version

kubernetes-sigs · Oct 28, 2021 · fab59e5 · fab59e5
1 parent 82e3207
commit fab59e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Tiltfile b/Tiltfile
@@ -19,7 +19,7 @@ settings = {
     "capi_version": "v1.0.0",
     "cert_manager_version": "v1.1.0",
     "kubernetes_version": "v1.22.2",
-    "aks_kubernetes_version": "v1.20.5"
+    "aks_kubernetes_version": "v1.22.1"
 }
 
 keys = ["AZURE_SUBSCRIPTION_ID", "AZURE_TENANT_ID", "AZURE_CLIENT_SECRET", "AZURE_CLIENT_ID"]

diff --git a/exp/controllers/azuremanagedmachinepool_controller.go b/exp/controllers/azuremanagedmachinepool_controller.go
@@ -18,7 +18,6 @@ package controllers
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -228,7 +227,7 @@ func (ammpr *AzureManagedMachinePoolReconciler) Reconcile(ctx context.Context, r
 }
 
 func (ammpr *AzureManagedMachinePoolReconciler) reconcileNormal(ctx context.Context, scope *scope.ManagedControlPlaneScope) (reconcile.Result, error) {
-	ctx, log, done := tele.StartSpanWithLogger(ctx, "controllers.AzureManagedMachinePoolReconciler.reconcileNormal")
+	ctx, _, done := tele.StartSpanWithLogger(ctx, "controllers.AzureManagedMachinePoolReconciler.reconcileNormal")
 	defer done()
 
 	scope.Logger.Info("Reconciling AzureManagedMachinePool")