From 24da349eb3a29379a83fe3f5c7ecd347023df0df Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Sun, 24 Mar 2024 14:01:51 +0000 Subject: [PATCH 1/6] update to current phpmyadmin versions --- lamp/templates/deployment.yaml | 4 +++- lamp/values.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lamp/templates/deployment.yaml b/lamp/templates/deployment.yaml index 1c2d4a3..f8dc6a6 100644 --- a/lamp/templates/deployment.yaml +++ b/lamp/templates/deployment.yaml @@ -674,10 +674,12 @@ spec: {{ if .Values.phpmyadmin.enabled }} - image: "{{ .Values.phpmyadmin.repository }}:{{ .Values.phpmyadmin.tag }}" name: phpmyadmin - command: [sh, -c, sed -i 's/listen\ 80/listen {{ .Values.phpmyadmin.port }}/g' /etc/nginx.conf && /run.sh supervisord -n] + # command: [sh, -c, sed -i 's/listen\ 80/listen {{ .Values.phpmyadmin.port }}/g' /etc/nginx.conf && /run.sh supervisord -n] env: - name: PMA_HOST value: 127.0.0.1 + - name: APACHE_PORT + value: {{ .Values.phpmyadmin.port | quote }} ports: - {containerPort: 8080} resources: diff --git a/lamp/values.yaml b/lamp/values.yaml index 3b26b87..4c8ca4a 100644 --- a/lamp/values.yaml +++ b/lamp/values.yaml @@ -224,7 +224,7 @@ phpmyadmin: repository: "phpmyadmin" ## phpmyadmin.tag default phpmyadmin image tag - tag: "phpmyadmin" + tag: "apache" ## phpmyadmin.enabled Enables phpmyadmin service enabled: false From 94ebac571694c6ed49d461d94911e1e55f1bed63 Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Sun, 24 Mar 2024 14:05:34 +0000 Subject: [PATCH 2/6] use APACHE_PORT env variable instead of sed command, and update tag to actual supported tag --- lamp/templates/deployment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/lamp/templates/deployment.yaml b/lamp/templates/deployment.yaml index f8dc6a6..399fc5a 100644 --- a/lamp/templates/deployment.yaml +++ b/lamp/templates/deployment.yaml @@ -674,7 +674,6 @@ spec: {{ if .Values.phpmyadmin.enabled }} - image: "{{ .Values.phpmyadmin.repository }}:{{ .Values.phpmyadmin.tag }}" name: phpmyadmin - # command: [sh, -c, sed -i 's/listen\ 80/listen {{ .Values.phpmyadmin.port }}/g' /etc/nginx.conf && /run.sh supervisord -n] env: - name: PMA_HOST value: 127.0.0.1 From 6b988ff39d3b8a90c0a7c8cb4790a0592df99317 Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Sun, 24 Mar 2024 15:35:05 +0000 Subject: [PATCH 3/6] support for kubernetes version >=1.19 --- lamp/templates/ingress-services.yaml | 22 +++++++++++++++++++++- lamp/templates/ingress-www.yaml | 13 ++++++++++++- lamp/templates/ingress.yaml | 13 ++++++++++++- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/lamp/templates/ingress-services.yaml b/lamp/templates/ingress-services.yaml index 8e889d3..121601c 100644 --- a/lamp/templates/ingress-services.yaml +++ b/lamp/templates/ingress-services.yaml @@ -1,5 +1,7 @@ {{- if and .Values.ingress.enabled (or .Values.phpmyadmin.enabled .Values.webdav.enabled) }} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 @@ -30,17 +32,35 @@ spec: http: paths: - path: / + {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} + pathType: ImplementationSpecific + backend: + service: + name: {{ template "lamp.fullname" . }} + port: + number: {{ .Values.phpmyadmin.port }} + {{- else -}} backend: serviceName: {{ template "lamp.fullname" . }} servicePort: {{ .Values.phpmyadmin.port }} + {{- end }} {{- end }} {{- if .Values.webdav.enabled }} - host: {{ .Values.webdav.subdomain }}.{{ template "lamp.domain" . }} http: paths: - path: / + {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} + pathType: ImplementationSpecific + backend: + service: + name: {{ template "lamp.fullname" . }} + port: + number: {{ .Values.webdav.port }} + {{ else -}} backend: serviceName: {{ template "lamp.fullname" . }} servicePort: {{ .Values.webdav.port }} + {{- end }} {{- end }} {{- end }} diff --git a/lamp/templates/ingress-www.yaml b/lamp/templates/ingress-www.yaml index f852985..2320926 100644 --- a/lamp/templates/ingress-www.yaml +++ b/lamp/templates/ingress-www.yaml @@ -1,5 +1,7 @@ {{- if and .Values.ingress.enabled .Values.ingress.subdomainWWW }} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 @@ -29,7 +31,16 @@ spec: http: paths: - path: / + {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} + pathType: ImplementationSpecific + backend: + service: + name: {{ template "lamp.fullname" . }} + port: + number: {{ .Values.service.HTTPPort }} + {{ else -}} backend: serviceName: {{ template "lamp.fullname" . }} servicePort: {{ .Values.service.HTTPPort }} + {{- end }} {{- end }} diff --git a/lamp/templates/ingress.yaml b/lamp/templates/ingress.yaml index c8a6805..56e75b6 100644 --- a/lamp/templates/ingress.yaml +++ b/lamp/templates/ingress.yaml @@ -1,5 +1,7 @@ {{- if .Values.ingress.enabled }} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 @@ -33,7 +35,16 @@ spec: http: paths: - path: / + {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} + pathType: ImplementationSpecific + backend: + service: + name: {{ template "lamp.fullname" . }} + port: + number: {{ .Values.service.HTTPPort }} + {{ else -}} backend: serviceName: {{ template "lamp.fullname" . }} servicePort: {{ .Values.service.HTTPPort }} + {{- end }} {{- end }} From b7d06cfa0d1fb6758c3219dff4b1dea67c89a03b Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Mon, 14 Apr 2025 10:23:26 +0000 Subject: [PATCH 4/6] better version check --- lamp/templates/ingress-services.yaml | 4 ++-- lamp/templates/ingress-www.yaml | 4 ++-- lamp/templates/ingress.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lamp/templates/ingress-services.yaml b/lamp/templates/ingress-services.yaml index 121601c..934b357 100644 --- a/lamp/templates/ingress-services.yaml +++ b/lamp/templates/ingress-services.yaml @@ -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 diff --git a/lamp/templates/ingress-www.yaml b/lamp/templates/ingress-www.yaml index 2320926..032a68b 100644 --- a/lamp/templates/ingress-www.yaml +++ b/lamp/templates/ingress-www.yaml @@ -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 diff --git a/lamp/templates/ingress.yaml b/lamp/templates/ingress.yaml index 56e75b6..4a0fb76 100644 --- a/lamp/templates/ingress.yaml +++ b/lamp/templates/ingress.yaml @@ -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 From 223f750c1b940dd6dc8da9edadf9c88e699c6668 Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Mon, 14 Apr 2025 10:27:11 +0000 Subject: [PATCH 5/6] new version --- lamp/Chart.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lamp/Chart.yaml b/lamp/Chart.yaml index 5c9ad02..769cfef 100644 --- a/lamp/Chart.yaml +++ b/lamp/Chart.yaml @@ -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 From add11c1676ec74eea63eb21cff6a5652e904986f Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Mon, 14 Apr 2025 11:19:17 +0000 Subject: [PATCH 6/6] change user from xfs to www-data --- lamp/files/httpd/httpd.conf | 4 ++-- lamp/templates/deployment.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lamp/files/httpd/httpd.conf b/lamp/files/httpd/httpd.conf index 59f6202..fe58ff3 100644 --- a/lamp/files/httpd/httpd.conf +++ b/lamp/files/httpd/httpd.conf @@ -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 diff --git a/lamp/templates/deployment.yaml b/lamp/templates/deployment.yaml index 399fc5a..2364710 100644 --- a/lamp/templates/deployment.yaml +++ b/lamp/templates/deployment.yaml @@ -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: