From f6a561f386aa99730efcc79a4be0b7d2904307bc Mon Sep 17 00:00:00 2001 From: Reed Schalo Date: Mon, 21 Oct 2024 16:30:09 -0700 Subject: [PATCH 1/2] fix: crd pinning for webhook test --- test/hack/e2e_scripts/install_karpenter.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hack/e2e_scripts/install_karpenter.sh b/test/hack/e2e_scripts/install_karpenter.sh index ac55078469f8..bf88b6b22be8 100755 --- a/test/hack/e2e_scripts/install_karpenter.sh +++ b/test/hack/e2e_scripts/install_karpenter.sh @@ -4,7 +4,7 @@ aws eks update-kubeconfig --name "$CLUSTER_NAME" if (( "$WEBHOOKS_ENABLED" == false )); then helm upgrade --install karpenter-crd oci://public.ecr.aws/karpenter/karpenter-crd \ --namespace kube-system \ - --version "0-$(git rev-parse HEAD)" \ + --version "0.37.0" \ --set webhook.enabled=${WEBHOOKS_ENABLED} \ --wait fi From 3f5f6a01e5bc46c36f4665084fcce37690f31fdf Mon Sep 17 00:00:00 2001 From: Reed Schalo Date: Tue, 22 Oct 2024 09:07:43 -0700 Subject: [PATCH 2/2] fix chart path --- test/hack/e2e_scripts/install_karpenter.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/hack/e2e_scripts/install_karpenter.sh b/test/hack/e2e_scripts/install_karpenter.sh index bf88b6b22be8..7bdfce86a6c8 100755 --- a/test/hack/e2e_scripts/install_karpenter.sh +++ b/test/hack/e2e_scripts/install_karpenter.sh @@ -1,10 +1,12 @@ aws eks update-kubeconfig --name "$CLUSTER_NAME" # First, conditionally install the webhook stanza and CRDs +SKIP_CRDS=false if (( "$WEBHOOKS_ENABLED" == false )); then -helm upgrade --install karpenter-crd oci://public.ecr.aws/karpenter/karpenter-crd \ +SKIP_CRDS=true +helm upgrade --install karpenter-crd oci://$ECR_ACCOUNT_ID.dkr.ecr.$ECR_REGION.amazonaws.com/karpenter/snapshot/karpenter-crd \ --namespace kube-system \ - --version "0.37.0" \ + --version "0-$(git rev-parse HEAD)" \ --set webhook.enabled=${WEBHOOKS_ENABLED} \ --wait fi @@ -42,4 +44,5 @@ helm upgrade --install karpenter "${CHART}" \ --set "serviceMonitor.endpointConfig.relabelings[2].replacement=$(git describe --abbrev=0 --tags)" \ --set "serviceMonitor.endpointConfig.relabelings[3].targetLabel=commitsAfterTag" \ --set "serviceMonitor.endpointConfig.relabelings[3].replacement=\"$(git describe --tags | cut -d '-' -f 2)\"" \ + --skip-crds $SKIP_CRDS \ --wait