Fix v1 secret naming (#1380)

* Fix v1 secret naming - Fix issue where namespace was mistakenly included in v1 secret naming key generation. Some resources are not expected to have namespace prefix in certain KeyVault scenarios. * Increase build timeout a bit * Don't create many different randoms in test * SecretClient should not be modified * Change region VM tests are run in - Due to capacity constraints. We can move back later.
Azure · Feb 17, 2021 · 78e493c · 78e493c
1 parent 736367a
commit 78e493c
Show file tree

Hide file tree

Showing 24 changed files with 329 additions and 140 deletions.
diff --git a/Makefile b/Makefile
@@ -64,7 +64,7 @@ test-integration-controllers: generate fmt vet manifests
 .PHONY: test-v1-secret-naming
 test-v1-secret-naming: generate fmt vet manifests
 	TEST_RESOURCE_PREFIX=$(TEST_RESOURCE_PREFIX) TEST_USE_EXISTING_CLUSTER=false REQUEUE_AFTER=20 AZURE_SECRET_NAMING_VERSION=1 \
-	go test -v -run "^.*_SecretNamedCorrectly$$" -tags "$(BUILD_TAGS)" -coverprofile=reports/v1-secret-naming-coverage-output.txt -coverpkg=./... -covermode count -parallel 4 -timeout 10m \
+	go test -v -run "^.*_SecretNamedCorrectly$$" -tags "$(BUILD_TAGS)" -coverprofile=reports/v1-secret-naming-coverage-output.txt -coverpkg=./... -covermode count -parallel 4 -timeout 15m \
 		./controllers/...
 
 # Run Resource Manager tests against the configured cluster

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -15,7 +15,8 @@ resources:
 - repo: self
 
 pool:
-   vmImage: 'ubuntu-latest'
+  vmImage: 'ubuntu-latest'
+  timeoutInMinutes: 80
 
 variables:
   tag: '$(Build.BuildId)'

diff --git a/controllers/azurevirtualmachine_controller_test.go b/controllers/azurevirtualmachine_controller_test.go
@@ -27,6 +27,7 @@ func TestVirtualMachineControllerNoResourceGroup(t *testing.T) {
 	sshPublicKeyData := GenerateTestResourceNameWithRandom("ssh", 10)
 	nicName := GenerateTestResourceNameWithRandom("nic", 10)
 	platformImageUrn := "Canonical:UbuntuServer:16.04-LTS:latest"
+	location := tc.resourceGroupLocation
 
 	// Create a VM
 	vmInstance := &azurev1alpha1.AzureVirtualMachine{
@@ -35,7 +36,7 @@ func TestVirtualMachineControllerNoResourceGroup(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzureVirtualMachineSpec{
-			Location:             tc.resourceGroupLocation,
+			Location:             location,
 			ResourceGroup:        rgName,
 			VMSize:               vmSize,
 			OSType:               osType,
@@ -56,6 +57,9 @@ func TestVirtualMachineHappyPathWithNicPipVNetAndSubnet(t *testing.T) {
 	defer PanicRecover(t)
 	ctx := context.Background()
 
+	// location := tc.resourceGroupLocation
+	location := "australiaeast"
+
 	// Create a vnet with a subnet
 	vnetName := GenerateTestResourceNameWithRandom("vnt", 10)
 	subnetName := GenerateTestResourceNameWithRandom("snt", 10)
@@ -70,7 +74,7 @@ func TestVirtualMachineHappyPathWithNicPipVNetAndSubnet(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.VirtualNetworkSpec{
-			Location:      tc.resourceGroupLocation,
+			Location:      location,
 			ResourceGroup: tc.resourceGroupName,
 			AddressSpace:  "110.0.0.0/8",
 			Subnets:       []azurev1alpha1.VNetSubnets{vnetSubNetInstance},
@@ -90,7 +94,7 @@ func TestVirtualMachineHappyPathWithNicPipVNetAndSubnet(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzurePublicIPAddressSpec{
-			Location:                 tc.resourceGroupLocation,
+			Location:                 location,
 			ResourceGroup:            tc.resourceGroupName,
 			PublicIPAllocationMethod: publicIPAllocationMethod,
 			IdleTimeoutInMinutes:     idleTimeoutInMinutes,
@@ -109,7 +113,7 @@ func TestVirtualMachineHappyPathWithNicPipVNetAndSubnet(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzureNetworkInterfaceSpec{
-			Location:            tc.resourceGroupLocation,
+			Location:            location,
 			ResourceGroup:       tc.resourceGroupName,
 			VNetName:            vnetName,
 			SubnetName:          subnetName,
@@ -134,7 +138,7 @@ func TestVirtualMachineHappyPathWithNicPipVNetAndSubnet(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzureVirtualMachineSpec{
-			Location:             tc.resourceGroupLocation,
+			Location:             location,
 			ResourceGroup:        tc.resourceGroupName,
 			VMSize:               vmSize,
 			OSType:               osType,

diff --git a/controllers/azurevirtualmachineextension_controller_test.go b/controllers/azurevirtualmachineextension_controller_test.go
@@ -52,6 +52,9 @@ func TestVirtualMachineExtensionHappyPath(t *testing.T) {
 	defer PanicRecover(t)
 	ctx := context.Background()
 
+	// location := tc.resourceGroupLocation
+	location := "australiaeast"
+
 	// Create a vnet with a subnet
 	vnetName := GenerateTestResourceNameWithRandom("vnt", 10)
 	subnetName := GenerateTestResourceNameWithRandom("snt", 10)
@@ -66,7 +69,7 @@ func TestVirtualMachineExtensionHappyPath(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.VirtualNetworkSpec{
-			Location:      tc.resourceGroupLocation,
+			Location:      location,
 			ResourceGroup: tc.resourceGroupName,
 			AddressSpace:  "110.0.0.0/8",
 			Subnets:       []azurev1alpha1.VNetSubnets{vnetSubNetInstance},
@@ -86,7 +89,7 @@ func TestVirtualMachineExtensionHappyPath(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzurePublicIPAddressSpec{
-			Location:                 tc.resourceGroupLocation,
+			Location:                 location,
 			ResourceGroup:            tc.resourceGroupName,
 			PublicIPAllocationMethod: publicIPAllocationMethod,
 			IdleTimeoutInMinutes:     idleTimeoutInMinutes,
@@ -105,7 +108,7 @@ func TestVirtualMachineExtensionHappyPath(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzureNetworkInterfaceSpec{
-			Location:            tc.resourceGroupLocation,
+			Location:            location,
 			ResourceGroup:       tc.resourceGroupName,
 			VNetName:            vnetName,
 			SubnetName:          subnetName,
@@ -130,7 +133,7 @@ func TestVirtualMachineExtensionHappyPath(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzureVirtualMachineSpec{
-			Location:             tc.resourceGroupLocation,
+			Location:             location,
 			ResourceGroup:        tc.resourceGroupName,
 			VMSize:               vmSize,
 			OSType:               osType,
@@ -151,7 +154,7 @@ func TestVirtualMachineExtensionHappyPath(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzureVirtualMachineExtensionSpec{
-			Location:                tc.resourceGroupLocation,
+			Location:                location,
 			ResourceGroup:           tc.resourceGroupName,
 			VMName:                  vmName,
 			AutoUpgradeMinorVersion: true,

diff --git a/controllers/azurevmscaleset_controller_test.go b/controllers/azurevmscaleset_controller_test.go
@@ -66,6 +66,9 @@ func TestVMScaleSetHappyPathWithLbPipVNetAndSubnet(t *testing.T) {
 	defer PanicRecover(t)
 	ctx := context.Background()
 
+	// location := tc.resourceGroupLocation
+	location := "australiaeast"
+
 	// Create a vnet with a subnet
 	vnetName := GenerateTestResourceNameWithRandom("vnt", 10)
 	subnetName := GenerateTestResourceNameWithRandom("snt", 10)
@@ -80,7 +83,7 @@ func TestVMScaleSetHappyPathWithLbPipVNetAndSubnet(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.VirtualNetworkSpec{
-			Location:      tc.resourceGroupLocation,
+			Location:      location,
 			ResourceGroup: tc.resourceGroupName,
 			AddressSpace:  "110.0.0.0/8",
 			Subnets:       []azurev1alpha1.VNetSubnets{vnetSubNetInstance},
@@ -100,7 +103,7 @@ func TestVMScaleSetHappyPathWithLbPipVNetAndSubnet(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzurePublicIPAddressSpec{
-			Location:                 tc.resourceGroupLocation,
+			Location:                 location,
 			ResourceGroup:            tc.resourceGroupName,
 			PublicIPAllocationMethod: publicIPAllocationMethod,
 			IdleTimeoutInMinutes:     idleTimeoutInMinutes,
@@ -124,7 +127,7 @@ func TestVMScaleSetHappyPathWithLbPipVNetAndSubnet(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzureLoadBalancerSpec{
-			Location:               tc.resourceGroupLocation,
+			Location:               location,
 			ResourceGroup:          tc.resourceGroupName,
 			PublicIPAddressName:    pipName,
 			BackendAddressPoolName: bpName,
@@ -152,7 +155,7 @@ func TestVMScaleSetHappyPathWithLbPipVNetAndSubnet(t *testing.T) {
 			Namespace: "default",
 		},
 		Spec: azurev1alpha1.AzureVMScaleSetSpec{
-			Location:               tc.resourceGroupLocation,
+			Location:               location,
 			ResourceGroup:          tc.resourceGroupName,
 			VMSize:                 vmSize,
 			Capacity:               capacity,