From f0a2ba1356ab7d1f2ad4449bf913788cacfa35ad Mon Sep 17 00:00:00 2001
From: Anne Matthes <Anne.Matthes@open-xchange.com>
Date: Fri, 16 Apr 2021 12:04:24 +0200
Subject: [PATCH] Add envsubst to fix gitlab-ci
---
.gitlab-ci.yml | 3 ++-
index.js | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa2a635..9c45e04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,8 @@ deploy:
tags:
- kubernetes
script:
- - helm upgrade -i manifest-service helm/manifest-service -f helm/values/develop.yaml
+ - envsubst < helm/values/develop.yaml > values.yaml
+ - helm upgrade -i manifest-service helm/manifest-service -f values.yaml
- kubectl rollout restart deployment manifest-service
environment:
name: $CI_COMMIT_REF_SLUG
diff --git a/index.js b/index.js
index 9bc7551..f854133 100644
--- a/index.js
+++ b/index.js
@@ -44,7 +44,7 @@ app.use(apiMetrics({ excludeRoutes: ignorePaths }))
app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument))
app.use('/swagger.json', (req, res) => res.json(swaggerDocument))
-const urls = yaml.load(fs.readFileSync('./config/manifests/url.yaml', 'utf8')).manifests
+const urls = yaml.load(fs.readFileSync('./config/manifests/urls.yaml', 'utf8')).manifests
app.get('/api/manifest.json', async (req, res, next) => {
try {
--
GitLab