Add Microsoft.PolicyInsights extension for public preview (#83)

* Add Azure Policy * Remove custom configuration and update tests
AzureArcForKubernetes · Oct 27, 2021 · d545111 · d545111
1 parent b4b0b0e
commit d545111
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/k8s-extension/HISTORY.rst b/src/k8s-extension/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+1.0.1
+++++++++++++++++++
+* Enable Microsoft.PolicyInsights extension type
+
 1.0.0
 ++++++++++++++++++
 * Switch to GA api-version of Extensions (2021-09-01)

diff --git a/src/k8s-extension/setup.py b/src/k8s-extension/setup.py
@@ -32,7 +32,7 @@
 # TODO: Add any additional SDK dependencies here
 DEPENDENCIES = []
 
-VERSION = "1.0.0"
+VERSION = "1.0.1"
 
 with open('README.rst', 'r', encoding='utf-8') as f:
     README = f.read()

diff --git a/...ons/private-preview/AzurePolicy.Tests.ps1 → ...t/extensions/public/AzurePolicy.Tests.ps1 b/...ons/private-preview/AzurePolicy.Tests.ps1 → ...t/extensions/public/AzurePolicy.Tests.ps1
@@ -19,14 +19,20 @@ Describe 'Azure Policy Testing' {
         $isAutoUpgradeMinorVersion = ($output | ConvertFrom-Json).autoUpgradeMinorVersion 
         $isAutoUpgradeMinorVersion.ToString() -eq "True" | Should -BeTrue
 
+        # Check that we get the principal id back for the created identity
+        $principalId = ($output | ConvertFrom-Json).identity.principalId
+        $principalId | Should -Not -BeNullOrEmpty
+
         # Loop and retry until the extension installs
         $n = 0
         do 
         {
-            if (Get-ExtensionStatus $extensionName -eq $SUCCESS_MESSAGE) {
-                if (Get-PodStatus $extensionAgentName -Namespace $extensionAgentNamespace -eq $POD_RUNNING) {
-                    break
-                }
+            # Only check the extension config, not the pod since this doesn't bring up pods
+            $output = Invoke-Expression "az $Env:K8sExtensionName show -c $($ENVCONFIG.arcClusterName) -g $($ENVCONFIG.resourceGroup) --cluster-type connectedClusters -n $extensionName" -ErrorVariable badOut
+            $provisioningState = ($output | ConvertFrom-Json).provisioningState
+            Write-Host "Got ProvisioningState: $provisioningState for the extension"  
+            if ((Has-ExtensionData $extensionName) -And ($provisioningState -eq "Succeeded")) {
+                break
             }
             Start-Sleep -Seconds 10
             $n += 1