Merge branch 'main' of github.com:dragonflyoss/Dragonfly2 into releas…

…e-2.0.9
dragonflyoss · Apr 12, 2023 · a2117ef · a2117ef
2 parents 5e80e0c + f2e42bc
commit a2117ef
Show file tree

Hide file tree

Showing 143 changed files with 4,492 additions and 5,479 deletions.
diff --git a/.github/workflows/check-size.yml b/.github/workflows/check-size.yml
@@ -2,9 +2,9 @@ name: Check Size
 
 on:
   push:
-    branches: [ main, release-* ]
+    branches: [main, release-*]
   pull_request:
-    branches: [ main, release-* ]
+    branches: [main, release-*]
 
 env:
   GO_VERSION: '1.20'

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,11 +2,11 @@ name: CI
 
 on:
   push:
-    branches: [ main, release-* ]
-    paths-ignore: [ '**.md', '**.png', '**.jpg', '**.svg', '**/docs/**' ]
+    branches: [main, release-*]
+    paths-ignore: ['**.md', '**.png', '**.jpg', '**.svg', '**/docs/**']
   pull_request:
     branches: [ main, release-* ]
-    paths-ignore: [ '**.md', '**.png', '**.jpg', '**.svg', '**/docs/**' ]
+    paths-ignore: ['**.md', '**.png', '**.jpg', '**.svg', '**/docs/**']
   schedule:
     - cron: '0 4 * * *'
 
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -61,7 +61,7 @@ jobs:
     needs: [test]
     steps:
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 

diff --git a/.github/workflows/compatibility-e2e.yml b/.github/workflows/compatibility-e2e.yml
@@ -16,7 +16,7 @@ env:
   CONTAINERD_VERSION: v1.5.2
   KIND_CONFIG_PATH: test/testdata/kind/config.yaml
   DRAGONFLY_CHARTS_PATH: deploy/helm-charts/charts/dragonfly
-  DRAGONFLY_CHARTS_CONFIG_PATH: test/testdata/charts/config.yaml
+  DRAGONFLY_CHARTS_CONFIG_PATH: test/testdata/charts/config-compatibility.yaml
   DRAGONFLY_FILE_SERVER_PATH: test/testdata/k8s/file-server.yaml
   DRAGONFLY_PROXY_SERVER_PATH: test/testdata/k8s/proxy.yaml
 
@@ -31,11 +31,11 @@ jobs:
         include:
           - module: manager
             image: manager
-            image-tag: v2.0.9-rc.2
+            image-tag: v2.0.9
             chart-name: manager
           - module: scheduler
             image: scheduler
-            image-tag: v2.0.9-rc.2
+            image-tag: v2.0.9
             chart-name: scheduler
           - module: dfdaemon
             image: dfdaemon
@@ -52,7 +52,7 @@ jobs:
           submodules: recursive
 
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -67,7 +67,7 @@ jobs:
           submodules: recursive
 
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: '1.20'
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
           submodules: recursive
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: '1.20'
 

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -2,15 +2,16 @@
 
 <!-- markdownlint-disable -->
 
-|                   GitHub ID                   |     Name     |            Email             |    Company    |
-| :-------------------------------------------: | :----------: | :--------------------------: | :-----------: |
-|  [allencloud](https://github.com/allencloud)  |  Allen Sun   | [email protected] | Alibaba Group |
-| [garfield009](https://github.com/garfield009) | Zuozheng Hu  | [email protected] | Alibaba Group |
-|    [bigerous](https://github.com/bigerous)    |  Dajun Cui   | [email protected] | Alibaba Group |
-|      [jim3ma](https://github.com/jim3ma)      |    Jim Ma    |     [email protected]     |   Ant Group   |
-|    [gaius-qi](https://github.com/gaius-qi)    |   Gaius Qi   |      [email protected]      |   Ant Group   |
-|     [hyy0322](https://github.com/hyy0322)     | Yiyang Huang |       [email protected]       |   ByteDance   |
-|   [garen wen](https://github.com/garenwen)    |  Garen Wen   |     [email protected]      |  Baidu Group  |
-|     [yxxhero](https://github.com/yxxhero)     |   yxxhero    |      [email protected]       |   gitlab.cn   |
+|                     GitHub ID                     |      Name       |            Email             |    Company    |
+| :-----------------------------------------------: | :-------------: | :--------------------------: | :-----------: |
+|    [allencloud](https://github.com/allencloud)    |    Allen Sun    | [email protected] | Alibaba Group |
+|   [garfield009](https://github.com/garfield009)   |   Zuozheng Hu   | [email protected] | Alibaba Group |
+|      [bigerous](https://github.com/bigerous)      |    Dajun Cui    | [email protected] | Alibaba Group |
+|        [jim3ma](https://github.com/jim3ma)        |     Jim Ma      |     [email protected]     |   Ant Group   |
+|      [gaius-qi](https://github.com/gaius-qi)      |    Gaius Qi     |      [email protected]      |   Ant Group   |
+| [mfarooq-intel](https://github.com/mfarooq-intel) | Mohammed Farooq |     [email protected]     |     Intel     |
+|       [hyy0322](https://github.com/hyy0322)       |  Yiyang Huang   |       [email protected]       |   ByteDance   |
+|     [garen wen](https://github.com/garenwen)      |    Garen Wen    |     [email protected]      |  Baidu Group  |
+|       [yxxhero](https://github.com/yxxhero)       |     yxxhero     |      [email protected]       |   gitlab.cn   |
 
 <!-- markdownlint-restore -->