Skip to content

Commit 3b47fba

Browse files
committed
Improve yorkie-mongodb with yorkie-cluster
- refactor typo and wording - set sharded=true to default option - remove yorkie-mongodb dependency condition for standalone mode
1 parent 208fa91 commit 3b47fba

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

build/charts/yorkie-cluster/Chart.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ dependencies:
33
repository: ""
44
version: 0.4.13
55
digest: sha256:0c702d4ee264c8cbc9a8959d0290c12679e013ccd7a979fcbf81a8c03519b220
6-
generated: "2024-08-29T01:24:48.119979+09:00"
6+
generated: "2024-10-19T15:27:57.253314+09:00"

build/charts/yorkie-cluster/Chart.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ kubeVersion: ">=1.23.0-0"
1818
dependencies:
1919
- name: yorkie-mongodb
2020
version: 0.4.13
21-
condition: yorkie-mongodb.sharded.enabled
2221

2322
keywords:
2423
- yorkie

build/charts/yorkie-cluster/README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ _See [`helm repo`](https://helm.sh/docs/helm/helm_repo/) for command documentati
3030

3131
```bash
3232
# Create mongodb namespace
33-
kubectl create namespace yorkie
33+
kubectl create namespace mongodb
3434

3535
# Install yorkie cluster helm chart
36-
helm install [RELEASE_NAME] yorkie-team/yorkie-cluster --set=yorkie-mongodb.sharded.enabled=true
36+
helm install [RELEASE_NAME] yorkie-team/yorkie-cluster
37+
38+
# Install yorkie cluster helm chart with standalone parameter (disable sharding)
39+
helm install [RELEASE_NAME] yorkie-team/yorkie-cluster --set=yorkie-mongodb.sharded.enabled=false
3740
```
3841

3942
_See [configuration](#configuration) below for custom installation_

build/charts/yorkie-cluster/templates/yorkie/deployment.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
spec:
3535
{{ if index .Values "yorkie-mongodb" "sharded" "enabled"}}
3636
initContainers:
37-
- name: wait-db
37+
- name: wait-for-sharded-db-provision
3838
image: bitnami/kubectl:latest
3939
command:
4040
- /bin/sh
@@ -44,10 +44,10 @@ spec:
4444
while true; do
4545
job_status=$(kubectl get job -n $NAMESPACE $JOB_NAME -o jsonpath='{.status.conditions[?(@.type=="Complete")].status}')
4646
if [ "$job_status" = "True" ]; then
47-
echo "Job completed"
47+
echo "DB provisioning Job completed successfully!"
4848
break
4949
fi
50-
echo "Waiting for job to complete..."
50+
echo "Waiting for DB provisioning job to complete..."
5151
sleep 5
5252
done
5353
env:
@@ -86,4 +86,4 @@ spec:
8686
port: {{ .Values.yorkie.ports.rpcPort }}
8787
initialDelaySeconds: 10
8888
resources:
89-
{{ toYaml .Values.yorkie.resources | nindent 12 }}
89+
{{ toYaml .Values.yorkie.resources | nindent 12 }}

build/charts/yorkie-cluster/templates/yorkie/role.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
55
namespace: {{ index .Values "yorkie-mongodb" "namespace" }}
6-
name: db-status-reader
6+
name: db-provisioning-job-status-reader
77
rules:
88
- apiGroups: ["batch"]
99
resources: ["jobs"]
@@ -22,7 +22,7 @@ subjects:
2222
namespace: {{ .Values.yorkie.namespace }}
2323
roleRef:
2424
kind: Role
25-
name: db-status-reader
25+
name: db-provisioning-job-status-reader
2626
apiGroup: rbac.authorization.k8s.io
2727

2828
---
@@ -32,4 +32,4 @@ kind: ServiceAccount
3232
metadata:
3333
name: yorkie-db-service-account
3434
namespace: {{ .Values.yorkie.namespace }}
35-
{{ end -}}
35+
{{ end -}}

build/charts/yorkie-cluster/values.yaml

+9-1
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,13 @@ yorkie-mongodb:
7777
namespace: mongodb
7878
port: 27017
7979
clusterDomain: cluster.local
80+
image:
81+
registry: docker.io
82+
repository: mongo
83+
tag: "6.0"
84+
persistence:
85+
dataSize: 1Gi
86+
configSize: 500Mi
87+
storageClass: standard
8088
sharded:
81-
enabled: false
89+
enabled: true

0 commit comments

Comments
 (0)