ci: fix scheduler e2e workflow after 1.28 upgradation (#2053)

Signed-off-by: saintube <saintube@foxmail.com>
koordinator-sh · May 21, 2024 · 4bdcd66 · 4bdcd66
1 parent 44d8d1b
commit 4bdcd66
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/e2e-k8s-1.22.yaml b/.github/workflows/e2e-k8s-1.22.yaml
@@ -43,8 +43,11 @@ jobs:
           docker build --pull . -t ${MANAGER_IMAGE} -f docker/koord-manager.dockerfile
           export KOORDLET_IMAGE="koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID}"
           docker build --pull . -t ${KOORDLET_IMAGE} -f docker/koordlet.dockerfile
+          export SCHEDULER_IMAGE="koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID}"
+          docker build --pull . -t ${SCHEDULER_IMAGE} -f docker/koord-scheduler.dockerfile
           kind load docker-image --name=${KIND_CLUSTER_NAME} ${MANAGER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${MANAGER_IMAGE}"; exit 1; }
           kind load docker-image --name=${KIND_CLUSTER_NAME} ${KOORDLET_IMAGE} || { echo >&2 "kind not installed or error loading image: ${KOORDLET_IMAGE}"; exit 1; }
+          kind load docker-image --name=${KIND_CLUSTER_NAME} ${SCHEDULER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${SCHEDULER_IMAGE}"; exit 1; }
       - name: Check host environment
         run: |
           set -ex
@@ -58,7 +61,7 @@ jobs:
         run: |
           set -ex
           kubectl cluster-info
-          KUBERNETES_VERSION="1.22" MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
+          KUBERNETES_VERSION="1.22" MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} SCHEDULER_IMG=koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
           NODES=$(kubectl get node | wc -l)
           for ((i=1;i<10;i++));
           do

diff --git a/.github/workflows/e2e-k8s-1.24.yaml b/.github/workflows/e2e-k8s-1.24.yaml
@@ -43,8 +43,11 @@ jobs:
           docker build --pull . -t ${MANAGER_IMAGE} -f docker/koord-manager.dockerfile
           export KOORDLET_IMAGE="koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID}"
           docker build --pull . -t ${KOORDLET_IMAGE} -f docker/koordlet.dockerfile
+          export SCHEDULER_IMAGE="koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID}"
+          docker build --pull . -t ${SCHEDULER_IMAGE} -f docker/koord-scheduler.dockerfile
           kind load docker-image --name=${KIND_CLUSTER_NAME} ${MANAGER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${MANAGER_IMAGE}"; exit 1; }
           kind load docker-image --name=${KIND_CLUSTER_NAME} ${KOORDLET_IMAGE} || { echo >&2 "kind not installed or error loading image: ${KOORDLET_IMAGE}"; exit 1; }
+          kind load docker-image --name=${KIND_CLUSTER_NAME} ${SCHEDULER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${SCHEDULER_IMAGE}"; exit 1; }
       - name: Check host environment
         run: |
           set -ex
@@ -58,7 +61,7 @@ jobs:
         run: |
           set -ex
           kubectl cluster-info
-          MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
+          MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} SCHEDULER_IMG=koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
           NODES=$(kubectl get node | wc -l)
           for ((i=1;i<10;i++));
           do

diff --git a/.github/workflows/e2e-k8s-1.28.yaml b/.github/workflows/e2e-k8s-1.28.yaml
@@ -43,8 +43,11 @@ jobs:
           docker build --pull . -t ${MANAGER_IMAGE} -f docker/koord-manager.dockerfile
           export KOORDLET_IMAGE="koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID}"
           docker build --pull . -t ${KOORDLET_IMAGE} -f docker/koordlet.dockerfile
+          export SCHEDULER_IMAGE="koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID}"
+          docker build --pull . -t ${SCHEDULER_IMAGE} -f docker/koord-scheduler.dockerfile
           kind load docker-image --name=${KIND_CLUSTER_NAME} ${MANAGER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${MANAGER_IMAGE}"; exit 1; }
           kind load docker-image --name=${KIND_CLUSTER_NAME} ${KOORDLET_IMAGE} || { echo >&2 "kind not installed or error loading image: ${KOORDLET_IMAGE}"; exit 1; }
+          kind load docker-image --name=${KIND_CLUSTER_NAME} ${SCHEDULER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${SCHEDULER_IMAGE}"; exit 1; }
       - name: Check host environment
         run: |
           set -ex
@@ -58,7 +61,7 @@ jobs:
         run: |
           set -ex
           kubectl cluster-info
-          MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
+          MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} SCHEDULER_IMG=koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
           NODES=$(kubectl get node | wc -l)
           for ((i=1;i<10;i++));
           do

diff --git a/.github/workflows/e2e-k8s-latest.yaml b/.github/workflows/e2e-k8s-latest.yaml
@@ -5,14 +5,14 @@ on:
     branches:
       - main
       - release-*
-  pull_request: {}
+  # For the latest version of the K8S, check it in the main branch and no need to run in each PR.
   workflow_dispatch: {}
 
 env:
   # Common versions
   GO_VERSION: '1.20'
   KIND_ACTION_VERSION: 'v1.5.0'
-  KIND_VERSION: 'v0.20.0'
+  KIND_VERSION: 'v0.22.0'
   KIND_CLUSTER_NAME: 'ci-testing'
   COMPONENT_NS: "koordinator-system"
 
@@ -41,8 +41,11 @@ jobs:
           docker build --pull . -t ${MANAGER_IMAGE} -f docker/koord-manager.dockerfile
           export KOORDLET_IMAGE="koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID}"
           docker build --pull . -t ${KOORDLET_IMAGE} -f docker/koordlet.dockerfile
+          export SCHEDULER_IMAGE="koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID}"
+          docker build --pull . -t ${SCHEDULER_IMAGE} -f docker/koord-scheduler.dockerfile
           kind load docker-image --name=${KIND_CLUSTER_NAME} ${MANAGER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${MANAGER_IMAGE}"; exit 1; }
           kind load docker-image --name=${KIND_CLUSTER_NAME} ${KOORDLET_IMAGE} || { echo >&2 "kind not installed or error loading image: ${KOORDLET_IMAGE}"; exit 1; }
+          kind load docker-image --name=${KIND_CLUSTER_NAME} ${SCHEDULER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${SCHEDULER_IMAGE}"; exit 1; }
       - name: Check host environment
         run: |
           set -ex
@@ -56,7 +59,7 @@ jobs:
         run: |
           set -ex
           kubectl cluster-info
-          MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
+          MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} SCHEDULER_IMG=koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
           NODES=$(kubectl get node | wc -l)
           for ((i=1;i<10;i++));
           do

diff --git a/config/manager/scheduler-config.yaml b/config/manager/scheduler-config.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: system
 data:
   koord-scheduler-config: |
-    apiVersion: kubescheduler.config.k8s.io/v1beta2
+    apiVersion: kubescheduler.config.k8s.io/v1beta3
     kind: KubeSchedulerConfiguration
     leaderElection:
       leaderElect: true
@@ -16,7 +16,7 @@ data:
       - pluginConfig:
         - name: NodeResourcesFit
           args:
-            apiVersion: kubescheduler.config.k8s.io/v1beta2
+            apiVersion: kubescheduler.config.k8s.io/v1beta3
             kind: NodeResourcesFitArgs
             scoringStrategy:
               type: LeastAllocated
@@ -31,7 +31,7 @@ data:
                   weight: 1
         - name: LoadAwareScheduling
           args:
-            apiVersion: kubescheduler.config.k8s.io/v1beta2
+            apiVersion: kubescheduler.config.k8s.io/v1beta3
             kind: LoadAwareSchedulingArgs
             filterExpiredNodeMetrics: false
             nodeMetricExpirationSeconds: 300
@@ -46,7 +46,7 @@ data:
               memory: 70
         - name: ElasticQuota
           args:
-            apiVersion: kubescheduler.config.k8s.io/v1beta2
+            apiVersion: kubescheduler.config.k8s.io/v1beta3
             kind: ElasticQuotaArgs
             quotaGroupNamespace: koordinator-system
         plugins:

diff --git a/config/manager/scheduler.yaml b/config/manager/scheduler.yaml
@@ -35,7 +35,6 @@ spec:
       containers:
         - args:
             - --port=10251
-            - --logtostderr=true
             - --authentication-skip-lookup=true
             - --v=4
             - --feature-gates=