Upgrade to v0.10.1 (#107)

* update (#104) * update * update.. * Reduced request for resources (#106) Signed-off-by: quicksilver <[email protected]> * Upgrade to v0.10.1 (#102) * Update values.yaml Signed-off-by: quicksilver <[email protected]> * Upgrade to v0.10.1 Signed-off-by: quicksilver <[email protected]> * Update README.txt Signed-off-by: quicksilver <[email protected]> * Add PULL_REQUEST_TEMPLATE.md Signed-off-by: quicksilver <[email protected]> * Update README.md Signed-off-by: quicksilver <[email protected]> * Add ci folder to .helmignore Signed-off-by: quicksilver <[email protected]> * Setting test-framework switch to false Signed-off-by: quicksilver <[email protected]> * Update Notes.txt Signed-off-by: quicksilver <[email protected]> * Update docker images Signed-off-by: quicksilver <[email protected]> Co-authored-by: Tinkerrr <[email protected]>
milvus-io · Jul 20, 2020 · 616e2e6 · 616e2e6
1 parent a3ac21f
commit 616e2e6
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 41 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
+## What this PR does / why we need it:
+
+## Checklist
+[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]
+- [ ] Chart Version bumped
+- [ ] Variables are documented in the README.md
+- [ ] Title of the PR starts with chart name (e.g. `[mychartname]`)
+- [ ] PR only contains changes for one chart
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
@@ -41,11 +41,15 @@ jobs:
         # Only build a kind cluster if there are chart changes to test.
         if: steps.lint.outputs.changed == 'true'
       - name: Modify Values Yaml file
+        # Only build a kind cluster if there are chart changes to test.
+        if: steps.lint.outputs.changed == 'true'
         shell: bash
         run: |
           sed -i '/^mysql:/{n;s/true/false/;}' charts/milvus/values.yaml
       - name: Run chart-testing (install)
         uses: helm/[email protected]
+        # Only build a kind cluster if there are chart changes to test.
+        if: steps.lint.outputs.changed == 'true'
         with:
           command: install
           config: ct.yaml
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This GitHub repository is the official source for Milvus's Helm charts.
 [![](https://github.com/milvus-io/milvus-helm/workflows/Release%20Charts/badge.svg?branch=master)](https://github.com/milvus-io/milvus-helm/actions)
 
 For instructions about how to install charts from this repository, visit the public website at:
-[milvus-io.github.io/milvus-helm](https://github.com/milvus-io/milvus-helm)
+[milvus-io.github.io/milvus-helm](https://milvus-io.github.io/milvus-helm/)
 
 ## Make changes to an existing chart without publishing
 
@@ -22,7 +22,7 @@ With each commit to _master_, a GitHub action will compare all charts versions a
 
 When it detects that the version in the folder doesn't exist in  `index.yaml`, it will create a release with the packaged chart content on the _GitHub repository_, and update `index.yaml` to include it on the `charts repository`.
 
-`index.yaml` is accesible from [milvus-io.github.io/milvus-helm/index.yaml](https://github.com/milvus-io/milvus-helm/index.yaml) and is the list of all _charts_ and their _versions_ available when you interact with the _charts repository_ using Helm.
+`index.yaml` is accesible from [milvus-io.github.io/milvus-helm/index.yaml](https://github.com/milvus-io/milvus-helm/blob/gh-pages/index.yaml) and is the list of all _charts_ and their _versions_ available when you interact with the _charts repository_ using Helm.
 
 The packaged referenced in `index.yaml`, when it's updated using the GitHub action, will link for download to the URL provided by the _GitHub repository_ release files.
 

diff --git a/charts/milvus/.helmignore b/charts/milvus/.helmignore
@@ -1,4 +1,4 @@
 .DS_Store
 .git
 .github
-
+ci
diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 name: milvus
-appVersion: "0.10.0"
+appVersion: "0.10.1"
 kubeVersion: "^1.10.0-0"
 description: Milvus is an open source similarity search engine for massive-scalefeature vectors.
-version: 0.10.0
+version: 0.10.1
 keywords:
   - milvus
   - elastic

diff --git a/charts/milvus/README.md b/charts/milvus/README.md
@@ -17,28 +17,28 @@ This chart bootstraps Milvus deployment on a Kubernetes cluster using the Helm p
 1. Add the stable repository
 ```bash
 $ helm repo add stable https://kubernetes-charts.storage.googleapis.com
+$ helm repo add milvus https://milvus-io.github.io/milvus-helm/
 ```
-2. Install Chart dependencies
-```bash
-# in 'milvus-helm/charts/milvus'
-$ helm dep update
+
+2. Update charts repositories
 ```
+$ helm repo update
+```
+
 3. Install Helm package
 
 To install the chart with the release name `my-release`:
 
 ```bash
 # Helm v2.x
-$ cd milvus-helm
-$ helm install --name my-release .
+$ helm install --name my-release milvus/milvus
 ```
 
 or
 
 ```bash
 # Helm v3.x
-$ cd milvus-helm
-$ helm install my-release  .
+$ helm install my-release milvus/milvus
 ```
 
 > **Tip**: To list all releases, using `helm list`.
@@ -131,7 +131,7 @@ The following table lists the configurable parameters of the Milvus chart and th
 | `restartPolicy`                           | Restart policy for all containers             | `Always`                                                |
 | `initContainerImage`                      | Init container image                          | `alpine:3.8`                                            |
 | `image.repository`                        | Image repository                              | `milvusdb/milvus`                                       |
-| `image.tag`                               | Image tag                                     | `0.10.0-cpu-d061620-5f3c00`                             |
+| `image.tag`                               | Image tag                                     | `0.10.1-cpu-d072020-bd02b1`                             |
 | `image.pullPolicy`                        | Image pull policy                             | `IfNotPresent`                                          |
 | `image.pullSecrets`                       | Image pull secrets                            | `{}`                                                    |
 | `image.resources`                         | CPU/GPU/Memory resource requests/limits       | `{}`                                                    |
@@ -175,7 +175,7 @@ The following table lists the configurable parameters of the Milvus chart and th
 | `podDisruptionBudget.minAvailable`        | Pod disruption minimum available              | `unset`                                                 |
 | `podDisruptionBudget.maxUnavailable`      | Pod disruption maximum unavailable            | `unset`                                                 |
 | `mishards.image.repository`               | Mishards image repository                     | `milvusdb/mishards`                                     |
-| `mishards.image.tag`                      | Mishards image tag                            | `0.10.0`                                                |
+| `mishards.image.tag`                      | Mishards image tag                            | `0.10.1`                                                |
 | `mishards.image.pullPolicy`               | Mishards image pull policy                    | `IfNotPresent`                                          |
 | `mishards.replicas`                       | Number of mishards nodes                      | `1`                                                     |
 | `mishards.resources`                      | Mishards CPU/GPU/Memory resource requests/limits | `{}`                                                 |

diff --git a/charts/milvus/ci/db_backend/mysql_cpu_values.yaml b/charts/milvus/ci/db_backend/mysql_cpu_values.yaml
@@ -1,10 +1,19 @@
 cache:
   insertBufferSize: 1GB
-  cacheSize: 8GB
+  cacheSize: 4GB
 
 gpu:
   enabled: false
 
+image:
+  resources:
+    limits:
+      memory: "6Gi"
+      cpu: "2.0"
+    requests:
+      memory: "4Gi"
+      cpu: "1.0"
+
 mysql:
   enabled: true
   persistence:

diff --git a/charts/milvus/ci/db_backend/mysql_gpu_values.yaml b/charts/milvus/ci/db_backend/mysql_gpu_values.yaml
@@ -1,16 +1,16 @@
 cache:
   insertBufferSize: 1GB
-  cacheSize: 8GB
+  cacheSize: 4GB
 
 image:
   resources:
     limits:
-      memory: "12Gi"
-      cpu: "4.0"
+      memory: "6Gi"
+      cpu: "2.0"
       aliyun.com/gpu-mem: 2 # GiB
     requests:
-      memory: "8Gi"
-      cpu: "2.0"
+      memory: "4Gi"
+      cpu: "1.0"
 
 gpu:
   enabled: true

diff --git a/charts/milvus/ci/db_backend/sqlite_cpu_values.yaml b/charts/milvus/ci/db_backend/sqlite_cpu_values.yaml
@@ -1,6 +1,15 @@
 cache:
   insertBufferSize: 1GB
-  cacheSize: 8GB
+  cacheSize: 4GB
+
+image:
+  resources:
+    limits:
+      memory: "6Gi"
+      cpu: "2.0"
+    requests:
+      memory: "4Gi"
+      cpu: "1.0"
 
 gpu:
   enabled: false

diff --git a/charts/milvus/ci/db_backend/sqlite_gpu_values.yaml b/charts/milvus/ci/db_backend/sqlite_gpu_values.yaml
@@ -1,16 +1,16 @@
 cache:
   insertBufferSize: 1GB
-  cacheSize: 8GB
+  cacheSize: 4GB
 
 image:
   resources:
     limits:
-      memory: "12Gi"
-      cpu: "4.0"
+      memory: "6Gi"
+      cpu: "2.0"
       aliyun.com/gpu-mem: 2 # GiB
     requests:
-      memory: "8Gi"
-      cpu: "2.0"
+      memory: "4Gi"
+      cpu: "1.0"
 
 gpu:
   enabled: true

diff --git a/charts/milvus/templates/NOTES.txt b/charts/milvus/templates/NOTES.txt
@@ -5,7 +5,7 @@ Get the Milvus server URL by running these commands in the same shell:
 {{- if contains "NodePort" .Values.service.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "milvus.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-{{- if .Values.web.enabled }}
+{{- if .Values.network.httpEnabled }}
   export WEB_NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[1].nodePort}" services {{ template "milvus.fullname" . }})
   echo $NODE_IP:$NODE_PORT $NODE_IP:$WEB_NODE_PORT
 {{- else }}

diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml
@@ -146,8 +146,7 @@ persistence:
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
+    ##   set, choosing the default provisioner.
     ##
     storageClass:
     accessModes: ReadWriteMany
@@ -168,8 +167,7 @@ logsPersistence:
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
+    ##   set, choosing the default provisioner.
     ##
     storageClass:
     accessModes: ReadWriteMany
@@ -178,7 +176,7 @@ logsPersistence:
 
 image:
   repository: milvusdb/milvus
-  tag: 0.10.0-cpu-d061620-5f3c00
+  tag: 0.10.1-cpu-d072020-bd02b1
   pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.
@@ -222,17 +220,17 @@ serviceAccounts:
 mishards:
   image:
     repository: milvusdb/mishards
-    tag: 0.10.0
+    tag: 0.10.1
     pullPolicy: IfNotPresent
 
   replicas: 1
   resources:
     limits:
-      memory: "4Gi"
-      cpu: "4.0"
-    requests:
       memory: "2Gi"
       cpu: "2.0"
+    requests:
+      memory: "1Gi"
+      cpu: "0.5"
 
   ## Mishards conf
   debug: true
@@ -268,11 +266,11 @@ readonly:
   replicas: 1
   resources:
     limits:
-      memory: "12Gi"
-      cpu: "4.0"
-    requests:
-      memory: "8Gi"
+      memory: "6Gi"
       cpu: "2.0"
+    requests:
+      memory: "4Gi"
+      cpu: "1.0"
 
 ## Milvus Admin Configuration
 admin:
@@ -354,6 +352,9 @@ mysql:
       max_connections = 1000
       wait_timeout = 31536000
 
+  testFramework:
+    enabled: false
+
   initializationFiles:
     grant.sql: |-
       GRANT ALL PRIVILEGES ON milvus.* TO 'root'@'%';