Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
monotek authored Sep 25, 2023
2 parents 766db31 + e3c050c commit 1ae1cad
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
- v1.27.3
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- v1.27.3
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-readme.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: copy README.md
run: |
cp -f README.md ${{ runner.temp }}/README.md
- name: Checkout gh-pages
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: gh-pages

Expand Down
2 changes: 0 additions & 2 deletions zammad/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ This is relevant to **EFS** for AWS users, as well.

To run OpenShift unprivileged and with [arbitrary UIDs and GIDs](https://cloud.redhat.com/blog/a-guide-to-openshift-and-uids):

- Add the extraRsyncParams `--no-perms --omit-dir-times`.
- [Delete the default key](https://helm.sh/docs/chart_template_guide/values_files/#deleting-a-default-key) `securityContext` and `zammadConfig.initContainers.zammad.securityContext.runAsUser` with `null`.
- Disable if used:
- also `podSecurityContext` in all subcharts.
Expand All @@ -56,7 +55,6 @@ securityContext: null
zammadConfig:
initContainers:
zammad:
extraRsyncParams: "--no-perms --omit-dir-times"
securityContext:
runAsUser: null
railsserver:
Expand Down
2 changes: 0 additions & 2 deletions zammad/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,6 @@ zammadConfig:
runAsNonRoot: false
runAsUser: 0
zammad:
# set extra params to rsync command
extraRsyncParams: ""
resources: {}
# requests:
# cpu: 100m
Expand Down

0 comments on commit 1ae1cad

Please sign in to comment.