From 330b74d2b6b6e088e01d29153d10f9cd0359dcf7 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Thu, 18 Feb 2021 23:41:14 +0100 Subject: [PATCH] fix common 1.1.0 (#149) --- .test/charts/common-test_spec.rb | 20 +++++++++---------- library/common/Chart.yaml | 2 +- .../templates/lib/controller/_container.tpl | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.test/charts/common-test_spec.rb b/.test/charts/common-test_spec.rb index 1e35a5b24a8..64882496af2 100644 --- a/.test/charts/common-test_spec.rb +++ b/.test/charts/common-test_spec.rb @@ -43,9 +43,9 @@ class Test < ChartTest values = {} chart.value values jq('.spec.template.spec.containers[0].env[0].name', resource('Deployment')).must_equal 'PUID' - jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568" jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID' - jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568" end it 'set "static" environment variables' do @@ -56,9 +56,9 @@ class Test < ChartTest } chart.value values jq('.spec.template.spec.containers[0].env[0].name', resource('Deployment')).must_equal 'PUID' - jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568" jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID' - jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568" jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal values[:env].keys[0].to_s jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal values[:env].values[0].to_s end @@ -75,9 +75,9 @@ class Test < ChartTest } chart.value values jq('.spec.template.spec.containers[0].env[0].name', resource('Deployment')).must_equal 'PUID' - jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568" jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID' - jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568" jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal values[:envValueFrom].keys[0].to_s jq('.spec.template.spec.containers[0].env[2].valueFrom | keys[0]', resource('Deployment')).must_equal values[:envValueFrom].values[0].keys[0].to_s end @@ -93,9 +93,9 @@ class Test < ChartTest } chart.value values jq('.spec.template.spec.containers[0].env[0].name', resource('Deployment')).must_equal 'PUID' - jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568" jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID' - jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568" jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal values[:env].keys[0].to_s jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal values[:env].values[0].to_s jq('.spec.template.spec.containers[0].env[3].name', resource('Deployment')).must_equal values[:envTpl].keys[0].to_s @@ -110,9 +110,9 @@ class Test < ChartTest } chart.value values jq('.spec.template.spec.containers[0].env[0].name', resource('Deployment')).must_equal 'PUID' - jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568" jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID' - jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal 568 + jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568" jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal values[:envTpl].keys[0].to_s jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal 'common-test-admin' end diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index 9ee5b313b1d..7674d9fbd53 100644 --- a/library/common/Chart.yaml +++ b/library/common/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: common description: Function library for TrueCharts type: library -version: 1.1.0 +version: 1.1.1 kubeVersion: ">=1.16.0-0" # upstream_version: 3.0.1 keywords: diff --git a/library/common/templates/lib/controller/_container.tpl b/library/common/templates/lib/controller/_container.tpl index e0060d2bcd4..8e81f5c8f86 100644 --- a/library/common/templates/lib/controller/_container.tpl +++ b/library/common/templates/lib/controller/_container.tpl @@ -17,9 +17,9 @@ The main container included in the controller. {{- end }} env: - name: PUID - value: {{ .Values.PUID }} + value: {{ .Values.PUID | quote }} - name: PGID - value: {{ .Values.PGID }} + value: {{ .Values.PGID | quote }} {{- if or .Values.env .Values.envTpl .Values.envValueFrom .Values.envVariable }} {{- range $envVariable := .Values.environmentVariables }} {{- if and $envVariable.name $envVariable.value }}