More cleanup

kubernetes-sigs · Oct 18, 2023 · 3b11a46 · 3b11a46
1 parent 005247a
commit 3b11a46
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 24 deletions.
diff --git a/api/v1beta1/azuremanagedcontrolplane_default.go b/api/v1beta1/azuremanagedcontrolplane_default.go
@@ -56,7 +56,6 @@ func (m *AzureManagedControlPlane) setDefaultResourceGroupName() {
 	if m.Spec.ResourceGroupName == "" {
 		if clusterName, ok := m.Labels[clusterv1.ClusterNameLabel]; ok {
 			m.Spec.ResourceGroupName = clusterName
-			fmt.Printf("WILLIE ResourceGroupName is empty, defaulting to %s\n", m.Spec.ResourceGroupName)
 		}
 	}
 }

diff --git a/controllers/helpers.go b/controllers/helpers.go
@@ -945,7 +945,6 @@ func MachinePoolToAzureManagedControlPlaneMapFunc(ctx context.Context, c client.
 
 		gk := gvk.GroupKind()
 		ref := cluster.Spec.ControlPlaneRef
-		fmt.Printf("WILLIE cluster spec: %v", cluster.Spec)
 		if ref == nil || ref.Name == "" {
 			log.Error(err, "control plane ref is nil or empty")
 			return nil

diff --git a/templates/cluster-template-aks-clusterclass-cluster.yaml b/templates/cluster-template-aks-clusterclass-cluster.yaml
diff --git a/...luster-template-clusterclass-cluster.yaml → templates/cluster-template-topology.yaml b/...luster-template-clusterclass-cluster.yaml → templates/cluster-template-topology.yaml
diff --git a/...flavors/clusterclass-cluster/cluster.yaml → templates/flavors/topology/cluster.yaml b/...flavors/clusterclass-cluster/cluster.yaml → templates/flavors/topology/cluster.yaml
diff --git a/...s/clusterclass-cluster/kustomization.yaml → ...lates/flavors/topology/kustomization.yaml b/...s/clusterclass-cluster/kustomization.yaml → ...lates/flavors/topology/kustomization.yaml
diff --git a/templates/test/ci/prow-topology/kustomization.yaml b/templates/test/ci/prow-topology/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../../../flavors/clusterclass-cluster/cluster.yaml
+  - ../../../flavors/topology/cluster.yaml
   - cni-resource-set.yaml
   - ../../../addons/windows/csi-proxy/csi-proxy-resource-set.yaml
 patchesStrategicMerge: