Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure CNI manifest is applied to cluster when the base manifest and provider are updated #1093

Merged
merged 9 commits into from
Mar 26, 2024
Merged

Ensure CNI manifest is applied to cluster when the base manifest and provider are updated #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ae9343
fix: ensure cni manifests are updated if the base manifest changes
rquitales Mar 22, 2024
eb3a257
fix: stringify kubeconfig not parent args for VpcCni
rquitales Mar 26, 2024
cacf054
chore: add github.com/pulumi/providertest dependency with go mod tidy
rquitales Mar 26, 2024
6d31a36
tests: handle string and object base kubeconfigs
rquitales Mar 26, 2024
893b67b
tests: add test to ensure CNI is updated on cluster
rquitales Mar 26, 2024
4ef5be6
ci: add CNIAcrossUpdates test to CI workflows
rquitales Mar 26, 2024
abdabe7
ci: update pulumi to latest version for testing
rquitales Mar 26, 2024
03cf078
Update Provider Test Snapshots (#1099)
pulumi-bot Mar 26, 2024
de518b3
tests: ignore CNI manifest diff in upgrade test
rquitales Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions .github/workflows/cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
55 changes: 20 additions & 35 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/record.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading