[Hotfix] fix etcd configuration for m1/arm64 minikube

Author: krapie

README.md

@@ -1,8 +1,5 @@
 # yorkie-kubernetes
 
-***WARNING: currently yorkie minikube cluster on `m1/arm64`***
-***is not working due to bitami/etcd have issues with `m1/arm64` architecture***
-
 Yorkie cluster on kubernetes
 
 ## Table of Contents
@@ -94,7 +91,7 @@ In minikube yorie cluster, there are:
 - `yorkie-ingress` : ingress (lb, gw) for routing yorkie related services
   - `envoy-service` -> `envoy pod` : envoy proxy for web connection & routing api, 1 replica exists
     - `yorkie-service` -> `yorkie pods` : yorkie api server, 3 replica exists
-      - `etcd-service` -> `etcd stateful pod` : etcd for cluster mode, 1 replica exists
+      - `etcd-service` -> `etcd stateful pod` : etcd for cluster mode, 2 replica exists
       - `mongo-service` -> `mongo stateful pod` : mongodb for nosql db, 1 replica exists
 
 ### About Yorkie

minikube/config/envoy-configmap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: envoy-configmap
+  name: envoy-config
   namespace: yorkie
   labels:
     app: envoy
@@ -91,7 +91,7 @@ data:
             - endpoint:
                 address:
                   socket_address:
-                    address: yorkie-service
+                    address: yorkie
                     port_value: 11101
       - name: admin_service
         connect_timeout: 0.25s
@@ -105,5 +105,5 @@ data:
             - endpoint:
                 address:
                   socket_address:
-                    address: yorkie-service
+                    address: yorkie
                     port_value: 11103

minikube/deployment/envoy-deployment.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: envoy-deployment
+  name: envoy
   namespace: yorkie
   labels:
     app: envoy
@@ -16,7 +16,7 @@ spec:
         app: envoy
     spec:
       containers:
-        - name: envoy-sidecar
+        - name: envoy
           image: grpcweb/envoy
           ports:
             - containerPort: 8080
@@ -31,4 +31,4 @@ spec:
       volumes:
         - name: envoy-config
           configMap:
-            name: envoy-configmap
+            name: envoy-config

minikube/deployment/etcd-statefulset.yaml

@@ -1,12 +1,12 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: etcd-statefulset
+  name: etcd
   namespace: yorkie
   labels:
     app: etcd
 spec:
-  replicas: 1
+  replicas: 2
   serviceName: etcd
   selector:
     matchLabels:
@@ -20,20 +20,29 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
         - name: etcd
-          image: bitnami/etcd:latest
+          image: quay.io/coreos/etcd:latest
+          command:
+            - /bin/sh
+            - -c
+            - |
+              PEERS="etcd-0=http://etcd-0:2380,etcd-1=http://etcd-1:2380"
+              exec etcd --name ${HOSTNAME} \
+              --listen-peer-urls http://0.0.0.0:2380 \
+              --listen-client-urls http://0.0.0.0:2379 \
+              --advertise-client-urls http://${HOSTNAME}:2379 \
+              --initial-advertise-peer-urls http://${HOSTNAME}:2380 \
+              --initial-cluster-token etcd-cluster-1 \
+              --initial-cluster ${PEERS} \
+              --initial-cluster-state new \
+              --data-dir /var/run/etcd/default.etcd \
+              --auto-compaction-mode revision \
+              --auto-compaction-retention 1000
           ports:
             - containerPort: 2379
             - containerPort: 2380
           volumeMounts:
             - name: etcd-persistent-storage
               mountPath: /var/run/etcd
-          env:
-            - name: ALLOW_NONE_AUTHENTICATION
-              value: "yes"
-            - name: ETCD_AUTO_COMPACTION_MODE
-              value: "revision"
-            - name: ETCD_AUTO_COMPACTION_RETENTION
-              value: "1000"
           # resources will be configured in later updates
           # (need to load test to configure resource capacity)
           resources: {}

minikube/deployment/mongo-statefulset.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: mongo-statefulset
+  name: mongo
   namespace: yorkie
   labels:
     app: mongo

minikube/deployment/yorkie-server-deployment.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: yorkie-server-deployment
+  name: yorkie-server
   namespace: yorkie
   labels:
     app: yorkie-server
@@ -17,16 +17,16 @@ spec:
     spec:
       containers:
         - name: yorkie
+          image: yorkieteam/yorkie:latest
           # env will be configured in later updates
           # (including secrets for certain variables)
           args:
             - server
             - --mongo-connection-uri
-            - mongodb://mongo-service:27017
+            - mongodb://mongo:27017
             - --etcd-endpoints
-            - http://etcd-service:2379
+            - http://etcd:2379
             - --enable-pprof
-          image: yorkieteam/yorkie:latest
           ports:
             - containerPort: 11101
             - containerPort: 11102

minikube/networking/ingress/yorkie-ingress.yaml

@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   # using nginx ingress controller for minikube environment
-  name: yorkie-ingress
+  name: yorkie
   namespace: yorkie
 spec:
   rules:
@@ -12,14 +12,14 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: envoy-service
+                name: envoy
                 port:
                   number: 8080
           - path: /yorkie.v1.AdminService
             pathType: Prefix
             backend:
               service:
-                name: envoy-service
+                name: envoy
                 port:
                   number: 9090
           # uncomment this section if you deployed monitoring manifests

minikube/service/envoy-service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: envoy-service
+  name: envoy
   namespace: yorkie
   labels:
     app: envoy

minikube/service/etcd-service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: etcd-service
+  name: etcd
   namespace: yorkie
   labels:
     app: etcd
@@ -10,9 +10,9 @@ spec:
   selector:
     app: etcd
   ports:
-    - name: etcd-port
+    - name: client-port
       port: 2379
       targetPort: 2379
-    - name: etcd-second-port
+    - name: peer-port
       port: 2380
       targetPort: 2380

minikube/service/mongo-service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: mongo-service
+  name: mongo
   namespace: yorkie
   labels:
     app: mongo

minikube/service/yorkie-service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: yorkie-service
+  name: yorkie
   namespace: yorkie
   labels:
     app: yorkie-server