Skip Linux profile and identity profile

Author: maciaszczykm

Makefile

@@ -137,12 +137,13 @@ else
 endif
 
 # Define Docker related variables. Releases should modify and double check these vars.
-REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
-STAGING_REGISTRY := gcr.io/k8s-staging-cluster-api-azure
-PROD_REGISTRY := registry.k8s.io/cluster-api-azure
+PROJECT ?= pluralsh
+REGISTRY ?= ghcr.io/$(PROJECT)
+STAGING_REGISTRY := $(REGISTRY)
+PROD_REGISTRY := $(REGISTRY)
 IMAGE_NAME ?= cluster-api-azure-controller
 CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= dev
+TAG ?= v1.9.12
 ARCH ?= $(GOARCH)
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 

api/v1beta1/azuremanagedcontrolplane_types.go

@@ -125,6 +125,7 @@ type AzureManagedControlPlaneSpec struct {
 
 	// SSHPublicKey is a string literal containing an ssh public key base64 encoded.
 	// Immutable.
+	// +optional
 	SSHPublicKey string `json:"sshPublicKey"`
 
 	// DNSServiceIP is an IP address assigned to the Kubernetes DNS service.

azure/services/managedclusters/spec.go

@@ -18,7 +18,6 @@ package managedclusters
 
 import (
 	"context"
-	"encoding/base64"
 	"fmt"
 	"net"
 	"time"
@@ -270,10 +269,6 @@ func (s *ManagedClusterSpec) Parameters(ctx context.Context, existing interface{
 	ctx, log, done := tele.StartSpanWithLogger(ctx, "managedclusters.Service.Parameters")
 	defer done()
 
-	decodedSSHPublicKey, err := base64.StdEncoding.DecodeString(s.SSHPublicKey)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to decode SSHPublicKey")
-	}
 	managedCluster := containerservice.ManagedCluster{
 		Identity: &containerservice.ManagedClusterIdentity{
 			Type: containerservice.ResourceIdentityTypeSystemAssigned,
@@ -291,16 +286,6 @@ func (s *ManagedClusterSpec) Parameters(ctx context.Context, existing interface{
 			EnableRBAC:        pointer.Bool(true),
 			DNSPrefix:         &s.Name,
 			KubernetesVersion: &s.Version,
-			LinuxProfile: &containerservice.LinuxProfile{
-				AdminUsername: pointer.String(azure.DefaultAKSUserName),
-				SSH: &containerservice.SSHConfiguration{
-					PublicKeys: &[]containerservice.SSHPublicKey{
-						{
-							KeyData: pointer.String(string(decodedSSHPublicKey)),
-						},
-					},
-				},
-			},
 			ServicePrincipalProfile: &containerservice.ManagedClusterServicePrincipalProfile{
 				ClientID: pointer.String("msi"),
 			},
@@ -588,22 +573,6 @@ func computeDiffOfNormalizedClusters(managedCluster containerservice.ManagedClus
 		}
 	}
 
-	if managedCluster.IdentityProfile != nil {
-		propertiesNormalized.IdentityProfile = map[string]*containerservice.UserAssignedIdentity{
-			"kubeletidentity": {
-				ResourceID: managedCluster.IdentityProfile["kubeletidentity"].ResourceID,
-			},
-		}
-	}
-
-	if existingMC.IdentityProfile != nil {
-		existingMCPropertiesNormalized.IdentityProfile = map[string]*containerservice.UserAssignedIdentity{
-			"kubeletidentity": {
-				ResourceID: existingMC.IdentityProfile["kubeletidentity"].ResourceID,
-			},
-		}
-	}
-
 	// Once the AKS autoscaler has been updated it will always return values so we need to
 	// respect those values even though the settings are now not being explicitly set by CAPZ.
 	if existingMC.AutoScalerProfile != nil && managedCluster.AutoScalerProfile == nil {

config/capz/manager_image_patch.yaml

@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:latest
+      - image: ghcr.io/pluralsh/cluster-api-azure-controller:v1.9.12
         name: manager

config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedcontrolplanes.yaml

@@ -532,7 +532,6 @@ spec:
             required:
             - location
             - resourceGroupName
-            - sshPublicKey
             - version
             type: object
           status: