Merge pull request kubernetes-sigs#1138 from srm09/update/v1alpha4-refs

Updates references to v1alpha4 types
spectrocloud · Mar 31, 2021 · 5553a61 · 5553a61
2 parents a7f7aba + 9e74698
commit 5553a61
Show file tree

Hide file tree

Showing 95 changed files with 1,487 additions and 3,252 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-ARG GOLANG_VERSION=golang:1.13.5
+ARG GOLANG_VERSION=golang:1.15.0
 FROM $GOLANG_VERSION as builder
 WORKDIR /workspace
 

diff --git a/Makefile b/Makefile
@@ -268,9 +268,9 @@ dev-manifests:
 manifests:  $(STAGE)-version-check $(STAGE)-flavors $(MANIFEST_DIR) $(BUILD_DIR) $(KUSTOMIZE)
 	rm -rf $(BUILD_DIR)/config
 	cp -R config $(BUILD_DIR)
-	sed -i'' -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' $(BUILD_DIR)/config/manager/manager_pull_policy.yaml
-	sed -i'' -e 's@image: .*@image: '"$(IMAGE)"'@' $(BUILD_DIR)/config/manager/manager_image_patch.yaml
-	"$(KUSTOMIZE)" build $(BUILD_DIR)/config > $(MANIFEST_DIR)/infrastructure-components.yaml
+	sed -i'' -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' $(BUILD_DIR)/config/default/manager_pull_policy.yaml
+	sed -i'' -e 's@image: .*@image: '"$(IMAGE)"'@' $(BUILD_DIR)/config/default/manager_image_patch.yaml
+	"$(KUSTOMIZE)" build $(BUILD_DIR)/config/default > $(MANIFEST_DIR)/infrastructure-components.yaml
 
 ## --------------------------------------
 ## Cleanup / Verification

diff --git a/api/v1alpha3/conversion_test.go b/api/v1alpha3/conversion_test.go
@@ -34,11 +34,7 @@ func TestFuzzyConversion(t *testing.T) {
 	g.Expect(nextver.AddToScheme(scheme)).To(Succeed())
 
 	t.Run("for VSphereCluster", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereCluster{}, &VSphereCluster{}))
-	t.Run("for VSphereCluster", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereClusterList{}, &VSphereClusterList{}))
 	t.Run("for VSphereMachine", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereMachine{}, &VSphereMachine{}))
-	t.Run("for VSphereMachineList", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereMachineList{}, &VSphereMachineList{}))
 	t.Run("for VSphereMachineTemplate", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereMachineTemplate{}, &VSphereMachineTemplate{}))
-	t.Run("for VSphereMachineTemplateList", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereMachineTemplateList{}, &VSphereMachineTemplateList{}))
 	t.Run("for VSphereVM", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereVM{}, &VSphereVM{}))
-	t.Run("for VSphereVMList", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereVMList{}, &VSphereVMList{}))
 }
diff --git a/api/v1alpha3/haproxyloadbalancer_webhook.go b/api/v1alpha3/haproxyloadbalancer_webhook.go
diff --git a/api/v1alpha3/haproxyloadbalancerlist_webhook.go b/api/v1alpha3/haproxyloadbalancerlist_webhook.go
diff --git a/api/v1alpha3/vspherecluster_webhook.go b/api/v1alpha3/vspherecluster_webhook.go
diff --git a/api/v1alpha3/vspherecluster_webhook_test.go b/api/v1alpha3/vspherecluster_webhook_test.go
diff --git a/api/v1alpha3/vsphereclusterlist_webhook.go b/api/v1alpha3/vsphereclusterlist_webhook.go
diff --git a/api/v1alpha3/vspheremachine_webhook.go b/api/v1alpha3/vspheremachine_webhook.go