From e3e3499b2b11c1abb4e281ad9bfe6ff68eb27642 Mon Sep 17 00:00:00 2001
From: Brett Wright <brett.wright@nine.com.au>
Date: Tue, 3 Oct 2023 11:39:13 +1100
Subject: [PATCH 1/3] Add kubernetes startup probe

Signed-off-by: Brett Wright <brett.wright@nine.com.au>
---
 charts/backstage/Chart.yaml                   |  2 +-
 charts/backstage/README.md                    |  3 ++-
 charts/backstage/ci/probes-values.yaml        | 10 ++++++++++
 .../templates/backstage-deployment.yaml       |  3 +++
 charts/backstage/values.schema.json           | 20 +++++++++++++++++++
 charts/backstage/values.yaml                  | 16 +++++++++++++++
 6 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml
index 29ef488..fc643cc 100644
--- a/charts/backstage/Chart.yaml
+++ b/charts/backstage/Chart.yaml
@@ -38,4 +38,4 @@ sources:
 # 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.3.0
+version: 1.4.0
diff --git a/charts/backstage/README.md b/charts/backstage/README.md
index 7a1a961..bb2aed8 100644
--- a/charts/backstage/README.md
+++ b/charts/backstage/README.md
@@ -2,7 +2,7 @@
 # Backstage Helm Chart
 
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/backstage)](https://artifacthub.io/packages/search?repo=backstage)
-![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square)
+![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)
 
 A Helm chart for deploying a Backstage application
@@ -143,6 +143,7 @@ Kubernetes: `>= 1.19.0-0`
 | backstage.replicas | Number of deployment replicas | int | `1` |
 | backstage.resources | Resource requests/limits <br /> Ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-requests-and-limits-of-pod-and-container <!-- E.g. resources:   limits:     memory: 1Gi     cpu: 1000m   requests:     memory: 250Mi     cpu: 100m --> | object | `{}` |
 | backstage.revisionHistoryLimit | Define the [count of deployment revisions](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy) to be kept. May be set to 0 in case of GitOps deployment approach. | int | `10` |
+| backstage.startupProbe | Startup Probe Backstage doesn't provide any health endpoints by default. A simple one can be added like this: https://backstage.io/docs/plugins/observability/#health-checks <br /> Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes <!-- E.g. startupProbe:   failureThreshold: 3   httpGet:     path: /healthcheck     port: 7007     scheme: HTTP   initialDelaySeconds: 60   periodSeconds: 10   successThreshold: 1   timeoutSeconds: 2 | object | `{}` |
 | backstage.tolerations | Node tolerations for server scheduling to nodes with taints <br /> Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ | list | `[]` |
 | clusterDomain | Default Kubernetes cluster domain | string | `"cluster.local"` |
 | commonAnnotations | Annotations to add to all deployed objects | object | `{}` |
diff --git a/charts/backstage/ci/probes-values.yaml b/charts/backstage/ci/probes-values.yaml
index b936eff..d92f22a 100644
--- a/charts/backstage/ci/probes-values.yaml
+++ b/charts/backstage/ci/probes-values.yaml
@@ -19,3 +19,13 @@ backstage:
     periodSeconds: 10
     successThreshold: 1
     timeoutSeconds: 2
+  startupProbe:
+    failureThreshold: 3
+    httpGet:
+      path: /healthcheck
+      port: 7007
+      scheme: HTTP
+    initialDelaySeconds: 60
+    periodSeconds: 10
+    successThreshold: 1
+    timeoutSeconds: 2
\ No newline at end of file
diff --git a/charts/backstage/templates/backstage-deployment.yaml b/charts/backstage/templates/backstage-deployment.yaml
index 2dd0dd1..bc1aab8 100644
--- a/charts/backstage/templates/backstage-deployment.yaml
+++ b/charts/backstage/templates/backstage-deployment.yaml
@@ -113,6 +113,9 @@ spec:
           {{- if .Values.backstage.livenessProbe }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backstage.livenessProbe "context" $) | nindent 12 }}
           {{- end }}
+          {{- if .Values.backstage.startupProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backstage.startupProbe "context" $) | nindent 12 }}
+          {{- end }}
           {{- if .Values.backstage.extraEnvVarsSecrets }}
           envFrom:
             {{- range .Values.backstage.extraEnvVarsSecrets }}
diff --git a/charts/backstage/values.schema.json b/charts/backstage/values.schema.json
index 1f2692a..0c8fcfd 100644
--- a/charts/backstage/values.schema.json
+++ b/charts/backstage/values.schema.json
@@ -408,6 +408,26 @@
                         }
                     ]
                 },
+                "startupProbe": {
+                    "title": "Startup probe",
+                    "description": "Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/",
+                    "$ref": "https://kubernetesjsonschema.dev/master/_definitions.json#/definitions/io.k8s.api.core.v1.Probe",
+                    "default": {},
+                    "examples": [
+                        {
+                            "failureThreshold": 3,
+                            "httpGet": {
+                                "path": "/healthcheck",
+                                "port": 7007,
+                                "scheme": "HTTP"
+                            },
+                            "initialDelaySeconds": 60,
+                            "periodSeconds": 10,
+                            "successThreshold": 1,
+                            "timeoutSeconds": 2
+                        }
+                    ]
+                },
                 "podSecurityContext": {
                     "title": "Security settings for a Pod.",
                     "description": "The security settings that you specify for a Pod apply to all Containers in the Pod. Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod",
diff --git a/charts/backstage/values.yaml b/charts/backstage/values.yaml
index bad0de9..23732d2 100644
--- a/charts/backstage/values.yaml
+++ b/charts/backstage/values.yaml
@@ -190,6 +190,22 @@ backstage:
   #   timeoutSeconds: 2
   livenessProbe: {}
 
+    # -- Startup Probe
+  # Backstage doesn't provide any health endpoints by default. A simple one can be added like this: https://backstage.io/docs/plugins/observability/#health-checks
+  # <br /> Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes
+  # <!-- E.g.
+  # startupProbe:
+  #   failureThreshold: 3
+  #   httpGet:
+  #     path: /healthcheck
+  #     port: 7007
+  #     scheme: HTTP
+  #   initialDelaySeconds: 60
+  #   periodSeconds: 10
+  #   successThreshold: 1
+  #   timeoutSeconds: 2
+  startupProbe: {}
+
   # -- Security settings for a Pod.
   #  The security settings that you specify for a Pod apply to all Containers in the Pod.
   # <br /> Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod

From 70f4d5aed62e40ec643766220131e8eab42a6fa7 Mon Sep 17 00:00:00 2001
From: Brett Wright <wright.brett@gmail.com>
Date: Wed, 18 Oct 2023 08:41:47 +1100
Subject: [PATCH 2/3] Update
 charts/backstage/templates/backstage-deployment.yaml

Co-authored-by: Vincenzo Scamporlino <me@vinzscam.dev>
Signed-off-by: Brett Wright <brett.wright@nine.com.au>
---
 charts/backstage/templates/backstage-deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/backstage/templates/backstage-deployment.yaml b/charts/backstage/templates/backstage-deployment.yaml
index bc1aab8..807e288 100644
--- a/charts/backstage/templates/backstage-deployment.yaml
+++ b/charts/backstage/templates/backstage-deployment.yaml
@@ -114,7 +114,7 @@ spec:
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backstage.livenessProbe "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.backstage.startupProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backstage.startupProbe "context" $) | nindent 12 }}
+          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backstage.startupProbe "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.backstage.extraEnvVarsSecrets }}
           envFrom:

From 9fec282f2c5c4fa9f86d18b127c7dd7f2f7c7b2c Mon Sep 17 00:00:00 2001
From: Brett Wright <brett.wright@nine.com.au>
Date: Wed, 18 Oct 2023 23:52:49 +1100
Subject: [PATCH 3/3] Fixed linting issue

Signed-off-by: Brett Wright <brett.wright@nine.com.au>
---
 charts/backstage/ci/probes-values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/backstage/ci/probes-values.yaml b/charts/backstage/ci/probes-values.yaml
index d92f22a..668964b 100644
--- a/charts/backstage/ci/probes-values.yaml
+++ b/charts/backstage/ci/probes-values.yaml
@@ -28,4 +28,4 @@ backstage:
     initialDelaySeconds: 60
     periodSeconds: 10
     successThreshold: 1
-    timeoutSeconds: 2
\ No newline at end of file
+    timeoutSeconds: 2