From c52f3d11d37067b328bf5a988a97d02e46ca79d2 Mon Sep 17 00:00:00 2001 From: Valeri Fikov <valeri.fikov@vereign.com> Date: Tue, 21 Jun 2022 14:07:54 +0300 Subject: [PATCH] initial push --- Chart.yaml | 4 ++-- templates/deployment.yaml | 12 ------------ templates/service.yaml | 4 ---- values.yaml | 4 ---- 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 5af276a..ed5a7bc 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 appVersion: 0.0.0 -description: infohub deployment -name: infohub +description: signer deployment +name: signer version: 0.0.0 icon: "https://www.vereign.com/wp-content/themes/vereign2020/images/vereign-logo.svg" diff --git a/templates/deployment.yaml b/templates/deployment.yaml index ba9d3be..9763d04 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -41,7 +41,6 @@ spec: - name: LOG_ENCODING value: {{ .Values.log.encoding | default "json" }} - name: HTTP_HOST -<<<<<<< HEAD value: {{ .Values.signer.http.host | quote }} - name: HTTP_PORT value: {{ .Values.signer.http.port | quote }} @@ -51,17 +50,6 @@ spec: value: {{ .Values.signer.http.timeout.read | quote }} - name: HTTP_WRITE_TIMEOUT value: {{ .Values.signer.http.timeout.write | quote }} -======= - value: {{ .Values.infohub.http.host | quote }} - - name: HTTP_PORT - value: {{ .Values.infohub.http.port | quote }} - - name: HTTP_IDLE_TIMEOUT - value: {{ .Values.infohub.http.timeout.idle | quote }} - - name: HTTP_READ_TIMEOUT - value: {{ .Values.infohub.http.timeout.read | quote }} - - name: HTTP_WRITE_TIMEOUT - value: {{ .Values.infohub.http.timeout.write | quote }} ->>>>>>> bc97545d401fbfa8ebdda5a58eac4937082b75c2 - name: MONGO_ADDR value: {{ .Values.mongo.addr | quote }} - name: MONGO_USER diff --git a/templates/service.yaml b/templates/service.yaml index 731d5bf..980440e 100644 --- a/templates/service.yaml +++ b/templates/service.yaml @@ -10,10 +10,6 @@ spec: ports: - name: http targetPort: {{ .Values.service.port }} -<<<<<<< HEAD port: {{ .Values.signer.http.port }} -======= - port: {{ .Values.infohub.http.port }} ->>>>>>> bc97545d401fbfa8ebdda5a58eac4937082b75c2 selector: {{- include "app.selectorLabels" . | nindent 4 }} diff --git a/values.yaml b/values.yaml index 90481de..ae41ddc 100644 --- a/values.yaml +++ b/values.yaml @@ -65,11 +65,7 @@ security: service: port: 8080 -<<<<<<< HEAD signer: -======= -infohub: ->>>>>>> bc97545d401fbfa8ebdda5a58eac4937082b75c2 http: host: "" port: 8080 -- GitLab