Repository: Azure/ARO-RP
Pull request #1743 (2021-09-15 13:55:24)

Update documentation with the new AAD group
### Which issue this PR addresses:

Simple documentation update to use the new AAD group in Azure for the development subscription
Fixes

### What this PR does / why we need it:

<!--
Include a brief summary of what the PR is intended to accomplish and how the PR
does it. (2-3 sentences)
-->

### Test plan for issue:

<!--
How did you test that this PR works?

- Are there unit tests?
- Are there integration/e2e tests?
- If it is not possible to write automated tests, explain why and document how
  to manually test and verify the feature.
-->

### Is there any documentation that needs to be updated for this PR?

<!--
- If yes and the docs are in GitHub, include doc updates in the PR.
- If yes and the docs are not in GitHub (i.e. ADO wiki), include a link to the
  docs.
- If no, explain why (e.g. "tech debt cleanup, N/A").
-->



Patch:
diff --git a/docs/prepare-a-shared-rp-development-environment.md b/docs/prepare-a-shared-rp-development-environment.md
index b0bbccb97..c108c1b88 100644
--- a/docs/prepare-a-shared-rp-development-environment.md
+++ b/docs/prepare-a-shared-rp-development-environment.md
@@ -35,7 +35,7 @@ locations.
    development environment key vault(s).  Set ADMIN_OBJECT_ID to the object ID.
 
    ```bash
-   ADMIN_OBJECT_ID="$(az ad group show -g Engineering --query objectId -o tsv)"
+   ADMIN_OBJECT_ID="$(az ad group show -g 'ARO v4 RP Engineering' --query objectId -o tsv)"
    ```
 
 1. You will need the ARO RP-specific pull secret (ask one of the
diff --git a/pkg/util/cluster/cluster.go b/pkg/util/cluster/cluster.go
index a3c5d1009..6edf7ae68 100644
--- a/pkg/util/cluster/cluster.go
+++ b/pkg/util/cluster/cluster.go
@@ -372,7 +372,7 @@ func (c *Cluster) createCluster(ctx context.Context, vnetResourceGroup, clusterN
 			NetworkProfile: api.NetworkProfile{
 				PodCIDR:                "10.128.0.0/14",
 				ServiceCIDR:            "172.30.0.0/16",
-				SoftwareDefinedNetwork: api.SoftwareDefinedNetworkOpenShiftSDN,
+				SoftwareDefinedNetwork: api.SoftwareDefinedNetworkOVNKubernetes,
 			},
 			MasterProfile: api.MasterProfile{
 				VMSize:           api.VMSizeStandardD8sV3,


Test patch:
diff --git a/test/e2e/adminapi_redeployvm.go b/test/e2e/adminapi_redeployvm.go
index 9809d9da4..29934dfa3 100644
--- a/test/e2e/adminapi_redeployvm.go
+++ b/test/e2e/adminapi_redeployvm.go
@@ -20,7 +20,7 @@ import (
 	"github.com/Azure/ARO-RP/pkg/util/stringutils"
 )
 
-var _ = XDescribe("[Admin API] VM redeploy action", func() {
+var _ = Describe("[Admin API] VM redeploy action", func() {
 	BeforeEach(skipIfNotInDevelopmentEnv)
 
 	It("should trigger a selected VM to redeploy", func() {
diff --git a/test/e2e/scalenodes.go b/test/e2e/scalenodes.go
index 333d79b77..3f3aebaca 100644
--- a/test/e2e/scalenodes.go
+++ b/test/e2e/scalenodes.go
@@ -34,13 +34,6 @@ var _ = Describe("Scale nodes", func() {
 
 		expectedNodeCount := 3 // for masters
 		for _, wp := range *oc.WorkerProfiles {
-			// hack: if the machineset is scaled down to 0 replicas, since wp.Count is
-			// omitempty, it will set the value to nil and cause a nil pointer dereference
-			// panic so we work around this case
-			if wp.Count == nil {
-				continue
-
-			}
 			expectedNodeCount += int(*wp.Count)
 		}