Skip to content

Commit c274abe

Browse files
committed
skip crd installation in helm
1 parent 2e27f6c commit c274abe

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

test/canary/scripts/install_controller_helm.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ function install_helm_chart() {
1313
yq w -i helm/values.yaml "aws.region" $region
1414

1515
kubectl create namespace $namespace
16-
helm install -n $namespace ack-$service-controller helm
16+
kubectl apply -f helm/crds
17+
helm install -n $namespace ack-$service-controller --skip-crds helm
1718
}

test/canary/scripts/run_test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ function cleanup {
4747
print_controller_logs
4848

4949
helm delete -n $NAMESPACE ack-$SERVICE-controller
50+
kubectl delete -f helm/crds
5051
kubectl delete namespace $NAMESPACE
5152

5253
cd $E2E_DIR

test/canary/scripts/setup_oidc.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# A function to get the OIDC_ID associated with an EKS cluster
55
function get_oidc_id() {
66
local cluster_name="$1"
7-
local region = "$2"
8-
eksctl utils associate-iam-oidc-provider --cluster $cluster_name --region $region --approve
7+
local region="$2"
8+
eksctl utils associate-iam-oidc-provider --cluster $cluster_name --region $region --approve > /dev/null
99
local oidc_url=$(aws eks describe-cluster --region $region --name $cluster_name --query "cluster.identity.oidc.issuer" --output text | cut -c9-)
1010
echo "${oidc_url}"
1111
}

0 commit comments

Comments
 (0)