Skip to content

Commit bd9b879

Browse files
committed
add policy deletion
1 parent fd4d09e commit bd9b879

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

hack/e2e/run.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,18 @@ if [[ "${CLEAN}" == true ]]; then
258258
"${CLUSTER_NAME}" \
259259
"${KOPS_STATE_FILE}"
260260

261+
aws iam list-role-policies --role-name ${ADMIN_ROLE_NAME} --query "PolicyNames[]" --output text |
262+
while read policy_name; do
263+
echo "Deleting inline policy: $policy_name"
264+
aws iam delete-role-policy --role-name ${ADMIN_ROLE_NAME} --policy-name "$policy_name"
265+
done
261266
aws iam delete-role --role-name "${ADMIN_ROLE_NAME}" --region ${REGION}
267+
268+
aws iam list-role-policies --role-name ${USER_ROLE_NAME} --query "PolicyNames[]" --output text |
269+
while read policy_name; do
270+
echo "Deleting inline policy: $policy_name"
271+
aws iam delete-role-policy --role-name ${USER_ROLE_NAME} --policy-name "$policy_name"
272+
done
262273
aws iam delete-role --role-name "${USER_ROLE_NAME}" --region ${REGION}
263274
else
264275
loudecho "Not cleaning"

pkg/server/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ func (c *Server) getHandler(ctx context.Context, backendMapper BackendMapper, ec
215215
cfg.Region = "us-east-1"
216216
} else {
217217
instanceRegion = instanceRegionOutput.Region
218+
cfg.Region = instanceRegion
218219
}
219220
ec2Client := ec2.NewFromConfig(cfg)
220221

0 commit comments

Comments
 (0)