diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 7476c9b63d5eab17a722cc7f42d60d68bbf1098f..ba9d3bee9a9d0139afa94403ea43f803ac36db31 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -41,6 +41,7 @@ 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 }} @@ -50,6 +51,17 @@ 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 @@ -75,11 +87,19 @@ spec: containerPort: {{ .Values.metrics.port }} {{- end }} - name: http +<<<<<<< HEAD containerPort: {{ .Values.signer.http.port }} readinessProbe: httpGet: path: /readiness port: {{ .Values.signer.http.port }} +======= + containerPort: {{ .Values.infohub.http.port }} + readinessProbe: + httpGet: + path: /readiness + port: {{ .Values.infohub.http.port }} +>>>>>>> bc97545d401fbfa8ebdda5a58eac4937082b75c2 initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 diff --git a/templates/service.yaml b/templates/service.yaml index 980440e72d9aaa41e7ad764be14a639e0f41d102..731d5bf57dd3d65d2057b3866eb6ff1fed45bcab 100644 --- a/templates/service.yaml +++ b/templates/service.yaml @@ -10,6 +10,10 @@ 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 ae41ddc81c853270540321af8f4de4c3c90d599a..90481de62814250e269039f8faf92bb5991539c4 100644 --- a/values.yaml +++ b/values.yaml @@ -65,7 +65,11 @@ security: service: port: 8080 +<<<<<<< HEAD signer: +======= +infohub: +>>>>>>> bc97545d401fbfa8ebdda5a58eac4937082b75c2 http: host: "" port: 8080