stphnsmpsn/truecharts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(common): allow more PUID/UID types to sync with GUID/GID (#2039)

Browse Source 
* feat(common): allow more PUID/UID types to sync with GUID/GID

* update tests

* bump
This commit is contained in:
Kjeld Schouten-Lebbing
2022-03-06 15:58:29 +01:00
committed by GitHub
parent e0a92e61f8
commit 0fe045998f
3 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
charts/library/common/Chart.yaml
View File

@@ -15,4 +15,4 @@ maintainers:
name: common
sources: null
type: library
version: 9.1.0
version: 9.1.1

4
charts/library/common/templates/lib/controller/_container.tpl
View File

@@ -48,6 +48,10 @@
env:
- name: PUID
value: {{ .Values.security.PUID | quote }}
- name: USER_ID
value: {{ .Values.security.PUID | quote }}
- name: UID
value: {{ .Values.security.PUID | quote }}
- name: UMASK
value: {{ .Values.security.UMASK | quote }}
- name: UMASK_SET

66
tests/library/common/container_spec.rb
View File

@@ -85,7 +85,7 @@ class Test < ChartTest
deployment = chart.resources(kind: "Deployment").first
containers = deployment["spec"]["template"]["spec"]["containers"]
mainContainer = containers.find{ |c| c["name"] == "common-test" }
assert_nil(mainContainer["env"][9])
assert_nil(mainContainer["env"][11])
end
it 'set static "k/v pair style" environment variables' do
@@ -101,14 +101,14 @@ class Test < ChartTest
deployment = chart.resources(kind: "Deployment").first
containers = deployment["spec"]["template"]["spec"]["containers"]
mainContainer = containers.find{ |c| c["name"] == "common-test" }
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][9]["name"])
assert_equal(values[:env].values[0].to_s, mainContainer["env"][9]["value"])
assert_equal(values[:env].keys[1].to_s, mainContainer["env"][10]["name"])
assert_equal(values[:env].values[1].to_s, mainContainer["env"][10]["value"])
assert_equal(values[:env].keys[2].to_s, mainContainer["env"][11]["name"])
assert_equal(values[:env].values[2].to_s, mainContainer["env"][11]["value"])
assert_equal(values[:env].keys[3].to_s, mainContainer["env"][12]["name"])
assert_equal(values[:env].values[3].to_s, mainContainer["env"][12]["value"])
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][11]["name"])
assert_equal(values[:env].values[0].to_s, mainContainer["env"][11]["value"])
assert_equal(values[:env].keys[1].to_s, mainContainer["env"][12]["name"])
assert_equal(values[:env].values[1].to_s, mainContainer["env"][12]["value"])
assert_equal(values[:env].keys[2].to_s, mainContainer["env"][13]["name"])
assert_equal(values[:env].values[2].to_s, mainContainer["env"][13]["value"])
assert_equal(values[:env].keys[3].to_s, mainContainer["env"][14]["name"])
assert_equal(values[:env].values[3].to_s, mainContainer["env"][14]["value"])
end
it 'set list of static "kubernetes style" environment variables' do
@@ -124,8 +124,8 @@ class Test < ChartTest
deployment = chart.resources(kind: "Deployment").first
containers = deployment["spec"]["template"]["spec"]["containers"]
mainContainer = containers.find{ |c| c["name"] == "common-test" }
assert_equal(values[:envList][0][:name].to_s, mainContainer["env"][9]["name"])
assert_equal(values[:envList][0][:value].to_s, mainContainer["env"][9]["value"])
assert_equal(values[:envList][0][:name].to_s, mainContainer["env"][11]["name"])
assert_equal(values[:envList][0][:value].to_s, mainContainer["env"][11]["value"])
end
it 'set both static "k/v pair style" and static "k/valueFrom style" environment variables' do
@@ -145,10 +145,10 @@ class Test < ChartTest
deployment = chart.resources(kind: "Deployment").first
containers = deployment["spec"]["template"]["spec"]["containers"]
mainContainer = containers.find{ |c| c["name"] == "common-test" }
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][9]["name"])
assert_equal(values[:env].values[0].to_s, mainContainer["env"][9]["value"])
assert_equal(values[:env].keys[1].to_s, mainContainer["env"][10]["name"])
assert_equal(values[:env].values[1][:valueFrom][:fieldRef][:fieldPath], mainContainer["env"][10]["valueFrom"]["fieldRef"]["fieldPath"])
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][11]["name"])
assert_equal(values[:env].values[0].to_s, mainContainer["env"][11]["value"])
assert_equal(values[:env].keys[1].to_s, mainContainer["env"][12]["name"])
assert_equal(values[:env].values[1][:valueFrom][:fieldRef][:fieldPath], mainContainer["env"][12]["valueFrom"]["fieldRef"]["fieldPath"])
end
it 'set static "k/explicitValueFrom pair style" environment variables' do
@@ -167,8 +167,8 @@ class Test < ChartTest
deployment = chart.resources(kind: "Deployment").first
containers = deployment["spec"]["template"]["spec"]["containers"]
mainContainer = containers.find{ |c| c["name"] == "common-test" }
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][9]["name"])
assert_equal(values[:env].values[0][:valueFrom][:fieldRef][:fieldPath], mainContainer["env"][9]["valueFrom"]["fieldRef"]["fieldPath"])
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][11]["name"])
assert_equal(values[:env].values[0][:valueFrom][:fieldRef][:fieldPath], mainContainer["env"][11]["valueFrom"]["fieldRef"]["fieldPath"])
end
it 'set static "k/implicitValueFrom pair style" environment variables' do
@@ -185,8 +185,8 @@ class Test < ChartTest
deployment = chart.resources(kind: "Deployment").first
containers = deployment["spec"]["template"]["spec"]["containers"]
mainContainer = containers.find{ |c| c["name"] == "common-test" }
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][9]["name"])
assert_equal(values[:env].values[0][:fieldRef][:fieldPath], mainContainer["env"][9]["valueFrom"]["fieldRef"]["fieldPath"])
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][11]["name"])
assert_equal(values[:env].values[0][:fieldRef][:fieldPath], mainContainer["env"][11]["valueFrom"]["fieldRef"]["fieldPath"])
end
it 'set both static "k/v pair style" and templated "k/v pair style" environment variables' do
@@ -200,10 +200,10 @@ class Test < ChartTest
deployment = chart.resources(kind: "Deployment").first
containers = deployment["spec"]["template"]["spec"]["containers"]
mainContainer = containers.find{ |c| c["name"] == "common-test" }
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][9]["name"])
assert_equal("common-test-admin", mainContainer["env"][9]["value"])
assert_equal(values[:env].keys[1].to_s, mainContainer["env"][10]["name"])
assert_equal(values[:env].values[1].to_s, mainContainer["env"][10]["value"])
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][11]["name"])
assert_equal("common-test-admin", mainContainer["env"][11]["value"])
assert_equal(values[:env].keys[1].to_s, mainContainer["env"][12]["name"])
assert_equal(values[:env].values[1].to_s, mainContainer["env"][12]["value"])
end
it 'set templated "k/v pair style" environment variables' do
@@ -216,8 +216,8 @@ class Test < ChartTest
deployment = chart.resources(kind: "Deployment").first
containers = deployment["spec"]["template"]["spec"]["containers"]
mainContainer = containers.find{ |c| c["name"] == "common-test" }
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][9]["name"])
assert_equal("common-test-admin", mainContainer["env"][9]["value"])
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][11]["name"])
assert_equal("common-test-admin", mainContainer["env"][11]["value"])
end
it 'set static "k/v pair style", templated "k/v pair style", static "k/explicitValueFrom pair style", and static "k/implicitValueFrom pair style" environment variables' do
@@ -243,14 +243,14 @@ class Test < ChartTest
deployment = chart.resources(kind: "Deployment").first
containers = deployment["spec"]["template"]["spec"]["containers"]
mainContainer = containers.find{ |c| c["name"] == "common-test" }
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][9]["name"])
assert_equal("common-test-admin", mainContainer["env"][9]["value"])
assert_equal(values[:env].keys[1].to_s, mainContainer["env"][10]["name"])
assert_equal(values[:env].values[1].to_s, mainContainer["env"][10]["value"])
assert_equal(values[:env].keys[2].to_s, mainContainer["env"][11]["name"])
assert_equal(values[:env].values[2][:valueFrom][:fieldRef][:fieldPath], mainContainer["env"][11]["valueFrom"]["fieldRef"]["fieldPath"])
assert_equal(values[:env].keys[3].to_s, mainContainer["env"][12]["name"])
assert_equal(values[:env].values[3][:fieldRef][:fieldPath], mainContainer["env"][12]["valueFrom"]["fieldRef"]["fieldPath"])
assert_equal(values[:env].keys[0].to_s, mainContainer["env"][11]["name"])
assert_equal("common-test-admin", mainContainer["env"][11]["value"])
assert_equal(values[:env].keys[1].to_s, mainContainer["env"][12]["name"])
assert_equal(values[:env].values[1].to_s, mainContainer["env"][12]["value"])
assert_equal(values[:env].keys[2].to_s, mainContainer["env"][13]["name"])
assert_equal(values[:env].values[2][:valueFrom][:fieldRef][:fieldPath], mainContainer["env"][13]["valueFrom"]["fieldRef"]["fieldPath"])
assert_equal(values[:env].keys[3].to_s, mainContainer["env"][14]["name"])
assert_equal(values[:env].values[3][:fieldRef][:fieldPath], mainContainer["env"][14]["valueFrom"]["fieldRef"]["fieldPath"])
end
it 'set "static" secret variables' do