fix helm project-operator CI

Signed-off-by: Alexandre Lamarre <[email protected]>
rancher · Mar 27, 2024 · 3244e50 · 3244e50
1 parent 327610d
commit 3244e50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/e2e-ci.yaml b/.github/workflows/e2e-ci.yaml
@@ -28,7 +28,7 @@ on:
 env:
   GOARCH: amd64
   CGO_ENABLED: 0
-  SETUP_GO_VERSION: '^1.18'
+  SETUP_GO_VERSION: '^1.22'
   YQ_VERSION: v4.25.1
   E2E_CI: true
   REPO: rancher
@@ -48,7 +48,7 @@ jobs:
       matrix:
         k3s_version:
           # k3d version list k3s | sed 's/+/-/' | sort -h
-          - ${{ github.event.inputs.k3s_version || 'v1.20.15-k3s1' }}
+          - ${{ github.event.inputs.k3s_version || 'v1.27.4+k3s1' }}
     steps:
       -
         uses: actions/checkout@v3
@@ -58,6 +58,11 @@ jobs:
         name: Install mikefarah/yq
         run: |
           sudo wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq;
+      - 
+        name: setup Go
+        uses: actions/setup-go@v5
+          with:
+            go-version: '1.22'
       -
         name: Perform CI
         run: |

diff --git a/.github/workflows/e2e/scripts/create-project-namespace.sh b/.github/workflows/e2e/scripts/create-project-namespace.sh
@@ -6,7 +6,7 @@ source $(dirname $0)/entry
 cd $(dirname $0)/../../../..
 
 kubectl create namespace e2e-hpo || true
-kubectl label namespace e2e-hpo field.cattle.io/projectId=p-example --overwrite
+kubectl label namespace e2e-hpo field.cattle.io/projectId:e2e-ci-helm-project-operator:p-example --overwrite
 sleep "${DEFAULT_SLEEP_TIMEOUT_SECONDS}"
 if ! kubectl get namespace cattle-project-p-example; then
     echo "ERROR: Expected cattle-project-p-example namespace to exist after ${DEFAULT_SLEEP_TIMEOUT_SECONDS} seconds, not found"