clean up naming and if conditionals

Author: jessebot

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: 2.0.0
+version: 2.0.1
 
 # renovate: image=docker.io/ghost
 appVersion: "6.0.10"

charts/ghost/README.md

@@ -1,6 +1,6 @@
 # ghost
 
-![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.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: 2.0.1](https://img.shields.io/badge/Version-2.0.1-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
 

…ts/ghost/templates/proxy-deployment.yaml …ts/ghost/templates/deployment-proxy.yamlcharts/ghost/templates/proxy-deployment.yaml renamed to charts/ghost/templates/deployment-proxy.yaml charts/ghost/templates/proxy-deployment.yaml renamed to charts/ghost/templates/deployment-proxy.yaml

@@ -27,11 +27,13 @@ spec:
           ports:
             - name: nginx
               containerPort: 80
+
           volumeMounts:
             - name: nginx-conf
               mountPath: /etc/nginx/nginx.conf
               subPath: nginx.conf
               readOnly: true
+
           resources:
             requests:
               memory: 100Mi
@@ -40,10 +42,10 @@ spec:
               memory: 256Mi
               cpu: 1000m
       volumes:
-      - name: nginx-conf
-        configMap:
-          name: nginx-conf
-          items:
-            - key: nginx.conf
-              path: nginx.conf
+        - name: nginx-conf
+          configMap:
+            name: nginx-conf
+            items:
+              - key: nginx.conf
+                path: nginx.conf
 {{- end }}

charts/ghost/templates/ingress.yaml

@@ -31,8 +31,7 @@ spec:
     - host: {{ .host | quote }}
       http:
         paths:
-          {{- if $.Values.activity_pub.enabled }}
-          {{- if not $.Values.proxy.enabled }}
+          {{- if and $.Values.activity_pub.enabled (not $.Values.proxy.enabled) }}
           # ActivityPub routes (must come before the catch-all route)
           - path: /\.ghost/activitypub(?/.*)?
             pathType: ImplementationSpecific
@@ -58,7 +57,6 @@ spec:
                 port:
                   number: {{ $.Values.activity_pub.service.port }}
           {{- end }}
-          {{- end }}
           # regular ghost stuff
           {{- range .paths }}
           - path: {{ .path }}
@@ -82,8 +80,7 @@ spec:
     - host: {{ $.Values.ghost.admin_domain | quote }}
       http:
         paths:
-          {{- if $.Values.activity_pub.enabled }}
-          {{- if not $.Values.proxy.enabled }}
+          {{- if and $.Values.activity_pub.enabled (not $.Values.proxy.enabled) }}
           # ActivityPub routes (must come before the catch-all route)
           - path: /\.ghost/activitypub(?/.*)?
             pathType: ImplementationSpecific
@@ -109,7 +106,6 @@ spec:
                 port:
                   number: {{ $.Values.activity_pub.service.port }}
           {{- end }}
-          {{- end }}
 
           - path: /
             pathType: Prefix