Some cleanup.

Author: Joshua Reed

api/v1beta1/cloudstackcluster_types.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+nfraCopyright 2022 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ type Network struct {
 	// + optional
 	Type string `json:"type,omitempty"`
 
-	// Name of the infrastructure identity to be used.
+	// Cloudstack Network Name the cluster is built in.
 	// +optional
 	Name string `json:"name"`
 }

api/v1beta1/cloudstackcluster_webhook_test.go

@@ -54,7 +54,7 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 		})
 
 		It("Should reject a CloudStackCluster with IdentityRef not of kind 'Secret'", func() {
-			dummies.CSCluster.Spec.IdentityRef.Kind = "ConfigMap"
+			dummies.CSCluster.Spec.IdentityRef.Kind = "NewType"
 			Ω(k8sClient.Create(ctx, dummies.CSCluster)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "must be a Secret")))
 		})
@@ -69,7 +69,7 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 			dummies.CSCluster.Spec.Zones = []infrav1.Zone{dummies.Zone1}
 			Ω(k8sClient.Update(ctx, dummies.CSCluster)).Should(MatchError(MatchRegexp(forbiddenRegex, "Zones and sub")))
 		})
-		It("Should reject updates to CloudStackCluster Zones", func() {
+		It("Should reject updates to Networks specified in CloudStackCluster Zones", func() {
 			dummies.CSCluster.Spec.Zones[0].Network.Name = "ArbitraryUpdateNetworkName"
 			Ω(k8sClient.Update(ctx, dummies.CSCluster)).Should(MatchError(MatchRegexp(forbiddenRegex, "Zones and sub")))
 		})
@@ -85,12 +85,12 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 				Should(MatchError(MatchRegexp(forbiddenRegex, "controlplaneendpoint\\.port")))
 		})
 		It("Should reject updates to the CloudStackCluster identity reference kind", func() {
-			dummies.CSCluster.Spec.IdentityRef.Kind = "ConfigMap"
+			dummies.CSCluster.Spec.IdentityRef.Kind = "NewType"
 			Ω(k8sClient.Update(ctx, dummies.CSCluster)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "identityref\\.kind")))
 		})
 		It("Should reject updates to the CloudStackCluster identity reference name", func() {
-			dummies.CSCluster.Spec.IdentityRef.Name = "ConfigMap"
+			dummies.CSCluster.Spec.IdentityRef.Name = "NewType"
 			Ω(k8sClient.Update(ctx, dummies.CSCluster)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "identityref\\.name")))
 		})

controllers/cloudstackmachine_controller.go

@@ -173,8 +173,7 @@ func (r *CloudStackMachineReconciler) reconcile(
 			zones[zidx] = zoneID
 			zidx++
 		}
-		rand.Seed(time.Now().Unix())
-		randNum := (rand.Int() % len(csCluster.Spec.Zones)) // #nosec G404 -- weack crypt rand doesn't matter here.
+		randNum := (rand.Int() % len(csCluster.Spec.Zones)) // #nosec G404 -- weak crypt rand doesn't matter here.
 		csMachine.Status.ZoneID = zones[randNum]
 	}
 

main.go

@@ -18,8 +18,10 @@ package main
 
 import (
 	"fmt"
+	"math/rand"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
 	flag "github.com/spf13/pflag"
@@ -143,6 +145,9 @@ func main() {
 		os.Exit(1)
 	}
 
+	// Set a random seed for randomly placing CloudStackMachines in Zones.
+	rand.Seed(time.Now().Unix())
+
 	// Register machine and cluster reconcilers with the controller manager.
 	if err = (&controllers.CloudStackClusterReconciler{
 		Client: mgr.GetClient(),

test/dummies/vars.go

@@ -92,7 +92,7 @@ func SetDummyTagVars() {
 	Tags = map[string]string{Tag1Key: Tag1Val, Tag2Key: Tag2Val}
 }
 
-// SetDummyClusterSpecVars resets the values in each of the exported CloudStackMachines related dummy variables.
+// SetDummyCSMachineTemplateVars resets the values in each of the exported CloudStackMachinesTemplate dummy variables.
 func SetDummyCSMachineTemplateVars() {
 	CSMachineTemplate1 = &capcv1.CloudStackMachineTemplate{
 		TypeMeta: metav1.TypeMeta{
@@ -125,7 +125,7 @@ func SetDummyCSMachineTemplateVars() {
 	}
 }
 
-// SetDummyClusterSpecVars resets the values in each of the exported CloudStackMachines related dummy variables.
+// SetDummyCSMachineVars resets the values in each of the exported CloudStackMachine dummy variables.
 func SetDummyCSMachineVars() {
 	CSMachine1 = &capcv1.CloudStackMachine{
 		TypeMeta: metav1.TypeMeta{
@@ -153,8 +153,8 @@ func SetDummyCSMachineVars() {
 	CSMachine1.ObjectMeta.SetName("test-vm")
 }
 
-// SetDummyClusterSpecVars resets the values in each of the exported CloudStackCluster related dummy variables.
-// It is intended to be called in BeforeEach( functions.
+// SetDummyCAPCClusterVars resets the values in each of the exported CloudStackCluster related dummy variables.
+// It is intended to be called in BeforeEach() functions.
 func SetDummyCAPCClusterVars() {
 	DomainID = "FakeDomainID"
 	Domain = "FakeDomainName"
@@ -199,11 +199,13 @@ func SetDummyCAPCClusterVars() {
 	}
 }
 
+// SetDummyDomainAndAccount sets domain and account in the CSCluster Spec. This is not the default.
 func SetDummyDomainAndAccount() {
 	CSCluster.Spec.Account = Account
 	CSCluster.Spec.Domain = Domain
 }
 
+// SetDummyDomainAndAccount sets domainID in the CSCluster Status. This is not the default.
 func SetDummyDomainID() {
 	CSCluster.Status.DomainID = "FakeDomainID"
 }