From f99b41784ab678bcbfbb0fefe227f3c0103e5741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20P=C3=B6hner?=
<10630407+groundhog2k@users.noreply.github.com>
Date: Sun, 26 Mar 2023 13:57:35 +0200
Subject: [PATCH] Groundhog2k/issue1212 (#1213)
---
charts/ghost/Chart.yaml | 2 +-
charts/ghost/README.md | 2 +-
charts/ghost/RELEASENOTES.md | 1 +
charts/ghost/templates/deployment.yaml | 12 ++++++++++++
charts/wordpress/Chart.yaml | 2 +-
charts/wordpress/README.md | 2 +-
charts/wordpress/RELEASENOTES.md | 1 +
charts/wordpress/templates/deployment.yaml | 6 ++++++
8 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/charts/ghost/Chart.yaml b/charts/ghost/Chart.yaml
index e9ca6f51..d695c904 100644
--- a/charts/ghost/Chart.yaml
+++ b/charts/ghost/Chart.yaml
@@ -7,7 +7,7 @@ type: application
maintainers:
- name: groundhog2k
-version: "0.83.0"
+version: "0.83.1"
appVersion: "5.40.1"
diff --git a/charts/ghost/README.md b/charts/ghost/README.md
index bd10353d..dbd65375 100644
--- a/charts/ghost/README.md
+++ b/charts/ghost/README.md
@@ -1,6 +1,6 @@
# Ghost
-  
+  
## Changelog
diff --git a/charts/ghost/RELEASENOTES.md b/charts/ghost/RELEASENOTES.md
index 72d606be..8cf7f386 100644
--- a/charts/ghost/RELEASENOTES.md
+++ b/charts/ghost/RELEASENOTES.md
@@ -109,4 +109,5 @@
| 0.81.0 | 5.38.0 | Upgraded to Ghost 5.38.0 |
| 0.82.0 | 5.39.0 | Upgraded to Ghost 5.39.0 |
| 0.83.0 | 5.40.1 | Upgraded to Ghost 5.40.1 |
+| 0.83.1 | 5.40.1 | Fixed health probe warnings |
| | | |
diff --git a/charts/ghost/templates/deployment.yaml b/charts/ghost/templates/deployment.yaml
index cee04e3b..706fd7b5 100644
--- a/charts/ghost/templates/deployment.yaml
+++ b/charts/ghost/templates/deployment.yaml
@@ -96,6 +96,10 @@ spec:
httpHeaders:
- name: Host
value: localhost:2368
+ {{- if hasPrefix "https" (default "" .Values.settings.url) }}
+ - name: x-forwarded-proto
+ value: https
+ {{- end }}
{{- with .Values.startupProbe }}
initialDelaySeconds: {{ .initialDelaySeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
@@ -117,6 +121,10 @@ spec:
httpHeaders:
- name: Host
value: localhost:2368
+ {{- if hasPrefix "https" (default "" .Values.settings.url) }}
+ - name: x-forwarded-proto
+ value: https
+ {{- end }}
{{- with .Values.livenessProbe }}
initialDelaySeconds: {{ .initialDelaySeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
@@ -138,6 +146,10 @@ spec:
httpHeaders:
- name: Host
value: localhost:2368
+ {{- if hasPrefix "https" (default "" .Values.settings.url) }}
+ - name: x-forwarded-proto
+ value: https
+ {{- end }}
{{- with .Values.readinessProbe }}
initialDelaySeconds: {{ .initialDelaySeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml
index 632af7b3..f2033327 100644
--- a/charts/wordpress/Chart.yaml
+++ b/charts/wordpress/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
type: application
# This is the chart version.
-version: "0.7.5"
+version: "0.7.6"
# This is the version number of the application being deployed.
appVersion: "6.1.1-apache"
diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md
index f6653bf0..c093a578 100644
--- a/charts/wordpress/README.md
+++ b/charts/wordpress/README.md
@@ -1,6 +1,6 @@
# Wordpress
-  
+  
## Changelog
diff --git a/charts/wordpress/RELEASENOTES.md b/charts/wordpress/RELEASENOTES.md
index fa0a599e..5ca34c32 100644
--- a/charts/wordpress/RELEASENOTES.md
+++ b/charts/wordpress/RELEASENOTES.md
@@ -23,4 +23,5 @@
| 0.7.3 | 6.1.1-apache | Fixed values documentation - thx @generalovmaksim |
| 0.7.4 | 6.1.1-apache | Updated version detection for pod disruption budget |
| 0.7.5 | 6.1.1-apache | Updated chart dependencies (mariadb 0.2.25) |
+| 0.7.6 | 6.1.1-apache | Fixed health probe warnings |
| | | |
diff --git a/charts/wordpress/templates/deployment.yaml b/charts/wordpress/templates/deployment.yaml
index 8f2a1b76..b53714e2 100644
--- a/charts/wordpress/templates/deployment.yaml
+++ b/charts/wordpress/templates/deployment.yaml
@@ -73,6 +73,8 @@ spec:
httpHeaders:
- name: Host
value: localhost:{{ .Values.containerPort }}
+ - name: x-forwarded-proto
+ value: https
{{- with .Values.startupProbe }}
initialDelaySeconds: {{ .initialDelaySeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
@@ -94,6 +96,8 @@ spec:
httpHeaders:
- name: Host
value: localhost:{{ .Values.containerPort }}
+ - name: x-forwarded-proto
+ value: https
{{- with .Values.livenessProbe }}
initialDelaySeconds: {{ .initialDelaySeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
@@ -115,6 +119,8 @@ spec:
httpHeaders:
- name: Host
value: localhost:{{ .Values.containerPort }}
+ - name: x-forwarded-proto
+ value: https
{{- with .Values.readinessProbe }}
initialDelaySeconds: {{ .initialDelaySeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
--
GitLab