Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion test/canary/scripts/install_controller_helm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ function install_helm_chart() {
yq w -i helm/values.yaml "aws.region" $region

kubectl create namespace $namespace
helm install -n $namespace ack-$service-controller helm
kubectl apply -f helm/crds
helm install -n $namespace ack-$service-controller --skip-crds helm
}
3 changes: 3 additions & 0 deletions test/canary/scripts/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ function cleanup {
print_controller_logs

helm delete -n $NAMESPACE ack-$SERVICE-controller
pushd $SERVICE_REPO_PATH
kubectl delete -f helm/crds
popd
kubectl delete namespace $NAMESPACE

cd $E2E_DIR
Expand Down
4 changes: 2 additions & 2 deletions test/canary/scripts/setup_oidc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# A function to get the OIDC_ID associated with an EKS cluster
function get_oidc_id() {
local cluster_name="$1"
local region = "$2"
eksctl utils associate-iam-oidc-provider --cluster $cluster_name --region $region --approve
local region="$2"
eksctl utils associate-iam-oidc-provider --cluster $cluster_name --region $region --approve > /dev/null
local oidc_url=$(aws eks describe-cluster --region $region --name $cluster_name --query "cluster.identity.oidc.issuer" --output text | cut -c9-)
echo "${oidc_url}"
}
Expand Down