Ensure CNI manifest is applied to cluster when the base manifest and …

…provider are updated (#1093) ### Proposed changes This PR ensures that changes to the base CNI manifest is applied as a Pulumi update whenever the provider version changes. This is done by now also storing the computed manifest in state to diff against. Previously, only changes to user VpcCni opts caused a diff. This would mean that some users who have already updated to the latest provider version, and manually triggered a CNI update would encounter a one-off spurious diff since the computed manifest would not have been stored in state. Changes made: - Add applied manifest to state to fix the issue where the manifest isn't reapplied when the provider is updated - fix the issue where VpcCni could not be passed a kubeconfig object correctly - updated CI to use the latest version of the Pulumi binary - Added CNIAcrossUpdates integration test - Added CNIAcrossUpdates to the list of tests to run in CI ### Related issues (optional) Fixes: #1057 Fixes: #1092 --------- Co-authored-by: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com>
pulumi · Mar 26, 2024 · 9343929 · 9343929
1 parent 8e16403
commit 9343929
Show file tree

Hide file tree

Showing 37 changed files with 27,046 additions and 26,866 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Unshallow clone for tags
         run: git fetch --prune --unshallow --tags
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Setup Node
@@ -69,13 +69,11 @@ jobs:
         with:
           go-version: ${{ env.GOVERSION }}
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Build provider binary + schema
         run: make schema provider
       - name: Check worktree clean
@@ -117,13 +115,11 @@ jobs:
         with:
           go-version: ${{ env.GOVERSION }}
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
@@ -210,13 +206,11 @@ jobs:
           python -m pip install --upgrade pip
           pip install awscli --upgrade
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
@@ -278,24 +272,25 @@ jobs:
         test-name:
           - AwsProfile
           - Cluster
+          - CNIAcrossUpdates
           - EncryptionProvider
           - ExtraSecurityGroups
           - Fargate
           - ImportDefaultEksSecgroup
           - KubernetesServiceIPv4RangeForCluster
           - ManagedNodeGroup
           - MigrateNodeGroups
-          - MNG_withMissingRole
           - MNG_withAwsAuth
+          - MNG_withMissingRole
           - NodeGroup
           - NodegroupOptions
           - OidcIam
           - ReplaceClusterAddSubnets
           - ReplaceSecGroup
           - ScopedKubeconfig
           - StorageClasses
-          - Tags
           - TagInputTypes
+          - Tags
           - VpcSubnetTags
   test-python:
     name: Run Python Tests
@@ -316,7 +311,7 @@ jobs:
         with:
           go-version: ${{ env.GOVERSION }}
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Setup Python
@@ -328,9 +323,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install awscli --upgrade
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
@@ -436,13 +429,11 @@ jobs:
           python -m pip install --upgrade pip
           pip install awscli --upgrade
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Node
         uses: actions/setup-node@v1
         with:

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Unshallow clone for tags
         run: git fetch --prune --unshallow --tags
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Setup Node
@@ -69,13 +69,11 @@ jobs:
         with:
           go-version: ${{ env.GOVERSION }}
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Build provider binary + schema
         run: make schema provider
       - name: Check worktree clean
@@ -117,13 +115,11 @@ jobs:
         with:
           go-version: ${{ env.GOVERSION }}
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
@@ -211,13 +207,11 @@ jobs:
         with:
           tag: v2.1.5-procursus2
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Create Provider Binaries
         run: make dist
       - name: Upload Provider Binaries
@@ -241,13 +235,11 @@ jobs:
         with:
           go-version: ${{ env.GOVERSION }}
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
@@ -308,13 +300,11 @@ jobs:
         with:
           go-version: ${{ env.GOVERSION }}
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
@@ -375,13 +365,11 @@ jobs:
           python -m pip install --upgrade pip
           pip install awscli --upgrade
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
@@ -443,24 +431,25 @@ jobs:
         test-name:
           - AwsProfile
           - Cluster
+          - CNIAcrossUpdates
           - EncryptionProvider
           - ExtraSecurityGroups
           - Fargate
           - ImportDefaultEksSecgroup
           - KubernetesServiceIPv4RangeForCluster
           - ManagedNodeGroup
           - MigrateNodeGroups
-          - MNG_withMissingRole
           - MNG_withAwsAuth
+          - MNG_withMissingRole
           - NodeGroup
           - NodegroupOptions
           - OidcIam
           - ReplaceClusterAddSubnets
           - ReplaceSecGroup
           - ScopedKubeconfig
           - StorageClasses
-          - Tags
           - TagInputTypes
+          - Tags
           - VpcSubnetTags
   test-python:
     name: Run Python Tests
@@ -481,7 +470,7 @@ jobs:
         with:
           go-version: ${{ env.GOVERSION }}
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Setup Python
@@ -493,9 +482,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install awscli --upgrade
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
@@ -601,13 +588,11 @@ jobs:
           python -m pip install --upgrade pip
           pip install awscli --upgrade
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
+        uses: jaxxstorm/action-install-gh-release@v1.11.0
         with:
           repo: pulumi/pulumictl
       - name: Install Pulumi CLI
-        uses: pulumi/actions@v4
-        with:
-          pulumi-version: v3.89.0
+        uses: pulumi/actions@v5
       - name: Setup Node
         uses: actions/setup-node@v1
         with:

diff --git a/.github/workflows/record.yml b/.github/workflows/record.yml
@@ -58,7 +58,7 @@ jobs:
             with:
               go-version: ${{ env.GOVERSION }}
           - name: Install pulumictl
-            uses: jaxxstorm/action-install-gh-release@v1.1.0
+            uses: jaxxstorm/action-install-gh-release@v1.11.0
             with:
               repo: pulumi/pulumictl
           - name: Install Pulumi CLI
@@ -99,7 +99,7 @@ jobs:
             with:
                 go-version: ${{ env.GOVERSION }}
           - name: Install pulumictl
-            uses: jaxxstorm/action-install-gh-release@v1.1.0
+            uses: jaxxstorm/action-install-gh-release@v1.11.0
             with:
                 repo: pulumi/pulumictl
           - name: Install Pulumi CLI