Include yorkie-mongodb to yorkie-cluster Helm Chart

.gitignore

@@ -71,4 +71,4 @@ output.txt
 **/charts/*.tgz
 /build/charts/yorkie-argocd/charts/
 /build/charts/yorkie-monitoring/charts/
-/build/charts/yorkie-mongodb/charts/
+/build/charts/yorkie-cluster/charts/yorkie-mongodb/charts/

build/charts/yorkie-cluster/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: yorkie-mongodb
+  repository: ""
+  version: 0.4.13
+digest: sha256:0c702d4ee264c8cbc9a8959d0290c12679e013ccd7a979fcbf81a8c03519b220
+generated: "2024-10-19T15:27:57.253314+09:00"

build/charts/yorkie-cluster/Chart.yaml

@@ -15,6 +15,10 @@ version: 0.4.29
 appVersion: "0.4.29"
 kubeVersion: ">=1.23.0-0"
 
+dependencies:
+  - name: yorkie-mongodb
+    version: 0.4.13
+
 keywords:
   - yorkie
   - cluster

build/charts/yorkie-cluster/README.md

@@ -26,11 +26,17 @@ helm repo update
 
 _See [`helm repo`](https://helm.sh/docs/helm/helm_repo/) for command documentation._
 
-## Install Helm Chart
+## Install Helm Chart 
 
 ```bash
+# Create mongodb namespace
+kubectl create namespace mongodb
+
 # Install yorkie cluster helm chart
 helm install [RELEASE_NAME] yorkie-team/yorkie-cluster
+
+# Install yorkie cluster helm chart with standalone parameter (disable sharding)
+helm install [RELEASE_NAME] yorkie-team/yorkie-cluster --set=yorkie-mongodb.sharded.enabled=false
 ```
 
 _See [configuration](#configuration) below for custom installation_

build/charts/yorkie-cluster/charts/yorkie-mongodb/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: mongodb-sharded
+  repository: https://charts.bitnami.com/bitnami
+  version: 9.0.1
+digest: sha256:3e1cba1b156f3472d720e4f08341e0f58db702302f361d1f49738fd10d60e0ff
+generated: "2024-10-09T17:27:23.654759+09:00"

build/charts/yorkie-mongodb/Chart.yaml → build/charts/yorkie-cluster/charts/yorkie-mongodb/Chart.yaml

@@ -15,6 +15,6 @@ kubeVersion: ">=1.23.0-0"
 
 dependencies:
   - name: mongodb-sharded
-    version: "7.2.2"
+    version: "9.0.1"
     repository: "https://charts.bitnami.com/bitnami"
     condition: sharded.enabled

build/charts/yorkie-mongodb/README.md → build/charts/yorkie-cluster/charts/yorkie-mongodb/README.md

@@ -22,7 +22,7 @@ _See [`helm repo`](https://helm.sh/docs/helm/helm_repo/) for command documentati
 # Create mongodb namespace
 kubectl create namespace mongodb
 
-# Install yorkie monitoring helm chart
+# Install yorkie mongodb helm chart
 helm install [RELEASE_NAME] yorkie-team/yorkie-mongodb --namespace mongodb --set=sharded.enabled=true
 ```
 

build/charts/yorkie-mongodb/values.yaml → build/charts/yorkie-cluster/charts/yorkie-mongodb/values.yaml

@@ -173,6 +173,7 @@ mongodb-sharded:
 
   # Configuration for mongos
   mongos:
+    namespaceOverride: mongodb
     replicaCount: *mongosReplicaCount
     command:
       - mongos

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

@@ -32,6 +32,38 @@ spec:
         prometheus.io/port: "{{ .Values.yorkie.ports.profilingPort }}"
         prometheus.io/path: "/metrics"
     spec:
+      {{ if index .Values "yorkie-mongodb" "sharded" "enabled"}}
+      initContainers:
+      - name: wait-for-sharded-db-provision
+        image: bitnami/kubectl:latest
+        command:
+          - /bin/sh
+          - -c
+          - |
+            echo "Wait db start"
+            while true; do
+              job_status=$(kubectl get job -n $NAMESPACE $JOB_NAME -o jsonpath='{.status.conditions[?(@.type=="Complete")].status}')
+              if [ "$job_status" = "True" ]; then
+                echo "DB provisioning Job completed successfully!"
+                break
+              fi
+              echo "Waiting for DB provisioning job to complete..."
+              sleep 5
+            done
+        env:
+          - name: NAMESPACE
+            value: "{{ index .Values "yorkie-mongodb" "namespace" }}"
+          - name: JOB_NAME
+            value: "{{ index .Values "yorkie-mongodb" "name" }}-setup-job"
+        volumeMounts:
+          - name: kubeconfig
+            mountPath: /root/.kube
+            subPath: config
+      volumes:
+        - name: kubeconfig
+          emptyDir: { }
+      serviceAccountName: yorkie-db-provisioning-job-account
+      {{ end }}
       containers:
       - name: yorkie
         image: "{{ .Values.yorkie.image.repository }}:{{ .Values.yorkie.image.tag | default .Chart.AppVersion }}"

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

@@ -0,0 +1,35 @@
+{{- if index .Values "yorkie-mongodb" "sharded" "enabled"}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: {{ index .Values "yorkie-mongodb" "namespace" }}
+  name: db-provisioning-job-status-reader
+rules:
+  - apiGroups: ["batch"]
+    resources: ["jobs"]
+    verbs: ["get", "list"]
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: read-db-provisioning-status
+  namespace: {{ index .Values "yorkie-mongodb" "namespace" }}
+subjects:
+  - kind: ServiceAccount
+    name: yorkie-db-provisioning-job-account
+    namespace: {{ .Values.yorkie.namespace }}
+roleRef:
+  kind: Role
+  name: db-provisioning-job-status-reader
+  apiGroup: rbac.authorization.k8s.io
+
+---
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: yorkie-db-provisioning-job-account
+  namespace: {{ .Values.yorkie.namespace }}
+{{ end -}}

build/charts/yorkie-cluster/values.yaml

@@ -70,3 +70,19 @@ ratelimit:
   unit: minute
   requestsPerUnit: 10000
   domain: yorkie-ratelimit
+
+# Configuration for yorkie-mongodb
+yorkie-mongodb:
+  name: mongodb
+  namespace: mongodb
+  port: 27017
+  image:
+    registry: docker.io
+    repository: mongo
+    tag: "6.0"
+  persistence:
+    dataSize: 1Gi
+    configSize: 500Mi
+    storageClass: standard
+  sharded:
+    enabled: true