Skip to content

Commit

Permalink
Update demo manifest, bump version (#60)
Browse files Browse the repository at this point in the history
Signed-off-by: shaoyue.chen <[email protected]>
  • Loading branch information
haorenfsa authored Jan 2, 2024
1 parent 72e57bb commit bfcbe1f
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 34 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
IMG ?= milvusdb/milvus-operator:dev-latest
TOOL_IMG ?= milvus-config-tool:dev-latest
SIT_IMG ?= milvus-operator:sit
VERSION ?= 0.8.6
VERSION ?= 0.8.7
TOOL_VERSION ?= 0.2.0
MILVUS_HELM_VERSION ?= milvus-4.1.8
MILVUS_HELM_VERSION ?= milvus-4.1.11
RELEASE_IMG ?= milvusdb/milvus-operator:v$(VERSION)
TOOL_RELEASE_IMG ?= milvusdb/milvus-config-tool:v$(TOOL_VERSION)
KIND_CLUSTER ?= kind
Expand Down Expand Up @@ -227,7 +227,7 @@ sit-prepare-operator-images:

sit-prepare-images: sit-prepare-operator-images
@echo "Preparing images"
docker pull milvusdb/milvus:v2.3.3
docker pull milvusdb/milvus:v2.3.4

docker pull -q apachepulsar/pulsar:2.8.2
docker pull -q bitnami/kafka:3.1.0-debian-10-r52
Expand All @@ -244,7 +244,7 @@ sit-load-operator-images:

sit-load-images: sit-load-operator-images
@echo "Loading images"
kind load docker-image milvusdb/milvus:v2.3.3
kind load docker-image milvusdb/milvus:v2.3.4
kind load docker-image apachepulsar/pulsar:2.8.2 --name ${KIND_CLUSTER}
kind load docker-image bitnami/kafka:3.1.0-debian-10-r52 --name ${KIND_CLUSTER}
kind load docker-image milvusdb/etcd:3.5.5-r2 --name ${KIND_CLUSTER}
Expand All @@ -253,7 +253,7 @@ sit-load-images: sit-load-operator-images

sit-load-and-cleanup-images: sit-load-images
@echo "Clean up some big images to save disk space in github action"
docker rmi milvusdb/milvus:v2.3.3
docker rmi milvusdb/milvus:v2.3.4
docker rmi apachepulsar/pulsar:2.8.2
docker rmi bitnami/kafka:3.1.0-debian-10-r52
docker rmi milvusdb/etcd:3.5.5-r2
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ helm -n milvus-operator upgrade --install --create-namespace milvus-operator mil
Or with kubectl & raw manifests:

```shell
kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v0.8.6/deploy/manifests/deployment.yaml
kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v0.8.7/deploy/manifests/deployment.yaml
```

For more infomation Check [Installation Instructions](docs/installation/installation.md)
Expand All @@ -45,11 +45,11 @@ Versions of the underlying components are listed below:

<!-- source csv for table
Components, Milvus, Pulsar / Kafka, Etcd, MinIO
Versions, v2.3.3 `[1]`, 2.8.2 / 3.1.0, 3.5.5-2, RELEASE.2023-03-20T20-16-18Z -->
Versions, v2.3.4 `[1]`, 2.8.2 / 3.1.0, 3.5.5-2, RELEASE.2023-03-20T20-16-18Z -->

|Components| Milvus| Pulsar / Kafka| Etcd| MinIO|
|---|---|---|---|---|
|Versions| v2.3.3 `[1]`| 2.8.2 / 3.1.0 | 3.5.5-2 |RELEASE.2023-03-20T20-16-18Z|
|Versions| v2.3.4 `[1]`| 2.8.2 / 3.1.0 | 3.5.5-2 |RELEASE.2023-03-20T20-16-18Z|


> `[1]` Version of milvus is the default version we will use, you can set it to other version. The Compatibility with milvus releases is showed below.
Expand Down Expand Up @@ -82,13 +82,13 @@ Use helm:
```shell
helm upgrade --install milvus-operator \
-n milvus-operator --create-namespace \
https://github.com/zilliztech/milvus-operator/releases/download/v0.8.6/milvus-operator-0.8.6.tgz
https://github.com/zilliztech/milvus-operator/releases/download/v0.8.7/milvus-operator-0.8.7.tgz
```

Or use kubectl & raw manifests:

```shell
kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v0.8.6/deploy/manifests/deployment.yaml
kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v0.8.7/deploy/manifests/deployment.yaml
```


Expand Down
4 changes: 2 additions & 2 deletions charts/milvus-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.8.6
version: 0.8.7

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.8.6"
appVersion: "0.8.7"

maintainers:
- name: zilliztech
Expand Down
2 changes: 1 addition & 1 deletion charts/milvus-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ image:
# image.pullPolicy -- The image pull policy for the controller.
pullPolicy: IfNotPresent
# image.tag -- The image tag whose default is the chart appVersion.
tag: "v0.8.6"
tag: "v0.8.7"

# installCRDs -- If true, CRD resources will be installed as part of the Helm chart. If enabled, when uninstalling CRD resources will be deleted causing all installed custom resources to be DELETED
installCRDs: true
Expand Down
2 changes: 2 additions & 0 deletions config/samples/cluster_demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ spec:
resources:
requests:
memory: 100Mi
persistence:
size: 20Gi
deletionPolicy: Delete
pvcDeletion: true
msgStreamType: kafka
Expand Down
5 changes: 4 additions & 1 deletion config/samples/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
components:
standalone:
replicas: 1
serviceType: LoadBalancer
serviceType: ClusterIP
dependencies:
etcd:
inCluster:
Expand All @@ -29,5 +29,8 @@ spec:
resources:
requests:
memory: 100Mi
persistence:
size: 20Gi
deletionPolicy: Delete
pvcDeletion: true

28 changes: 14 additions & 14 deletions deploy/manifests/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
name: "milvus-operator-checker"
namespace: "milvus-operator"
labels:
helm.sh/chart: milvus-operator-0.8.6
helm.sh/chart: milvus-operator-0.8.7
app.kubernetes.io/name: milvus-operator
app.kubernetes.io/instance: milvus-operator
app.kubernetes.io/version: "0.8.6"
app.kubernetes.io/version: "0.8.7"
app.kubernetes.io/managed-by: Helm
---
# Source: milvus-operator/templates/serviceaccount.yaml
Expand All @@ -24,10 +24,10 @@ metadata:
name: "milvus-operator"
namespace: "milvus-operator"
labels:
helm.sh/chart: milvus-operator-0.8.6
helm.sh/chart: milvus-operator-0.8.7
app.kubernetes.io/name: milvus-operator
app.kubernetes.io/instance: milvus-operator
app.kubernetes.io/version: "0.8.6"
app.kubernetes.io/version: "0.8.7"
app.kubernetes.io/managed-by: Helm
---
# Source: milvus-operator/templates/crds.yaml
Expand Down Expand Up @@ -14522,10 +14522,10 @@ kind: Service
metadata:
labels:
service-kind: metrics
helm.sh/chart: milvus-operator-0.8.6
helm.sh/chart: milvus-operator-0.8.7
app.kubernetes.io/name: milvus-operator
app.kubernetes.io/instance: milvus-operator
app.kubernetes.io/version: "0.8.6"
app.kubernetes.io/version: "0.8.7"
app.kubernetes.io/managed-by: Helm
name: 'milvus-operator-metrics-service'
namespace: "milvus-operator"
Expand All @@ -14543,10 +14543,10 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: milvus-operator-0.8.6
helm.sh/chart: milvus-operator-0.8.7
app.kubernetes.io/name: milvus-operator
app.kubernetes.io/instance: milvus-operator
app.kubernetes.io/version: "0.8.6"
app.kubernetes.io/version: "0.8.7"
app.kubernetes.io/managed-by: Helm
name: 'milvus-operator-webhook-service'
namespace: "milvus-operator"
Expand All @@ -14565,10 +14565,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
helm.sh/chart: milvus-operator-0.8.6
helm.sh/chart: milvus-operator-0.8.7
app.kubernetes.io/name: milvus-operator
app.kubernetes.io/instance: milvus-operator
app.kubernetes.io/version: "0.8.6"
app.kubernetes.io/version: "0.8.7"
app.kubernetes.io/managed-by: Helm
name: "milvus-operator"
namespace: "milvus-operator"
Expand Down Expand Up @@ -14598,7 +14598,7 @@ spec:
- --leader-elect
command:
- /manager
image: 'milvusdb/milvus-operator:v0.8.6'
image: 'milvusdb/milvus-operator:v0.8.7'
imagePullPolicy: "IfNotPresent"
livenessProbe:
httpGet:
Expand Down Expand Up @@ -14655,10 +14655,10 @@ metadata:
annotations:
{}
labels:
helm.sh/chart: milvus-operator-0.8.6
helm.sh/chart: milvus-operator-0.8.7
app.kubernetes.io/name: milvus-operator
app.kubernetes.io/instance: milvus-operator
app.kubernetes.io/version: "0.8.6"
app.kubernetes.io/version: "0.8.7"
app.kubernetes.io/managed-by: Helm
name: "milvus-operator-checker"
namespace: "milvus-operator"
Expand All @@ -14672,7 +14672,7 @@ spec:
restartPolicy: OnFailure
containers:
- name: checker
image: 'milvusdb/milvus-operator:v0.8.6'
image: 'milvusdb/milvus-operator:v0.8.7'
imagePullPolicy: "IfNotPresent"
command: ["/checker"]
args:
Expand Down
10 changes: 5 additions & 5 deletions docs/installation/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ For quick start, install with one line command:
```shell
helm install milvus-operator \
-n milvus-operator --create-namespace \
https://github.com/zilliztech/milvus-operator/releases/download/v0.8.6/milvus-operator-0.8.6.tgz
https://github.com/zilliztech/milvus-operator/releases/download/v0.8.7/milvus-operator-0.8.7.tgz
```

If you already have `cert-manager` v1.0+ installed which is not in its default configuration, you may encounter some error with the check of cert-manager installation. you can install with special options to disable the check:

```
helm install milvus-operator \
-n milvus-operator --create-namespace \
https://github.com/zilliztech/milvus-operator/releases/download/v0.8.6/milvus-operator-0.8.6.tgz \
https://github.com/zilliztech/milvus-operator/releases/download/v0.8.7/milvus-operator-0.8.7.tgz \
--set checker.disableCertManagerCheck=true
```

Expand All @@ -39,7 +39,7 @@ use helm commands to upgrade earlier milvus-operator to current version:

```shell
helm upgrade -n milvus-operator milvus-operator --reuse-values \
https://github.com/zilliztech/milvus-operator/releases/download/v0.8.6/milvus-operator-0.8.6.tgz
https://github.com/zilliztech/milvus-operator/releases/download/v0.8.7/milvus-operator-0.8.7.tgz
```

## Delete operator
Expand All @@ -62,7 +62,7 @@ If you don't want to use helm you can also install with kubectl and raw manifest
## Installation
It is recommended to install the milvus operator with a newest stable version
```shell
kubectl apply -f https://github.com/zilliztech/milvus-operator/v0.8.6/deploy/manifests/deployment.yaml
kubectl apply -f https://github.com/zilliztech/milvus-operator/v0.8.7/deploy/manifests/deployment.yaml
```

Check the installed operators:
Expand All @@ -85,7 +85,7 @@ Same as installation, you can update the milvus operator with a newer version by
Delete the milvus operator stack by the deployment manifest:

```shell
kubectl delete -f https://github.com/zilliztech/milvus-operator/v0.8.6/deploy/manifests/deployment.yaml
kubectl delete -f https://github.com/zilliztech/milvus-operator/v0.8.7/deploy/manifests/deployment.yaml
```

Or delete the milvus operator stack by using makefile:
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
)

const (
DefaultMilvusVersion = "v2.3.3"
DefaultMilvusVersion = "v2.3.4"
DefaultMilvusBaseImage = "milvusdb/milvus"
DefaultMilvusImage = DefaultMilvusBaseImage + ":" + DefaultMilvusVersion
DefaultImagePullPolicy = corev1.PullIfNotPresent
Expand Down

0 comments on commit bfcbe1f

Please sign in to comment.