From 99090e29675401eb03c6386f6085090b3701733d Mon Sep 17 00:00:00 2001 From: Amanuel Engeda <74629455+engedaam@users.noreply.github.com> Date: Wed, 7 Aug 2024 19:56:19 -0700 Subject: [PATCH] ci: Enables webhooks for v0.33.x (#6687) --- .github/actions/e2e/install-karpenter/action.yaml | 5 +---- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/actions/e2e/install-karpenter/action.yaml b/.github/actions/e2e/install-karpenter/action.yaml index 18c6efbd36fa..b6c5f2a2c6f6 100644 --- a/.github/actions/e2e/install-karpenter/action.yaml +++ b/.github/actions/e2e/install-karpenter/action.yaml @@ -52,10 +52,7 @@ runs: # Parse minor version to determine whether to enable the webhooks VERSION=${{ inputs.k8s_version }} RELEASE_VERSION_MINOR="${VERSION#*.}" - WEBHOOK_ENABLED=false - if (( RELEASE_VRESION_MINOR < 25 )); then - WEBHOOK_ENABLED=true - fi + WEBHOOK_ENABLED=true helm upgrade --install karpenter oci://${{ inputs.ecr_account_id }}.dkr.ecr.${{ inputs.ecr_region }}.amazonaws.com/karpenter/snapshot/karpenter \ -n kube-system \ diff --git a/go.mod b/go.mod index d55f453fcfdb..0c6a5031b3c8 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( k8s.io/utils v0.0.0-20240102154912-e7106e64919e knative.dev/pkg v0.0.0-20231010144348-ca8c009405dd sigs.k8s.io/controller-runtime v0.18.4 - sigs.k8s.io/karpenter v0.33.6-0.20240807210902-f809854aff14 + sigs.k8s.io/karpenter v0.33.6-0.20240808010853-b68592b331c3 ) require ( diff --git a/go.sum b/go.sum index 5a3bde96197a..e5ea30672cd5 100644 --- a/go.sum +++ b/go.sum @@ -760,8 +760,8 @@ sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHv sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/karpenter v0.33.6-0.20240807210902-f809854aff14 h1:lyXbABn2rKZqEMktj5AR1Wq2v9MAcYgqHNQKtwNGuFA= -sigs.k8s.io/karpenter v0.33.6-0.20240807210902-f809854aff14/go.mod h1:CpSddDzJyNGROic0uqiYM/+p7c/8iO7zshDf+rd1gJY= +sigs.k8s.io/karpenter v0.33.6-0.20240808010853-b68592b331c3 h1:oOGx0IVMsjhc/paRo5NidaSpkoRYG8AOoJvEK949FmE= +sigs.k8s.io/karpenter v0.33.6-0.20240808010853-b68592b331c3/go.mod h1:CpSddDzJyNGROic0uqiYM/+p7c/8iO7zshDf+rd1gJY= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=