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

Jump to bottom

test: Provide IAM permission to cloudformation:DescribeStackResources #4786

Merged
merged 2 commits into from
Oct 11, 2023
Merged

test: Provide IAM permission to cloudformation:DescribeStackResources #4786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76bcd79
Provide IAM permission to cloudformation:DescribeStackResources
jonathan-innis Oct 10, 2023
9bf19c6
Add handling for upgrade of serviceaccounts
jonathan-innis Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/actions/e2e/create-cluster/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ runs:
cmd="create"
eksctl get cluster --name ${{ inputs.cluster_name }} && cmd="upgrade"

eksctl ${cmd} cluster -f - <<EOF
cat << EOF >> clusterconfig.yaml
---
apiVersion: eksctl.io/v1alpha5
kind: ClusterConfig
Expand Down Expand Up @@ -146,6 +146,14 @@ runs:
wellKnownPolicies:
ebsCSIController: true
EOF

eksctl ${cmd} cluster -f clusterconfig.yaml

# We need to call these update iamserviceaccount commands again since the "eksctl upgrade cluster" action
# doesn't handle updates to IAM serviceaccounts correctly when the roles assigned to them change
eksctl update iamserviceaccount -f clusterconfig.yaml --approve


- name: tag oidc provider of the cluster
if: always()
shell: bash
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/e2e-matrix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@ jobs:
e2e-upgrade:
uses: ./.github/workflows/e2e-upgrade.yaml
with:
# This version matches the steps of the newest version of the install-eksctl action
# which will take in the eksctl_version into the composite action
from_git_ref: 3519331035579ac0caf66a7f5a5282a2fef9b409
# This version matches the steps of the newest version that contains the additional step
# of deploying the instance profile so that the pre-upgrade and post-upgrade create-cluster
# actions have the same number of steps and don't fail during post-cleanup
from_git_ref: 62c25a3ea85c7d00165e60a913fff1ec7c1f29fd
to_git_ref: ${{ inputs.git_ref }}
region: ${{ inputs.region }}
k8s_version: ${{ inputs.k8s_version }}
Expand Down
1 change: 1 addition & 0 deletions test/cloudformation/iam_cloudformation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ Resources:
- cloudformation:DeleteStack
- cloudformation:DescribeChangeSet
- cloudformation:DescribeStackEvents
- cloudformation:DescribeStackResources
- cloudformation:ExecuteChangeSet
- cloudformation:GetTemplate
- cloudformation:GetTemplateSummary
Expand Down