Skip to content

Fixed http container not starting with unknown user xfs and better version check for ingress #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roadfox wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fixed http container not starting with unknown user xfs and better version check for ingress #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24da349
update to current phpmyadmin versions
roadfox Mar 24, 2024
94ebac5
use APACHE_PORT env variable instead of sed command, and update tag t…
roadfox Mar 24, 2024
6b988ff
support for kubernetes version >=1.19
roadfox Mar 24, 2024
4793302
Merge branch 'lead4good:master' into master
roadfox Mar 25, 2024
b7d06cf
better version check
roadfox Apr 14, 2025
223f750
new version
roadfox Apr 14, 2025
add11c1
change user from xfs to www-data
roadfox Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lamp/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
apiVersion: v1
description: Modular and transparent LAMP stack chart supporting PHP-FPM, Release Cloning, LoadBalancer, Ingress, SSL and lots more!
name: lamp
version: 1.1.5
appVersion: 7
version: 1.1.6
appVersion: "7"
home: https://github.com/lead4good/lamp-helm-repository
maintainers:
- name: lead4good
- name: roadfox
4 changes: 2 additions & 2 deletions lamp/files/httpd/httpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ LoadModule rewrite_module modules/mod_rewrite.so
# It is usually good practice to create a dedicated user and group for
# running httpd, as with most system services.
#
User xfs
Group xfs
User www-data
Group www-data

</IfModule>

Expand Down
2 changes: 1 addition & 1 deletion lamp/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ spec:
{{ if .Values.svn.enabled }}
- name: svn
image: lead4good/svn-sync
command: [/bin/sh, -c, "chown xfs:xfs /svn/ && su -s /bin/sh -c '/bin/sh /entrypoint.sh /sync.sh' xfs"]
command: [/bin/sh, -c, "chown www-data:www-data /svn/ && su -s /bin/sh -c '/bin/sh /entrypoint.sh /sync.sh' www-data"]
env:
- name: SYNC_USER
valueFrom:
Expand Down
4 changes: 2 additions & 2 deletions lamp/templates/ingress-services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{- if and .Values.ingress.enabled (or .Values.phpmyadmin.enabled .Values.webdav.enabled) }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare ">=1.19.0" .Capabilities.KubeVersion.Version -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- else if semverCompare ">=1.14.0" .Capabilities.KubeVersion.Version -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
Expand Down
4 changes: 2 additions & 2 deletions lamp/templates/ingress-www.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{- if and .Values.ingress.enabled .Values.ingress.subdomainWWW }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare ">=1.19.0" .Capabilities.KubeVersion.Version -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- else if semverCompare ">=1.14.0" .Capabilities.KubeVersion.Version -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
Expand Down
4 changes: 2 additions & 2 deletions lamp/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{- if .Values.ingress.enabled }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare ">=1.19.0" .Capabilities.KubeVersion.Version -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- else if semverCompare ">=1.14.0" .Capabilities.KubeVersion.Version -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
Expand Down