add ghost.domain and ghost.admin_domain and make sure to template the activitypub service correct for the variable name

charts/ghost/Chart.yaml

@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.0
+version: 1.5.0
 
 # renovate: image=docker.io/ghost
 appVersion: "6.0.10"

charts/ghost/README.md

@@ -1,6 +1,6 @@
 # ghost
 
-![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.10](https://img.shields.io/badge/AppVersion-6.0.10-informational?style=flat-square)
+![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.10](https://img.shields.io/badge/AppVersion-6.0.10-informational?style=flat-square)
 
 A Helm chart for deploying Ghost on Kubernetes
 
@@ -64,7 +64,9 @@ A Helm chart for deploying Ghost on Kubernetes
 | ghost.admin.secretKeys.password | string | `""` | Key in existing Kubernetes Secret with the admin password. |
 | ghost.admin.secretKeys.username | string | `""` | Key in existing Kubernetes Secret with the admin username. |
 | ghost.admin.username | string | `""` | admin username. ignored if existingSecret not "" |
+| ghost.admin_domain | string | `""` | admin domain of the ghost blog, used for admin portal (must NOT include http:// or https://) e.g. admin.blog.example.com |
 | ghost.blog_title | string | `""` | title of your ghost blog |
+| ghost.domain | string | `""` | domain of the ghost blog (must NOT include http:// or https://) e.g. blog.example.com |
 | ghost.enable_https | bool | `false` | enable HTTPS for the ghost blog |
 | ghost.skip_bootstrap | bool | `false` | skip install of ghost at pod restart |
 | ghost.smtp.existingSecret | string | `""` | existing kubernetes secret with ghost smtp credentials |
@@ -80,7 +82,7 @@ A Helm chart for deploying Ghost on Kubernetes
 | ghost.smtp.secretKeys.protocol | string | `""` | Key in existing Kubernetes Secret with the smtp protocol. |
 | ghost.smtp.secretKeys.username | string | `""` | Key in existing Kubernetes Secret with the smtp username. |
 | ghost.smtp.username | string | `""` | smtp username. ignored if existingSecret not "" |
-| ghost.url | string | `""` | public url of the ghost blog (must include http:// or https://) |
+| ghost.url | string | `""` | public url of the ghost blog (must INCLUDE http:// or https://) e.g. https://blog.example.com |
 | image.pullPolicy | string | `"IfNotPresent"` | This sets the pull policy for images. |
 | image.repository | string | `"ghost"` | image repo |
 | image.tag | string | `""` |  |

charts/ghost/templates/deployment.yaml

@@ -50,44 +50,52 @@ spec:
                 name: {{ include "ghost.fullname" . }}-smtp
           {{- end }}
           env:
-            # 0
             - name: url
               value: {{ .Values.ghost.url }}
-            # 1
+
+            - name: DOMAIN
+              value: {{ .Values.ghost.domain }}
+
+            - name: ADMIN_DOMAIN
+              value: {{ .Values.ghost.admin_domain }}
+
             - name: database__client
               value: mysql
+
+            - name: ACTIVITYPUB_TARGET
+              value: "{{ include "ghost.fullname" . }}-activitypub.{{ .Release.Namespace }}.svc:{{ .Values.activity_pub.service.port }}"
+
             {{ if .Values.externalDatabase.existingSecret }}
-            # 2
             - name: database__connection__host
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.externalDatabase.existingSecret }}
                   key: {{ .Values.externalDatabase.secretKeys.hostname }}
-            # 3
+
             - name: database__connection__port
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.externalDatabase.existingSecret }}
                   key: {{ .Values.externalDatabase.secretKeys.port }}
-            # 4
+
             - name: database__connection__database
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.externalDatabase.existingSecret }}
                   key: {{ .Values.externalDatabase.secretKeys.database }}
-            # 5
+
             - name: database__connection__user
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.externalDatabase.existingSecret }}
                   key: {{ .Values.externalDatabase.secretKeys.username }}
-            # 6
+
             - name: database__connection__password
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.externalDatabase.existingSecret }}
                   key: {{ .Values.externalDatabase.secretKeys.password }}
-            # 7
+
             - name: DATABASE_ROOT_PASSWORD
               valueFrom:
                 secretKeyRef:
@@ -133,9 +141,6 @@ spec:
                   key: {{ .Values.ghost.smtp.secretKeys.password }}
             {{ end }}
 
-            - name: ACTIVITYPUB_TARGET
-              value: "{{ include "ghost.fullname" . }}-activitypub:8080"
-
           ports:
             - name: http
               containerPort: {{ .Values.service.targetPort }}

charts/ghost/values.yaml

@@ -175,9 +175,18 @@ externalDatabase:
     database: ""
 
 ghost:
-  # -- public url of the ghost blog (must include http:// or https://)
+  # -- public url of the ghost blog (must INCLUDE http:// or https://)
+  # e.g. https://blog.example.com
   url: ""
 
+  # -- domain of the ghost blog (must NOT include http:// or https://)
+  # e.g. blog.example.com
+  domain: ""
+
+  # -- admin domain of the ghost blog, used for admin portal
+  # (must NOT include http:// or https://) e.g. admin.blog.example.com
+  admin_domain: ""
+
   # -- title of your ghost blog
   blog_title: ""