Merge pull request #1291 from devstream-io/main

Prepare to Release v0.10.1

Author: daniel-hutao

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -28,8 +28,8 @@ body:
     label: 'DevStream Version'
     description: "To find out the version run: `dtm version`"
     options:
-      - < v0.9.1
-      - v0.9.1
+      - < v0.10.0
+      - v0.10.0
       - latest
   validations:
     required: true

.github/workflows/e2e-test.yml

@@ -18,9 +18,10 @@ env:
   # see https://github.com/devstream-io/devstream/pull/414 for more info
   GITHUB_TOKEN: ${{ secrets.E2E_GITHUB_TOKEN }}
   DOCKERHUB_USERNAME: ${{ secrets.E2E_DOCKERHUB_USERNAME }}
+  # for github actions
   DOCKERHUB_TOKEN: ${{ secrets.E2E_DOCKERHUB_TOKEN }}
-  TRELLO_API_KEY: ${{ secrets.E2E_TRELLO_API_KEY }}
-  TRELLO_TOKEN: ${{ secrets.E2E_TRELLO_TOKEN }}
+  # for apps
+  IMAGE_REPO_PASSWORD: ${{ secrets.E2E_DOCKERHUB_TOKEN }}
 
 concurrency:
   group: ${{ github.workflow }}
@@ -39,7 +40,6 @@ jobs:
     runs-on: [self-hosted, linux, X64]
     name: e2e-test-${{ matrix.os }}
     steps:
-      - run: echo "🐧 This job is now running on a ${{ runner.os }}-${{ runner.arch }} server hosted by GitHub!"
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup Golang env
@@ -65,24 +65,33 @@ jobs:
       - name: Configure EKS credentials
         run: |
           aws eks update-kubeconfig --region ap-southeast-1 --name dtm-test
-      - name: copy config files
-        run: cp ./test/e2e/yaml/e2e-*.yaml ./
-      - name: apply git-ops
-        run: ./dtm apply -f e2e-config.yaml -y
-      - name: apply twice git-ops
-        run: ./dtm apply -f e2e-config.yaml -y
-      - name: install kubectl
+      - name: Install kubectl
         run: |
           curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/amd64/kubectl
           chmod +x ./kubectl
           sudo mv ./kubectl /usr/local/bin/kubectl
-      - name: check if pod is ready
+      - name: copy config files
+        run: cp ./test/e2e/yaml/e2e-*.yaml ./
+      - name: test 1 - apply git-ops (tools only)
+        run: ./dtm apply -f e2e-tools.yaml -y
+      - name: test 1 - apply git-ops (tools only) again
+        run: ./dtm apply -f e2e-tools.yaml -y
+      - name: test 1 - check if pod is ready
+        run: while [[ $(kubectl get pods -l app=dtme2epython -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True" ]]; do echo "pod not ready yet..."; sleep 3; done
+        timeout-minutes: 10
+      - name: test 1 - verify
+        run: ./dtm verify -f e2e-tools.yaml
+      - name: test 1 - clean
+        run: ./dtm delete -f e2e-tools.yaml -y
+      - name: test 2 - apply (apps)
+        run: ./dtm apply -f e2e-apps.yaml -y
+      - name: test 2 - apply (apps) again
+        run: ./dtm apply -f e2e-apps.yaml -y
+      - name: test 2 - check if pod is ready
         run: while [[ $(kubectl get pods -l app=dtm-e2e-go -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True" ]]; do echo "pod not ready yet..."; sleep 3; done
         timeout-minutes: 10
-      - name: verify
-        run: ./dtm verify -f e2e-config.yaml
-      - name: clean
-        run: ./dtm delete -f e2e-config.yaml -y
+      - name: test 2 - clean
+        run: ./dtm delete -f e2e-apps.yaml -y
       - name: test e2e success or not
         if: failure()
         run: |

.github/workflows/lint-yaml.yml

@@ -0,0 +1,23 @@
+name: Yaml Lint
+
+on:
+  pull_request:
+    branches: [ main ]
+    paths:
+      - '**.yaml'
+      - '**.yml'
+
+jobs:
+  yamlLint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Remove All Strings In Square Brackets
+        run: |
+          # remove strings in "[[]]" in .yml or .yaml files, or yaml lint will fail
+          sed -i "s/\[\[.*\]\]//g" `grep "\[\[.*\]\]" -rl --include="*.yml" --include="*.yaml" .`
+      - name: Yaml Lint
+        uses: ibiqlik/action-yamllint@v3
+        with:
+          file_or_dir: .
+          config_file: .yamllint.yml

.yamllint.yml

@@ -0,0 +1,34 @@
+extends: default
+rules:
+  brackets: disable # do not check brackets
+  comments:
+    require-starting-space: true
+    min-spaces-from-content: 1 # at leaset 1 space between comment and content
+  document-start: disable  # whether the document must start with '---' is optional
+  indentation:
+    spaces: 2
+    # block sequences should not be indented
+    # e.g.:
+    # OK:
+    # key:
+    # - value1
+    # - value2
+    # NOT OK:
+    # key:
+    #   - value1
+    #   - value2
+    indent-sequences: false
+  line-length: disable
+  new-line-at-end-of-file: enable # must have a new line at the end of file
+  trailing-spaces: disable # do not check trailing spaces
+  truthy: disable # do not check truthy
+ignore: |
+  *.tpl.yaml
+  *.tpl.yml
+  *tmpl.yaml
+  *tmpl.yml
+  *template.yml
+  *template.yaml
+  **/.github/**
+  **/githubactions/**
+  **/workflows/**

docs/best-practices/air-gapped-deployment.zh.md

@@ -33,7 +33,7 @@ chmod +x dtm
 
 ```shell
 $ dtm version
-0.9.1
+0.10.0
 ```
 
 ### 1.2、下载 plugins