Skip to content
This repository was archived by the owner on Aug 16, 2023. It is now read-only.

Commit a872492

Browse files
author
Bennu
authored
Add default values for ingress.annotations (#333)
Signed-off-by: Bennu-Li <yunmei.li@zilliz.com>
1 parent 01b79ca commit a872492

3 files changed

Lines changed: 62 additions & 3 deletions

File tree

‎charts/milvus/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: milvus
33
appVersion: "2.0.2"
44
kubeVersion: "^1.10.0-0"
55
description: Milvus is an open-source vector database built to power AI applications and vector similarity search.
6-
version: 3.0.21
6+
version: 3.0.22
77
keywords:
88
- milvus
99
- elastic

‎charts/milvus/README.md‎

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
For more information about installing and using Helm, see the [Helm Docs](https://helm.sh/docs/). For a quick introduction to Charts, see the [Chart Guide](https://helm.sh/docs/topics/charts/).
44

5-
To install Milvus, refer to [Milvus installation](https://milvus.io/docs/v2.0.0/install_cluster-helm.md).
5+
To install Milvus, refer to [Milvus installation](https://milvus.io/docs/v2.0.x/install_cluster-helm.md).
66

77
## Introduction
88
This chart bootstraps Milvus deployment on a Kubernetes cluster using the Helm package manager.
@@ -83,6 +83,7 @@ kubectl delete pvc $(kubectl get pvc -l "${MILVUS_LABELS}" -o jsonpath='{range.i
8383

8484
The following table lists the configurable parameters of the Milvus Service and their default values.
8585

86+
<<<<<<< HEAD
8687
| Parameter | Description | Default |
8788
|-------------------------------------------|-----------------------------------------------|---------------------------------------------------------|
8889
| `cluster.enabled` | Enable or disable Milvus Cluster mode | `true` |
@@ -138,6 +139,60 @@ The following table lists the configurable parameters of the Milvus Service and
138139
| `externalPulsar.port` | The port of the external Pulsar | `6650` |
139140
| `externalKafka.enabled` | Enable or disable external Kafka | `false` |
140141
| `externalKafka.brokerList` | The brokerList of the external Kafka separated by comma | `localhost:9092` |
142+
=======
143+
| Parameter | Description | Default |
144+
| ----------------------------------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------ |
145+
| `cluster.enabled` | Enable or disable Milvus Cluster mode | `true` |
146+
| `image.all.repository` | Image repository | `milvusdb/milvus` |
147+
| `image.all.tag` | Image tag | `v2.0.1` |
148+
| `image.all.pullPolicy` | Image pull policy | `IfNotPresent` |
149+
| `image.all.pullSecrets` | Image pull secrets | `{}` |
150+
| `service.type` | Service type | `ClusterIP` |
151+
| `service.port` | Port where service is exposed | `19530` |
152+
| `service.nodePort` | Service nodePort | `unset` |
153+
| `service.annotations` | Service annotations | `{}` |
154+
| `service.labels` | Service custom labels | `{}` |
155+
| `service.clusterIP` | Internal cluster service IP | `unset` |
156+
| `service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `unset` |
157+
| `service.loadBalancerSourceRanges` | List of IP CIDRs allowed access to lb (if supported) | `[]` |
158+
| `service.externalIPs` | Service external IP addresses | `[]` |
159+
| `ingress.enabled` | If true, Ingress will be created | `false` |
160+
| `ingress.annotations` | Ingress annotations | The default setting applies to nginx ingress type. For other types of Ingress Controller, different settings are required. |
161+
| `ingress.labels` | Ingress labels | `{}` |
162+
| `ingress.hosts` | Ingress hostnames | `[]` |
163+
| `ingress.tls` | Ingress TLS configuration | `[]` |
164+
| `metrics.enabled` | Export Prometheus monitoring metrics | `true` |
165+
| `metrics.serviceMonitor.enabled` | Create ServiceMonitor for Prometheus operator | `false` |
166+
| `metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `unset` |
167+
| `metadata.rootPath` | Root of key prefix to etcd | `by-dev` |
168+
| `log.level` | Logging level to be used. Valid levels are `debug`, `info`, `warn`, `error`, `fatal` | `debug` |
169+
| `log.file.maxSize` | The size limit of the log file (MB) | `300` |
170+
| `log.file.maxAge` | The maximum number of days that the log is retained. (day) | `10` |
171+
| `log.file.maxBackups` | The maximum number of retained logs. | `20` |
172+
| `log.format` | Format used for the logs. Valid formats are `text` and `json` | `text` |
173+
| `log.persistence.enabled` | Use persistent volume to store Milvus logs data | `false` |
174+
| `log.persistence.mountPath` | Milvus logs data persistence volume mount path | `/milvus/logs` |
175+
| `log.persistence.annotations` | PersistentVolumeClaim annotations | `{}` |
176+
| `log.persistence.persistentVolumeClaim.existingClaim` | Use your own data Persistent Volume existing claim name | `unset` |
177+
| `log.persistence.persistentVolumeClaim.storageClass` | The Milvus logs data Persistent Volume Storage Class | `unset` |
178+
| `log.persistence.persistentVolumeClaim.accessModes` | The Milvus logs data Persistence access modes | `ReadWriteOnce` |
179+
| `log.persistence.persistentVolumeClaim.size` | The size of Milvus logs data Persistent Volume Storage Class | `5Gi` |
180+
| `log.persistence.persistentVolumeClaim.subPath` | SubPath for Milvus logs data mount | `unset` |
181+
| `msgChannel.chanNamePrefix.cluster` | Pulsar topic name prefix | `by-dev` |
182+
| `externalS3.enabled` | Enable or disable external S3 | `false` |
183+
| `externalS3.host` | The host of the external S3 | `unset` |
184+
| `externalS3.port` | The port of the external S3 | `unset` |
185+
| `externalS3.accessKey` | The Access Key of the external S3 | `unset` |
186+
| `externalS3.secretKey` | The Secret Key of the external S3 | `unset` |
187+
| `externalS3.bucketName` | The Bucket Name of the external S3 | `unset` |
188+
| `externalS3.useSSL` | If true, use SSL to connect to the external S3 | `false` |
189+
| `externalGcs.bucketName` | The Bucket Name of the external GCS. Requires GCS gateway to be enabled in the minIO configuration | `unset` |
190+
| `externalEtcd.enabled` | Enable or disable external Etcd | `false` |
191+
| `externalEtcd.endpoints` | The endpoints of the external etcd | `{}` |
192+
| `externalPulsar.enabled` | Enable or disable external Pulsar | `false` |
193+
| `externalPulsar.host` | The host of the external Pulsar | `localhost` |
194+
| `externalPulsar.port` | The port of the external Pulsar | `6650` |
195+
>>>>>>> Add default values for ingress.annotations
141196
142197
### Milvus Standalone Deployment Configuration
143198

‎charts/milvus/values.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,13 @@ service:
6060

6161
ingress:
6262
enabled: false
63-
annotations: {}
63+
annotations:
6464
# Annotation example: set nginx ingress type
6565
# kubernetes.io/ingress.class: nginx
66+
nginx.ingress.kubernetes.io/backend-protocol: GRPC
67+
nginx.ingress.kubernetes.io/listen-ports-ssl: '[19530]'
68+
nginx.ingress.kubernetes.io/proxy-body-size: 4m
69+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
6670
labels: {}
6771
hosts:
6872
- milvus-example.local

0 commit comments

Comments
 (0)