msazurestackworkloads · honcao · Jul 3, 2020 · Jul 3, 2020 · Jul 3, 2020 · Jul 3, 2020
diff --git a/.dockerignore b/.dockerignore
@@ -13,3 +13,4 @@
 !/main.go
 !/go.mod
 !/go.sum
+!/.vscode/**
diff --git a/Dockerfile b/Dockerfile
@@ -39,6 +39,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
 # Copy the controller-manager into a thin image
 FROM gcr.io/distroless/static:latest
 WORKDIR /
+COPY --from=builder /etc/ssl/certs /etc/ssl/certs
 COPY --from=builder /workspace/manager .
 USER nobody
 ENTRYPOINT ["/manager"]
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -0,0 +1,50 @@
+# Copyright 2019 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Build the manager binary
+FROM golang:1.13.8 as builder
+WORKDIR /workspace
+
+# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
+ARG goproxy=https://proxy.golang.org
+ENV GOPROXY=$goproxy
+
+# Copy the Go Modules manifests
+COPY go.mod go.mod
+COPY go.sum go.sum
+# Cache deps before building and copying source so that we don't need to re-download as much
+# and so that source changes don't invalidate our downloaded layer
+RUN go mod download
+
+# Copy the sources
+COPY ./ ./
+
+# Build
+ARG ARCH
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
+    go build -a -ldflags '-extldflags "-static"' \
+    -o manager .
+
+
+COPY .vscode/azs.crt /usr/local/share/ca-certificates/
+COPY .vscode/azs02.crt /usr/local/share/ca-certificates/
+RUN update-ca-certificates
+
+# Copy the controller-manager into a thin image
+FROM gcr.io/distroless/static:latest
+WORKDIR /
+COPY --from=builder /etc/ssl/certs /etc/ssl/certs
+COPY --from=builder /workspace/manager .
+USER nobody
+ENTRYPOINT ["/manager"]
diff --git a/Makefile b/Makefile
@@ -158,6 +158,16 @@ test-e2e: $(ENVSUBST) $(GINKGO) ## Run e2e tests
 	    -e2e.config="$(E2E_CONF_FILE_ENVSUBST)" \
 	    -e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER)
 
+.PHONY: test-e2e-dev
+test-e2e-dev: $(ENVSUBST) $(GINKGO) ## Run e2e tests
+	PULL_POLICY=IfNotPresent $(MAKE) docker-build-dev
+	MANAGER_IMAGE=$(CONTROLLER_IMG)-$(ARCH):$(TAG) \
+	$(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \
+	$(GINKGO) -v -trace -tags=e2e -focus=$(GINKGO_FOCUS) -nodes=$(GINKGO_NODES) --noColor=$(GINKGO_NOCOLOR) ./test/e2e -- \
+	    -e2e.artifacts-folder="$(ARTIFACTS)" \
+	    -e2e.config="$(E2E_CONF_FILE_ENVSUBST)" \
+	    -e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER)
+
 $(KUBECTL) $(KUBE_APISERVER) $(ETCD): ## install test asset kubectl, kube-apiserver, etcd
 	source ./scripts/fetch_ext_bins.sh && fetch_tools
 
@@ -272,7 +282,13 @@ generate-flavors: $(KUSTOMIZE)
 docker-build: ## Build the docker image for controller-manager
 	docker build --pull --build-arg ARCH=$(ARCH) . -t $(CONTROLLER_IMG)-$(ARCH):$(TAG)
 	MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
-	$(MAKE) set-manifest-pull-policy
+	$(MAKE) set-manifest-pull-policy 
+
+.PHONY: docker-build-dev
+docker-build-dev: ## Build the docker image for controller-manager
+	docker build -f Dockerfile.dev --pull --build-arg ARCH=$(ARCH) . -t $(CONTROLLER_IMG)-$(ARCH):$(TAG)
+	MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
+	$(MAKE) set-manifest-pull-policy 
 
 .PHONY: docker-push
 docker-push: ## Push the docker image
@@ -384,7 +400,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
 	kubectl wait --for=condition=Available --timeout=5m apiservice v1beta1.webhook.cert-manager.io
 
 	# Deploy CAPI
-	curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.7/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
+	curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.8/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
 
 	# Deploy CAPZ
 	kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz

diff --git a/api/v1alpha2/zz_generated.conversion.go b/api/v1alpha2/zz_generated.conversion.go
diff --git a/api/v1alpha3/azuremachine_validation.go b/api/v1alpha3/azuremachine_validation.go
@@ -20,7 +20,6 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute"
 	"golang.org/x/crypto/ssh"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
@@ -110,7 +109,7 @@ func ValidateOSDisk(osDisk OSDisk, fieldPath *field.Path) field.ErrorList {
 		allErrs = append(allErrs, err)
 	}
 
-	if osDisk.DiffDiskSettings != nil && osDisk.DiffDiskSettings.Option == string(compute.Local) && osDisk.ManagedDisk.StorageAccountType != "Standard_LRS" {
+	if osDisk.DiffDiskSettings != nil && osDisk.DiffDiskSettings.Option == "Local" && osDisk.ManagedDisk.StorageAccountType != "Standard_LRS" {
 		allErrs = append(allErrs, field.Invalid(
 			fieldPath.Child("managedDisks").Child("storageAccountType"),
 			osDisk.ManagedDisk.StorageAccountType,
@@ -134,7 +133,7 @@ func ValidateManagedDisk(old, new ManagedDisk, fieldPath *field.Path) field.Erro
 
 func validateDiffDiskSetings(d *DiffDiskSettings, fldPath *field.Path) *field.Error {
 	if d != nil {
-		if d.Option != string(compute.Local) {
+		if d.Option != "Local" {
 			return field.Invalid(
 				fldPath.Child("option"),
 				d,
@@ -184,11 +183,12 @@ func validateStorageAccountType(storageAccountType string, fieldPath *field.Path
 		return allErrs
 	}
 
-	for _, possibleStorageAccountType := range compute.PossibleDiskStorageAccountTypesValues() {
+	possibleDiskStorageAccountTypesValues := []string{"Premium_LRS", "Standard_LRS"}
+	for _, possibleStorageAccountType := range possibleDiskStorageAccountTypesValues {
 		if string(possibleStorageAccountType) == storageAccountType {
 			return allErrs
 		}
 	}
-	allErrs = append(allErrs, field.Invalid(storageAccTypeChildPath, "", fmt.Sprintf("allowed values are %v", compute.PossibleDiskStorageAccountTypesValues())))
+	allErrs = append(allErrs, field.Invalid(storageAccTypeChildPath, "", fmt.Sprintf("allowed values are %v", possibleDiskStorageAccountTypesValues)))
 	return allErrs
 }
diff --git a/api/v1alpha3/azuremachine_validation_test.go b/api/v1alpha3/azuremachine_validation_test.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 
 	. "github.com/onsi/gomega"
@@ -91,7 +90,7 @@ func TestAzureMachine_ValidateOSDisk(t *testing.T) {
 				DiskSizeGB: 30,
 				OSType:     "blah",
 				DiffDiskSettings: &DiffDiskSettings{
-					Option: string(compute.Local),
+					Option: "Local",
 				},
 				ManagedDisk: ManagedDisk{
 					StorageAccountType: "Standard_LRS",
@@ -161,7 +160,7 @@ func generateNegativeTestCases() []osDiskTestInput {
 				StorageAccountType: "Premium_LRS",
 			},
 			DiffDiskSettings: &DiffDiskSettings{
-				Option: string(compute.Local),
+				Option: "Local",
 			},
 		},
 	}

diff --git a/cloud/converters/image.go b/cloud/converters/image.go
@@ -19,7 +19,7 @@ package converters
 import (
 	"fmt"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute"
+	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
 	"github.com/pkg/errors"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"

diff --git a/cloud/converters/vm.go b/cloud/converters/vm.go
@@ -17,7 +17,7 @@ limitations under the License.
 package converters
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute"
+	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
 )

diff --git a/cloud/converters/vmss.go b/cloud/converters/vmss.go
@@ -17,7 +17,7 @@ limitations under the License.
 package converters
 
 import (
-	"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
+	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
@@ -37,9 +37,11 @@ func SDKToVMSS(sdkvmss compute.VirtualMachineScaleSet, sdkinstances []compute.Vi
 		vmss.Capacity = to.Int64(sdkvmss.Sku.Capacity)
 	}
 
-	if sdkvmss.Zones != nil && len(*sdkvmss.Zones) > 0 {
-		vmss.Zones = to.StringSlice(sdkvmss.Zones)
-	}
+	/*
+		if sdkvmss.Zones != nil && len(*sdkvmss.Zones) > 0 {
+			vmss.Zones = to.StringSlice(sdkvmss.Zones)
+		}
+	*/
 
 	if len(sdkvmss.Tags) > 0 {
 		vmss.Tags = MapToTags(sdkvmss.Tags)
@@ -55,9 +57,11 @@ func SDKToVMSS(sdkvmss compute.VirtualMachineScaleSet, sdkinstances []compute.Vi
 				State:      infrav1.VMState(to.String(vm.ProvisioningState)),
 			}
 
-			if vm.Zones != nil && len(*vm.Zones) > 0 {
-				instance.AvailabilityZone = to.StringSlice(vm.Zones)[0]
-			}
+			/*
+				if vm.Zones != nil && len(*vm.Zones) > 0 {
+					instance.AvailabilityZone = to.StringSlice(vm.Zones)[0]
+				}
+			*/
 			vmss.Instances[i] = instance
 		}
 	}

diff --git a/cloud/converters/vmss_test.go b/cloud/converters/vmss_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
+	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/onsi/gomega"
 
@@ -40,39 +40,39 @@ func Test_SDKToVMSS(t *testing.T) {
 				tags := map[string]*string{
 					"foo": to.StringPtr("bazz"),
 				}
-				zones := []string{"zone0", "zone1"}
+				// zones := []string{"zone0", "zone1"}
 				return compute.VirtualMachineScaleSet{
 						Sku: &compute.Sku{
 							Name:     to.StringPtr("skuName"),
 							Tier:     to.StringPtr("skuTier"),
 							Capacity: to.Int64Ptr(2),
 						},
-						Zones:    to.StringSlicePtr(zones),
+						// Zones:    to.StringSlicePtr(zones),
 						ID:       to.StringPtr("vmssID"),
 						Name:     to.StringPtr("vmssName"),
 						Location: to.StringPtr("westus2"),
 						Tags:     tags,
 						VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
-							ProvisioningState: to.StringPtr(string(compute.ProvisioningState1Succeeded)),
+							ProvisioningState: to.StringPtr("Succeded"),
 						},
 					},
 					[]compute.VirtualMachineScaleSetVM{
 						{
 							InstanceID: to.StringPtr("0"),
 							ID:         to.StringPtr("vm/0"),
 							Name:       to.StringPtr("vm0"),
-							Zones:      to.StringSlicePtr([]string{"zone0"}),
+							// Zones:      to.StringSlicePtr([]string{"zone0"}),
 							VirtualMachineScaleSetVMProperties: &compute.VirtualMachineScaleSetVMProperties{
-								ProvisioningState: to.StringPtr(string(compute.ProvisioningState1Succeeded)),
+								ProvisioningState: to.StringPtr("Succeeded"),
 							},
 						},
 						{
 							InstanceID: to.StringPtr("1"),
 							ID:         to.StringPtr("vm/1"),
 							Name:       to.StringPtr("vm1"),
-							Zones:      to.StringSlicePtr([]string{"zone1"}),
+							// Zones:      to.StringSlicePtr([]string{"zone1"}),
 							VirtualMachineScaleSetVMProperties: &compute.VirtualMachineScaleSetVMProperties{
-								ProvisioningState: to.StringPtr(string(compute.ProvisioningState1Succeeded)),
+								ProvisioningState: to.StringPtr("Succeeded"),
 							},
 						},
 					}
@@ -83,8 +83,8 @@ func Test_SDKToVMSS(t *testing.T) {
 					Name:     "vmssName",
 					Sku:      "skuName",
 					Capacity: 2,
-					Zones:    []string{"zone0", "zone1"},
-					State:    "Succeeded",
+					// Zones:    []string{"zone0", "zone1"},
+					State: "Succeeded",
 					Tags: map[string]string{
 						"foo": "bazz",
 					},