fix: fix orioledb patroni etcd dependency with Service Reference

deploy/etcd/templates/clusterdefinition.yaml

@@ -71,4 +71,6 @@ spec:
                 --data-dir /var/run/etcd/default.etcd
   connectionCredential:
     username: root
-    password: ""
+    password: ""
+    endpoint: "$(SVC_FQDN)"
+    port: "$(SVC_PORT_client)"

deploy/orioledb-cluster/templates/cluster.yaml

@@ -3,6 +3,10 @@
   componentSpecs:
     - name: orioledb
       componentDefRef: orioledb
+      serviceRefs:
+      - name: etcdService
+        cluster: {{ .Values.etcdName | default "etcd" }}
+        namespace: {{ .Values.etcdNamespace | default "" }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
       {{- include "orioledb-cluster.replicaCount" . | indent 6 }}
       enabledLogs:

deploy/orioledb-cluster/values.schema.json

@@ -3,14 +3,10 @@
   "type": "object",
   "properties": {
     "version": {
-      "title": "Version",
-      "description": "Cluster version.",
       "type": "string",
       "default": "orioledb-beta1"
     },
     "mode": {
-      "title": "Mode",
-      "description": "Cluster topology mode.",
       "type": "string",
       "default": "standalone",
       "enum": [
@@ -19,8 +15,6 @@
       ]
     },
     "replicas": {
-      "title": "Replicas",
-      "description": "The number of replicas, for standalone mode, the replicas is 1, for replication mode, the default replicas is 2.",
       "type": "integer",
       "default": 1,
       "minimum": 1,
@@ -59,6 +53,16 @@
       "default": 20,
       "minimum": 1,
       "maximum": 10000
+    },
+    "etcd_name": {
+      "description":"patroni dependency etcd cluster name",
+      "type": "string",
+      "default": "etcd"
+    },
+    "etcd_namespace": {
+      "description":"patroni dependency etcd cluster namespace",
+      "type": "string",
+      "default": ""
     }
   }
 }

deploy/orioledb-cluster/values.yaml

@@ -32,3 +32,9 @@ requests:
 ## @param storage size, the unit is Gi
 ##
 storage: 20
+
+## @param patroni etcd cluster name, if not set will use the cluster name "etcd"
+## and the cluster must exist,
+etcdName: "etcd"
+
+etcdNamespace: ""

deploy/orioledb/config/etcd-serve-config.tpl

@@ -0,0 +1,18 @@
+{{- $clusterName := $.cluster.metadata.name }}
+{{- $namespace := $.cluster.metadata.namespace }}
+{{- $orioledb_etcd_from_service_ref := fromJson "{}" }}
+{{- if index $.component "serviceReferences" }}
+  {{- range $i, $e := $.component.serviceReferences }}
+    {{- if eq $i "etcdService" }}
+      {{- $orioledb_etcd_from_service_ref = $e }}
+      {{- break }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+{{- $etcd_server := printf "etcd-etcd:2379" }}
+{{- if $orioledb_etcd_from_service_ref }}
+  {{- if and (index $orioledb_etcd_from_service_ref.spec "endpoint") (index $orioledb_etcd_from_service_ref.spec "port") }}
+     {{- $etcd_server = printf "%s:%s" $orioledb_etcd_from_service_ref.spec.endpoint.value $orioledb_etcd_from_service_ref.spec.port.value }}
+  {{- end }}
+{{- end }}
+export PATRONI_ETCD3_HOST={{ $etcd_server}}

deploy/orioledb/templates/clusterdefinition.yaml

@@ -84,12 +84,22 @@ spec:
           namespace: {{ .Release.Namespace }}
           volumeName: agamotto-configuration
           defaultMode: 0777
+        - name: etcd-env
+          templateRef: etcd-env
+          namespace: {{ .Release.Namespace }}
+          volumeName: patroni-dependency
+          defaultMode: 0777
       scriptSpecs:
         - name: orioledb-scripts
           templateRef: orioledb-scripts
           namespace: {{ .Release.Namespace }}
           volumeName: scripts
           defaultMode: 0777
+      serviceRefDeclarations:
+        - name: etcdService
+          serviceRefDeclarationSpecs:
+            - serviceKind: etcd
+              serviceVersion: ^v3.\d...d$
       service:
         ports:
           - name: tcp-postgresql
@@ -140,6 +150,8 @@ spec:
                 mountPath: /kb-scripts
               - name: pod-info
                 mountPath: /kb-podinfo
+              - name: patroni-dependency
+                mountPath: /dependency
             ports:
               - name: tcp-postgresql
                 containerPort: 5432
@@ -148,8 +160,6 @@ spec:
             env: ## refer https://github.com/zalando/spilo/blob/master/ENVIRONMENT.rst
               - name: PGROOT
                 value: /home/postgres/pgdata/pgroot
-              - name: PATRONI_ETCD3_HOST
-                value: "etcd-etcd:2379" # todo : not hardcode
               - name: SCOPE
                 value: "$(KB_CLUSTER_NAME)-$(KB_COMP_NAME)-patroni$(KB_CLUSTER_UID_POSTFIX_8)"
               - name: KUBERNETES_SCOPE_LABEL

deploy/orioledb/templates/etcd-configmap.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: etcd-env
+  labels:
+    {{- include "orioledb.labels" . | nindent 4 }}
+data:
+  conf: |-
+    {{- .Files.Get "config/etcd-serve-config.tpl" | nindent 4 }}
+

deploy/orioledb/templates/scripts.yaml

@@ -120,9 +120,10 @@ data:
     CREATE EXTENSION pg_stat_statements;
   setup.sh: |
     mkdir -p /home/postgres/pgdata/conf
-    chmod 777 -R /home/postgres/pgdata/conf
+    chmod 777 -R /home/postgres/pgdata
     cp /home/postgres/conf/postgresql.conf /home/postgres/pgdata/conf
-    chmod 777 /home/postgres/pgdata/conf/postgresql.conf
+    chmod 777 -R /home/postgres/pgdata/conf
+    source /dependency/conf
 
 {{/*    chmod 750 -R /home/postgres/pgdata*/}}
 {{/*    mkdir -p  /var/lib/postgresql/conf*/}}