Merge pull request #500 from duanmengkk/feature_globalnode

add workflows ci for upload dev images
kosmos-io · Apr 30, 2024 · bbe8125 · bbe8125
2 parents 4b06564 + cce43b5
commit bbe8125
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 18 deletions.
diff --git a/.github/workflows/dev_images.yml b/.github/workflows/dev_images.yml
@@ -1,14 +1,12 @@
-name: Dev Images
+name: Upload Images
 on:
   push:
-  pull_request:
-  workflow_dispatch:
+    branches:
+      - main
 jobs:
   images:
     runs-on: ubuntu-latest
     permissions: write-all
-    # not trigger on 'kosmos-io/kosmos'
-    if: github.repository != 'kosmos-io/kosmos'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -19,15 +17,9 @@ jobs:
       - name: Login registry
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-      - name: 'Get Previous tag'
-        id: previoustag
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
-        with:
-          fallback: 1.0.0
       - name: Push images
         env:
           ON_PLUGINS: true
-          REGISTRY: ghcr.io/${{ github.repository_owner }}/${{ github.repository_name }}
-          TAG: ${{ steps.previoustag.outputs.tag }}
+          TAG: latest
         run: |
-          make upload-images REGISTRY=${REGISTRY%?} VERSION=$TAG
+          make upload-images VERSION=$TAG
diff --git a/.github/workflows/dev_images_personal.yml b/.github/workflows/dev_images_personal.yml
@@ -0,0 +1,33 @@
+name: Latest image to DockerHub
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+jobs:
+  images:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    # not trigger on 'kosmos-io/kosmos'
+    if: github.repository != 'kosmos-io/kosmos'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up qemu
+        uses: docker/setup-qemu-action@v2
+      - name: Login registry
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: 'Get Previous tag'
+        id: previoustag
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        with:
+          fallback: 1.0.0
+      - name: Push images
+        env:
+          ON_PLUGINS: true
+          REGISTRY: ghcr.io/${{ github.repository_owner }}/${{ github.repository_name }}
+          TAG: ${{ steps.previoustag.outputs.tag }}
+        run: |
+          make upload-images REGISTRY=${REGISTRY%?} VERSION=$TAG
diff --git a/hack/cluster.sh b/hack/cluster.sh
@@ -191,7 +191,6 @@ function addTaint() {
   local member_cluster=$2
   leafnode="kosmos-${member_cluster}"
   HOST_CLUSTER_DIR="${ROOT}/environments/${host_cluster}"
-  MEMBER_CLUSTER_DIR="${ROOT}/environments/${member_cluster}"
 
   sleep 100 && kubectl --kubeconfig $HOST_CLUSTER_DIR/kubeconfig get node -owide
   kubectl --kubeconfig $HOST_CLUSTER_DIR/kubeconfig taint nodes $leafnode test-node/e2e=leafnode:NoSchedule

diff --git a/hack/node-agent/node-agent.service b/hack/node-agent/node-agent.service
@@ -7,11 +7,7 @@ User=root
 Group=root
 WorkingDirectory=/srv/node-agent
 EnvironmentFile=-/srv/node-agent/agent.env
-#./app: error while loading shared libraries: libz.so.1: failed to map segment from shared object
 Environment="TMPDIR=/srv/node-agent"
-#ExecStartPre=-/usr/bin/pip3 install -r /srv/node-agent/requirements.txt
-#ExecStart=/usr/bin/env python3 /srv/node-agent/app.py
-#ExecStart=/srv/node-agent/app
 ExecStart=/srv/node-agent/node-agent
 Restart=on-failure
 RestartSec=5