refactored environment and port value

w3f · Jul 27, 2022 · 67ed1d0 · 67ed1d0
1 parent ed8fe81
commit 67ed1d0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/charts/polkadot-watcher/templates/alertrules.yaml b/charts/polkadot-watcher/templates/alertrules.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.prometheusRules.enabled ( ne .Values.environment "ci" ) }}
+{{ if and .Values.prometheusRules.enabled ( ne .Values.config.environment "ci" ) }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

diff --git a/charts/polkadot-watcher/templates/deployment.yaml b/charts/polkadot-watcher/templates/deployment.yaml
@@ -28,14 +28,14 @@ spec:
         - /app/config/main.yaml
         ports:
         - name: metrics
-          containerPort: {{ .Values.port }}
+          containerPort: {{ .Values.config.port }}
         livenessProbe:
           httpGet:
             path: /healthcheck
-            port: {{ .Values.port }}
+            port: {{ .Values.config.port }}
           initialDelaySeconds: 10
           timeoutSeconds: 200
-        {{ if ne .Values.environment "ci" }}
+        {{ if ne .Values.config.environment "ci" }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         {{ end }}

diff --git a/charts/polkadot-watcher/templates/service.yaml b/charts/polkadot-watcher/templates/service.yaml
@@ -7,6 +7,6 @@ metadata:
 spec:
   ports:
   - name: metrics
-    port: {{ .Values.port }}
+    port: {{ .Values.config.port }}
   selector:
     app: {{ .Release.Name }}
diff --git a/charts/polkadot-watcher/templates/servicemonitor.yaml b/charts/polkadot-watcher/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.serviceMonitor.enabled ( ne .Values.environment "ci" ) }}
+{{ if and .Values.serviceMonitor.enabled ( ne .Values.config.environment "ci" ) }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

diff --git a/charts/polkadot-watcher/values.yaml b/charts/polkadot-watcher/values.yaml
@@ -1,6 +1,3 @@
-environment: production
-port: 3000
-
 image:
   repo: web3f/polkadot-watcher
   # tag: latest
@@ -9,7 +6,7 @@ config:
   endpoint: "wss://kusama-rpc.polkadot.io"
   port: 3000
   logLevel: info
-  environment: production #it is used to filter the prometheusrules, i.e. to avoid conflicts between production and staging
+  environment: production #it is used also to filter the prometheusrules, i.e. to avoid conflicts between production and staging
   validators: []
 
 serviceMonitor:

diff --git a/scripts/integration-tests.sh b/scripts/integration-tests.sh
@@ -20,7 +20,7 @@ main(){
     fi
 
     /scripts/build-helm.sh \
-        --set environment=ci \
+        --set config.environment=ci \
         --set image.tag="${CIRCLE_SHA1}" \
         polkadot-watcher \
         ./charts/polkadot-watcher