Format milvus helm charts (#99)

* Add ct.yaml Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Format Milvus charts Signed-off-by: quicksilver <[email protected]> * Add release.yml in Github Action Signed-off-by: quicksilver <[email protected]> * Add release.yml in Github Action Signed-off-by: quicksilver <[email protected]> * Add release.yml in Github Action Signed-off-by: quicksilver <[email protected]> * Add release.yml in Github Action Signed-off-by: quicksilver <[email protected]> * Add release.yml in Github Action Signed-off-by: quicksilver <[email protected]> * Update README.md Signed-off-by: quicksilver <[email protected]> * Update README.md Signed-off-by: quicksilver <[email protected]> * Update README.md Signed-off-by: quicksilver <[email protected]> * Update README.md Signed-off-by: quicksilver <[email protected]> * Update README.md Signed-off-by: quicksilver <[email protected]> * Update lint-test.yml Signed-off-by: quicksilver <[email protected]>
zilliztech · Jun 28, 2020 · a3ac21f · a3ac21f
1 parent 6b9396e
commit a3ac21f
Show file tree

Hide file tree

Showing 31 changed files with 347 additions and 259 deletions.
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
@@ -5,20 +5,18 @@ on:
   push:
     # file paths to consider in the event. Optional; defaults to all.
     paths:
-      - 'templates/**'
-      - 'Chart.yaml'
-      - 'requirements.yaml'
-      - 'values.yaml'
-      - '.github/workflows/helm.yml'
+      - 'charts/**'
+      - 'ct.yaml'
+      - '.github/workflows/lint-test.yml'
+      - '!**.md'
       - '!**.txt'
   pull_request:
     # file paths to consider in the event. Optional; defaults to all.
     paths:
-      - 'templates/**'
-      - 'Chart.yaml'
-      - 'requirements.yaml'
-      - 'values.yaml'
-      - '.github/workflows/helm.yml'
+      - 'charts/**'
+      - 'ct.yaml'
+      - '.github/workflows/lint-test.yml'
+      - '!**.md'
       - '!**.txt'
 
 jobs:
@@ -34,14 +32,20 @@ jobs:
         run: git fetch --prune --unshallow
       - name: Run chart-testing (lint)
         id: lint
-        uses: helm/[email protected].1
+        uses: helm/[email protected].2
         with:
           command: lint
+          config: ct.yaml
       - name: Create kind cluster
         uses: helm/[email protected]
         # Only build a kind cluster if there are chart changes to test.
         if: steps.lint.outputs.changed == 'true'
+      - name: Modify Values Yaml file
+        shell: bash
+        run: |
+          sed -i '/^mysql:/{n;s/true/false/;}' charts/milvus/values.yaml
       - name: Run chart-testing (install)
-        uses: helm/[email protected].1
+        uses: helm/[email protected].2
         with:
           command: install
+          config: ct.yaml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,27 @@
+name: Release Charts
+
+# This workflow is triggered on pushes or pull request to the repository.
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Fetch history
+        run: git fetch --prune --unshallow
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+
+      - name: Run chart-releaser
+        uses: helm/[email protected]
+        env:
+          CR_TOKEN: "${{ secrets.CR_TOKEN }}"
diff --git a/README.md b/README.md
diff --git a/.helmignore → charts/milvus/.helmignore b/.helmignore → charts/milvus/.helmignore
diff --git a/Chart.yaml → charts/milvus/Chart.yaml b/Chart.yaml → charts/milvus/Chart.yaml
@@ -16,8 +16,7 @@ sources:
   - https://github.com/milvus-io/milvus
   - https://github.com/milvus-io/milvus-helm
 maintainers:
-  - name: milvus-dev
-    email: [email protected]
-  - name: community
-    email: [email protected]
-engine: gotpl
+  - email: [email protected]
+    name: community
+    url: www.zilliz.com
+engine: gotpl
diff --git a/charts/milvus/README.md b/charts/milvus/README.md
diff --git a/charts/mysql-1.6.4.tgz → charts/milvus/charts/mysql-1.6.4.tgz b/charts/mysql-1.6.4.tgz → charts/milvus/charts/mysql-1.6.4.tgz
diff --git a/ci/db_backend/mysql_cpu_values.yaml → ...ilvus/ci/db_backend/mysql_cpu_values.yaml b/ci/db_backend/mysql_cpu_values.yaml → ...ilvus/ci/db_backend/mysql_cpu_values.yaml
diff --git a/ci/db_backend/mysql_gpu_values.yaml → ...ilvus/ci/db_backend/mysql_gpu_values.yaml b/ci/db_backend/mysql_gpu_values.yaml → ...ilvus/ci/db_backend/mysql_gpu_values.yaml
@@ -2,14 +2,15 @@ cache:
   insertBufferSize: 1GB
   cacheSize: 8GB
 
-resources:
-  limits:
-    memory: "12Gi"
-    cpu: "4.0"
-    aliyun.com/gpu-mem: 2 # GiB
-  requests:
-    memory: "8Gi"
-    cpu: "2.0"
+image:
+  resources:
+    limits:
+      memory: "12Gi"
+      cpu: "4.0"
+      aliyun.com/gpu-mem: 2 # GiB
+    requests:
+      memory: "8Gi"
+      cpu: "2.0"
 
 gpu:
   enabled: true

diff --git a/ci/db_backend/sqlite_cpu_values.yaml → ...lvus/ci/db_backend/sqlite_cpu_values.yaml b/ci/db_backend/sqlite_cpu_values.yaml → ...lvus/ci/db_backend/sqlite_cpu_values.yaml
diff --git a/ci/db_backend/sqlite_gpu_values.yaml → ...lvus/ci/db_backend/sqlite_gpu_values.yaml b/ci/db_backend/sqlite_gpu_values.yaml → ...lvus/ci/db_backend/sqlite_gpu_values.yaml
@@ -2,14 +2,15 @@ cache:
   insertBufferSize: 1GB
   cacheSize: 8GB
 
-resources:
-  limits:
-    memory: "12Gi"
-    cpu: "4.0"
-    aliyun.com/gpu-mem: 2 # GiB
-  requests:
-    memory: "8Gi"
-    cpu: "2.0"
+image:
+  resources:
+    limits:
+      memory: "12Gi"
+      cpu: "4.0"
+      aliyun.com/gpu-mem: 2 # GiB
+    requests:
+      memory: "8Gi"
+      cpu: "2.0"
 
 gpu:
   enabled: true

diff --git a/ci/filebeat/values.yaml → charts/milvus/ci/filebeat/values.yaml b/ci/filebeat/values.yaml → charts/milvus/ci/filebeat/values.yaml
diff --git a/requirements.lock → charts/milvus/requirements.lock b/requirements.lock → charts/milvus/requirements.lock
diff --git a/requirements.yaml → charts/milvus/requirements.yaml b/requirements.yaml → charts/milvus/requirements.yaml
diff --git a/templates/NOTES.txt → charts/milvus/templates/NOTES.txt b/templates/NOTES.txt → charts/milvus/templates/NOTES.txt
diff --git a/templates/_helpers.tpl → charts/milvus/templates/_helpers.tpl b/templates/_helpers.tpl → charts/milvus/templates/_helpers.tpl
diff --git a/templates/_mishards_config.tpl → charts/milvus/templates/_mishards_config.tpl b/templates/_mishards_config.tpl → charts/milvus/templates/_mishards_config.tpl
diff --git a/templates/_readonly_server_config.tpl → ...vus/templates/_readonly_server_config.tpl b/templates/_readonly_server_config.tpl → ...vus/templates/_readonly_server_config.tpl
diff --git a/templates/_server_config.tpl → charts/milvus/templates/_server_config.tpl b/templates/_server_config.tpl → charts/milvus/templates/_server_config.tpl
diff --git a/templates/admin-deployment.yaml → ...ts/milvus/templates/admin-deployment.yaml b/templates/admin-deployment.yaml → ...ts/milvus/templates/admin-deployment.yaml
diff --git a/templates/admin-svc.yaml → charts/milvus/templates/admin-svc.yaml b/templates/admin-svc.yaml → charts/milvus/templates/admin-svc.yaml
diff --git a/templates/config.yaml → charts/milvus/templates/config.yaml b/templates/config.yaml → charts/milvus/templates/config.yaml
diff --git a/templates/mishards-deployment.yaml → ...milvus/templates/mishards-deployment.yaml b/templates/mishards-deployment.yaml → ...milvus/templates/mishards-deployment.yaml
diff --git a/templates/mishards-svc.yaml → charts/milvus/templates/mishards-svc.yaml b/templates/mishards-svc.yaml → charts/milvus/templates/mishards-svc.yaml
diff --git a/templates/pvc.yaml → charts/milvus/templates/pvc.yaml b/templates/pvc.yaml → charts/milvus/templates/pvc.yaml
diff --git a/templates/readonly-deployment.yaml → ...milvus/templates/readonly-deployment.yaml b/templates/readonly-deployment.yaml → ...milvus/templates/readonly-deployment.yaml
@@ -89,7 +89,7 @@ spec:
             port: 19530
 {{ toYaml .Values.readinessProbe | indent 10 }}
         resources:
-          {{- toYaml .Values.resources | nindent 10 }}
+          {{- toYaml .Values.image.resources | nindent 10 }}
         volumeMounts:
         - name: milvus-data-disk
           mountPath: {{ .Values.persistence.mountPath | quote }}

diff --git a/templates/readonly-svc.yaml → charts/milvus/templates/readonly-svc.yaml b/templates/readonly-svc.yaml → charts/milvus/templates/readonly-svc.yaml
diff --git a/templates/writable-deployment.yaml → ...milvus/templates/writable-deployment.yaml b/templates/writable-deployment.yaml → ...milvus/templates/writable-deployment.yaml
@@ -90,7 +90,7 @@ spec:
             port: 19530
 {{ toYaml .Values.readinessProbe | indent 10 }}
         resources:
-          {{- toYaml .Values.resources | nindent 10 }}
+          {{- toYaml .Values.image.resources | nindent 10 }}
         volumeMounts:
         - name: milvus-data-disk
           mountPath: {{ .Values.persistence.mountPath | quote }}

diff --git a/templates/writable-svc.yaml → charts/milvus/templates/writable-svc.yaml b/templates/writable-svc.yaml → charts/milvus/templates/writable-svc.yaml
diff --git a/values.yaml → charts/milvus/values.yaml b/values.yaml → charts/milvus/values.yaml
@@ -27,7 +27,7 @@ storage:
 
 wal:
   enabled: true
-  recoveryErrorIgnore: false 
+  recoveryErrorIgnore: false
   bufferSize: 256MB
   path: /var/lib/milvus/db/wal
 
@@ -186,14 +186,15 @@ image:
   ##
   # pullSecrets:
   #   - myRegistryKeySecretName
+  resources:
+    limits:
+      memory: "6Gi"
+      cpu: "2.0"
+    requests:
+      memory: "4Gi"
+      cpu: "1.0"
+
 replicas: 1
-resources:
-  limits:
-    memory: "12Gi"
-    cpu: "4.0"
-  requests:
-    memory: "8Gi"
-    cpu: "2.0"
 livenessProbe:
   initialDelaySeconds: 30
   periodSeconds: 15
@@ -365,4 +366,4 @@ mysql:
     #  "helm.sh/resource-policy": keep
     storageClass:
     accessMode: ReadWriteOnce
-    size: 8Gi
+    size: 4Gi
diff --git a/ct.yaml b/ct.yaml
@@ -0,0 +1,9 @@
+# See https://github.com/helm/chart-testing#configuration
+remote: origin
+chart-dirs:
+  - charts/
+validate-maintainers: false
+chart-repos:
+  - incubator=https://kubernetes-charts-incubator.storage.googleapis.com/
+  - stable=https://kubernetes-charts.storage.googleapis.com/
+helm-extra-args: --timeout 300s