truecharts/library-charts
1
0
Fork 0
mirror of https://github.com/truecharts/library-charts.git synced 2026-07-03 07:09:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

chore(autoperms): add an enabled flag (#482)

Browse Source 
**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
This commit is contained in:
Stavros Kois
2023-07-06 23:05:52 +03:00
committed by GitHub
parent 8ea6809abf
commit ec934f9dc4
7 changed files with 59 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/common-test/ci/autopermissions-values.yaml
View File

@@ -44,7 +44,10 @@ persistence:
autopermissions:
enabled: true
type: hostPath
setPermissions: true
autoPermissions:
enabled: true
chown: true
chmod: 775
hostPath: /usr
mountPath: /hptest
hostPathType: ""

34
library/common-test/tests/addons/autoperms_test.yaml
View File

@@ -15,6 +15,7 @@ tests:
enabled: true
type: hostPath
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: true
@@ -24,6 +25,7 @@ tests:
enabled: true
type: hostPath
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: false
@@ -33,6 +35,7 @@ tests:
enabled: true
type: hostPath
autoPermissions:
enabled: true
chmod: 770
mountPath: /test3
hostPath: /testhost3
@@ -40,6 +43,7 @@ tests:
enabled: true
type: hostPath
autoPermissions:
enabled: true
chown: true
mountPath: /test4
hostPath: /testhost4
@@ -56,6 +60,7 @@ tests:
mountPath: /test6
hostPath: /testhost6
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: true
@@ -65,6 +70,7 @@ tests:
enabled: true
type: emptyDir
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: true
@@ -75,8 +81,18 @@ tests:
server: 1.1.1.1
path: /share
autoPermissions:
enabled: true
chown: true
mountPath: /test9
# Should not show up, without enabled true
test10:
type: hostPath
hostPath: /testhost10
autoPermissions:
enabled: true
chown: true
mountPath: /test10
asserts:
- documentIndex: &jobDoc 0
isKind:
@@ -317,6 +333,7 @@ tests:
enabled: true
type: hostPath
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: true
@@ -326,6 +343,7 @@ tests:
enabled: true
type: hostPath
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: false
@@ -335,6 +353,7 @@ tests:
enabled: true
type: hostPath
autoPermissions:
enabled: true
chmod: 770
mountPath: /test3
hostPath: /testhost3
@@ -342,6 +361,7 @@ tests:
enabled: true
type: hostPath
autoPermissions:
enabled: true
chown: true
mountPath: /test4
hostPath: /testhost4
@@ -358,6 +378,7 @@ tests:
mountPath: /test6
hostPath: /testhost6
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: true
@@ -367,6 +388,7 @@ tests:
enabled: true
type: emptyDir
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: true
@@ -376,6 +398,7 @@ tests:
type: ixVolume
datasetName: test
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: true
@@ -386,8 +409,16 @@ tests:
server: 1.1.1.1
path: /share
autoPermissions:
enabled: true
chown: true
mountPath: /test9
# Should not show up, without enabled true
test10:
type: ixVolume
datasetName: test
autoPermissions:
chown: true
mountPath: /test10
asserts:
- documentIndex: *jobDoc
isKind:
@@ -662,6 +693,7 @@ tests:
enabled: true
type: hostPath
autoPermissions:
enabled: true
chown: true
chmod: 770
recursive: true
@@ -710,6 +742,7 @@ tests:
type: device
hostPath: /test
autoPermissions:
enabled: true
chown: true
asserts:
- failedTemplate:
@@ -730,6 +763,7 @@ tests:
hostPath: /test
readOnly: true
autoPermissions:
enabled: true
chmod: 770
asserts:
- failedTemplate:

2
library/common/Chart.yaml
View File

@@ -15,4 +15,4 @@ maintainers:
name: common
sources: null
type: library
version: 12.14.6
version: 12.14.7

2
library/common/templates/addons/vpn/_volume.tpl
View File

@@ -52,6 +52,7 @@ type: hostPath
hostPath: {{ .Values.addons.vpn.configFile | default "/vpn" }}
hostPathType: "File"
autoPermissions:
enabled: true
chown: true
user: 568
group: 568
@@ -73,6 +74,7 @@ enabled: true
type: hostPath
hostPath: {{ .Values.addons.vpn.configFolder | quote }}
autoPermissions:
enabled: true
chown: true
user: 568
group: 568

4
library/common/templates/lib/container/_volumeMounts.tpl
View File

@@ -90,7 +90,7 @@ objectData: The object data to be used to render the container.
{{- $return = true -}}
{{/* Set custom path on autopermissions container */}}
{{- if and (eq $objectData.shortName "autopermissions") $persistenceValues.autoPermissions -}}
{{- if or $persistenceValues.autoPermissions.chown $persistenceValues.autoPermissions.chmod -}}
{{- if $persistenceValues.autoPermissions.enabled -}}
{{- $return = true -}}
{{- $_ := set $volMount "mountPath" (printf "/mounts/%v" $persistenceName) -}}
{{- end -}}
@@ -99,7 +99,7 @@ objectData: The object data to be used to render the container.
{{/* If the container is the autopermission */}}
{{- else if (eq $objectData.shortName "autopermissions") -}}
{{- if $persistenceValues.autoPermissions -}}
{{- if or $persistenceValues.autoPermissions.chown $persistenceValues.autoPermissions.chmod -}}
{{- if $persistenceValues.autoPermissions.enabled -}}
{{- $return = true -}}
{{- $_ := set $volMount "mountPath" (printf "/mounts/%v" $persistenceName) -}}
{{- end -}}

2
library/common/templates/lib/pod/_volumes.tpl
View File

@@ -22,7 +22,7 @@ objectData: The object data to be used to render the Pod.
{{/* If the pod is the autopermission */}}
{{- else if eq $objectData.shortName "autopermissions" -}}
{{- if $persistence.autoPermissions -}}
{{- if or $persistence.autoPermissions.chown $persistence.autoPermissions.chmod -}}
{{- if $persistence.autoPermissions.enabled -}}
{{- $selected = true -}}
{{- end -}}
{{- end -}}

28
library/common/templates/lib/util/_autoperms.tpl
View File

@@ -12,22 +12,24 @@
{{- range $name, $mount := .Values.persistence -}}
{{- if and $mount.enabled $mount.autoPermissions -}}
{{/* If autoPermissions is enabled...*/}}
{{- if or $mount.autoPermissions.chown $mount.autoPermissions.chmod -}}
{{- $type := $.Values.fallbackDefaults.persistenceType -}}
{{- if $mount.type -}}
{{- $type = $mount.type -}}
{{- end -}}
{{- if $mount.autoPermissions.enabled -}}
{{- if or $mount.autoPermissions.chown $mount.autoPermissions.chmod -}}
{{- $type := $.Values.fallbackDefaults.persistenceType -}}
{{- if $mount.type -}}
{{- $type = $mount.type -}}
{{- end -}}
{{- if not (mustHas $type $permAllowedTypes) -}}
{{- fail (printf "Auto Permissions - Allowed persistent types for auto permissions are [%v], but got [%v] on [%v]" (join ", " $permAllowedTypes) $type $name) -}}
{{- end -}}
{{- if not (mustHas $type $permAllowedTypes) -}}
{{- fail (printf "Auto Permissions - Allowed persistent types for auto permissions are [%v], but got [%v] on [%v]" (join ", " $permAllowedTypes) $type $name) -}}
{{- end -}}
{{- if $mount.readOnly -}}
{{- fail (printf "Auto Permissions - You cannot change permissions/ownership automatically on [%v] with readOnly enabled" $name) -}}
{{- end -}}
{{- if $mount.readOnly -}}
{{- fail (printf "Auto Permissions - You cannot change permissions/ownership automatically on [%v] with readOnly enabled" $name) -}}
{{- end -}}
{{/* Add some data regarding what actions to perform */}}
{{- $_ := set $mounts $name $mount.autoPermissions -}}
{{/* Add some data regarding what actions to perform */}}
{{- $_ := set $mounts $name $mount.autoPermissions -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- end -}}