From 98b80ee5cd47e4085dec661abfedc23855f2e2ba Mon Sep 17 00:00:00 2001
From: antares-sw <23400824+antares-sw@users.noreply.github.com>
Date: Thu, 29 Jun 2023 15:23:34 +0300
Subject: [PATCH] Update operator scheme (#404)

* Update operator scheme

* Fix

* Fix
---
 charts/v3-operator/Chart.yaml                 | 2 +-
 charts/v3-operator/templates/configmap.yaml   | 3 ++-
 charts/v3-operator/templates/statefulset.yaml | 5 +++++
 charts/v3-operator/values.yaml                | 8 +++++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/charts/v3-operator/Chart.yaml b/charts/v3-operator/Chart.yaml
index b8c7b4e39..a7e470342 100644
--- a/charts/v3-operator/Chart.yaml
+++ b/charts/v3-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: v3-operator
-version: 3.0.6
+version: 3.0.7
 appVersion: v0.1.7
 kubeVersion: "^1.14.0-0"
 description: Operator hosted service for Stakewise V3 protocol.
diff --git a/charts/v3-operator/templates/configmap.yaml b/charts/v3-operator/templates/configmap.yaml
index 84e068abf..060f2b429 100644
--- a/charts/v3-operator/templates/configmap.yaml
+++ b/charts/v3-operator/templates/configmap.yaml
@@ -10,10 +10,11 @@ data:
   VAULT_CONTRACT_ADDRESS: {{ .Values.settings.vaultContractAddress | quote }}
   EXECUTION_ENDPOINT: {{ .Values.settings.executionEndpoint | quote }}
   CONSENSUS_ENDPOINT: {{ .Values.settings.consensusEndpoint | quote }}
-  KEYSTORES_PASSWORD_PATH: {{ .Values.settings.keystoresPasswordPath | quote }}
+  KEYSTORES_PASSWORD_FILE: {{ .Values.settings.keystoresPasswordFile | quote }}
   KEYSTORES_PATH: {{ .Values.settings.keystoresPath | quote }}
   DEPOSIT_DATA_PATH: {{ .Values.settings.depositDataPath | quote }}
   DEPOSIT_DATA: {{ .Values.settings.depositData | quote }}
+  METRICS_HOST: {{ .Values.serviceMonitor.host | quote }}
 
 {{- if .Values.settings.depositData }}
 ---
diff --git a/charts/v3-operator/templates/statefulset.yaml b/charts/v3-operator/templates/statefulset.yaml
index 9411cc2f9..013ffb82e 100644
--- a/charts/v3-operator/templates/statefulset.yaml
+++ b/charts/v3-operator/templates/statefulset.yaml
@@ -55,6 +55,11 @@ spec:
         - name: v3-operator
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command:
+            - python
+          args:
+            - src/main.py
+            - start
           envFrom:
             - configMapRef:
                 name: {{ include "common.names.fullname" . }}
diff --git a/charts/v3-operator/values.yaml b/charts/v3-operator/values.yaml
index 9b8c44494..f571dd3cc 100644
--- a/charts/v3-operator/values.yaml
+++ b/charts/v3-operator/values.yaml
@@ -38,6 +38,11 @@ affinity: { }
 ##
 tolerations: [ ]
 
+service:
+  type: ClusterIP
+  ports:
+    http: 9100
+
 serviceAccount:
   ## Annotations to add to the service account
   ##
@@ -83,7 +88,7 @@ settings:
   consensusEndpoint: ""
 
   # Absolute path to the password file for decrypting keystores
-  keystoresPasswordPath: "/password/password.txt"
+  keystoresPasswordFile: "/password/password.txt"
   # Password for keystores
   # Optional if used from secrets. 
   keystoresPassword: ""
@@ -146,6 +151,7 @@ persistence:
 ##
 serviceMonitor:
   enabled: false
+  host: 0.0.0.0
   ## The namespace in which the ServiceMonitor will be created
   ##
   namespace: ""