From ebb89a818f18c9228f8ba17ee05d2b56b280749d Mon Sep 17 00:00:00 2001
From: Anne Matthes <Anne.Matthes@open-xchange.com>
Date: Fri, 16 Apr 2021 11:57:56 +0200
Subject: [PATCH] Fix deployment
---
helm/manifest-service/templates/configMap.yaml | 2 +-
helm/manifest-service/templates/deployment.yaml | 2 +-
helm/manifest-service/values.yaml | 3 ---
helm/values/develop.yaml | 3 +--
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/helm/manifest-service/templates/configMap.yaml b/helm/manifest-service/templates/configMap.yaml
index 5724af4..3f7f1aa 100644
--- a/helm/manifest-service/templates/configMap.yaml
+++ b/helm/manifest-service/templates/configMap.yaml
@@ -5,4 +5,4 @@ metadata:
data:
urls.yaml: |
manifests:
- {{ .Values.manifests | toYaml }}
+ {{- toYaml .Values.manifests | nindent 6 }}
diff --git a/helm/manifest-service/templates/deployment.yaml b/helm/manifest-service/templates/deployment.yaml
index e50bec7..4916eb0 100644
--- a/helm/manifest-service/templates/deployment.yaml
+++ b/helm/manifest-service/templates/deployment.yaml
@@ -50,11 +50,11 @@ spec:
volumeMounts:
- name: manifest-config
mountPath: /app/config/manifests
- {{- with .Values.nodeSelector }}
volumes:
- name: manifest-config
configMap:
name: {{ include "manifest-service.fullname" . }}
+ {{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
diff --git a/helm/manifest-service/values.yaml b/helm/manifest-service/values.yaml
index b5c0769..4eb6616 100644
--- a/helm/manifest-service/values.yaml
+++ b/helm/manifest-service/values.yaml
@@ -6,9 +6,6 @@ replicaCount: 1
containerPort: 8080
-environment:
- manifestUrls: ''
-
image:
repository: gitlab.open-xchange.com:4567/frontend/infrastructure/manifest-service
pullPolicy: IfNotPresent
diff --git a/helm/values/develop.yaml b/helm/values/develop.yaml
index 6d9809e..ab176f0 100644
--- a/helm/values/develop.yaml
+++ b/helm/values/develop.yaml
@@ -2,11 +2,10 @@ replicaCount: 1
containerPort: 8080
manifests:
- https://manifest-service-dummy.k3s.os.oxui.de/manifest.json
- - https://manifest-service-dummy.k3s.os.oxui.de/manifest.json
ingress:
enabled: true
hosts:
- - host: manifest-service.k3s.os.oxui.de
+ - host: manifest-${CI_COMMIT_REF_SLUG}.k3s.os.oxui.de
paths:
- path: /
image:
--
GitLab