add back in 1.25

aws · Sep 30, 2024 · 6085f1f · 6085f1f
1 parent 135ae29
commit 6085f1f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml
@@ -14,7 +14,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          k8sVersion: ["1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x", "1.31.x"]
+          k8sVersion: ["1.25", "1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x", "1.31.x"]
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - uses: ./.github/actions/install-deps

diff --git a/.github/workflows/e2e-matrix.yaml b/.github/workflows/e2e-matrix.yaml
@@ -34,6 +34,7 @@ on:
       k8s_version:
         type: choice
         options:
+          - "1.25"
           - "1.26"
           - "1.27"
           - "1.28"

diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml
@@ -16,6 +16,7 @@ on:
       k8s_version:
         type: choice
         options:
+          - "1.25"
           - "1.26"
           - "1.27"
           - "1.28"

diff --git a/.github/workflows/e2e-version-compatibility-trigger.yaml b/.github/workflows/e2e-version-compatibility-trigger.yaml
@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        k8s_version: ["1.26", "1.27", "1.28", "1.29", "1.30", "1.31"]
+        k8s_version: ["1.25", "1.26", "1.27", "1.28", "1.29", "1.30", "1.31"]
     uses: ./.github/workflows/e2e-matrix.yaml
     with:
       region: ${{ inputs.region || 'eu-west-1' }}

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -30,6 +30,7 @@ on:
       k8s_version:
         type: choice
         options:
+          - "1.25"
           - "1.26"
           - "1.27"
           - "1.28"

diff --git a/pkg/providers/version/version.go b/pkg/providers/version/version.go
@@ -34,7 +34,7 @@ const (
 	// Karpenter's supported version of Kubernetes
 	// If a user runs a karpenter image on a k8s version outside the min and max,
 	// One error message will be fired to notify
-	MinK8sVersion = "1.26"
+	MinK8sVersion = "1.25"
 	MaxK8sVersion = "1.31"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ on: @@
           k8s_version:
             type: choice
             options:
+              - "1.25"
               - "1.26"
               - "1.27"
               - "1.28"
@@ Expand Down @@