From d4bd30e5e70cb13e3019bd92757a931c37b645f8 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Wed, 13 Mar 2024 21:28:01 +0100
Subject: [PATCH] Added oasis config to nomad helm chart.
Changelog: Fixed
---
.gitlab-ci.yml | 4 ++++
ops/kubernetes/nomad-prod-test.yaml | 1 -
ops/kubernetes/nomad/templates/configmap.yml | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6da592a30a..e1e4f5dcb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,6 +92,10 @@ build helm chart:
script:
- helm package -u ops/kubernetes/nomad -d ops/kubernetes
- 'curl --request POST --user gitlab-ci-token:$CI_JOB_TOKEN --form "chart=@ops/kubernetes/nomad-1.0.0.tgz" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/latest/charts"'
+ rules:
+ - if: $CI_COMMIT_BRANCH == "develop"
+ - when: manual
+ allow_failure: true
python linting:
stage: test
diff --git a/ops/kubernetes/nomad-prod-test.yaml b/ops/kubernetes/nomad-prod-test.yaml
index e5666d1f46..4e27996d90 100644
--- a/ops/kubernetes/nomad-prod-test.yaml
+++ b/ops/kubernetes/nomad-prod-test.yaml
@@ -20,7 +20,6 @@ nomad:
north_home: /nomad/test/fs/north/users
tmp: /nomad/test/fs/tmp
nomad: /nomad
- archiveVersionSuffix: v1
mail:
enabled: false
diff --git a/ops/kubernetes/nomad/templates/configmap.yml b/ops/kubernetes/nomad/templates/configmap.yml
index d3b65620c5..124bbe0b41 100644
--- a/ops/kubernetes/nomad/templates/configmap.yml
+++ b/ops/kubernetes/nomad/templates/configmap.yml
@@ -132,4 +132,7 @@ data:
{{ if .Values.nomad.config.normalize }}
normalize: {{ .Values.nomad.config.normalize | toYaml | nindent 6 }}
{{ end }}
+ {{ if .Values.nomad.config.oasis }}
+ oasis: {{ .Values.nomad.config.oasis | toYaml | nindent 6 }}
+ {{ end }}
{{- end }}
\ No newline at end of file
--
GitLab