From 4b98c727d2f77d2b3f2f39be23741e3c9045bb1b Mon Sep 17 00:00:00 2001
From: Adam Toy <adam.toy@rancherfederal.com>
Date: Thu, 7 Jul 2022 10:36:36 -0400
Subject: [PATCH 1/7] Add liveness probe support for Jira

---
 CHANGELOG.md                     |  4 ++++
 README.md                        |  4 ++++
 chart/Chart.yaml                 |  2 +-
 chart/templates/statefulset.yaml |  9 +++++++++
 chart/values.yaml                | 20 ++++++++++++++++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 174a954..55a91cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
+## [1.4.1-bb.1] - 2022-07-07
+### Added
+- Added livenessProbe configuration for statefulset pods
+
 ## [1.4.1-bb.0] - 2022-07-06
 ### Changed
 - Updated to appVersion 9.0.0, chart version 1.4.1
diff --git a/README.md b/README.md
index 8bf643a..bda0e54 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,10 @@ helm install jira chart/
 | jira.readinessProbe.initialDelaySeconds | int | `10` | The initial delay (in seconds) for the Jira container readiness probe, after which the probe will start running.  |
 | jira.readinessProbe.periodSeconds | int | `5` | How often (in seconds) the Jira container readiness probe will run  |
 | jira.readinessProbe.failureThreshold | int | `30` | The number of consecutive failures of the Jira container readiness probe before the pod fails readiness checks.  |
+| jira.livenessProbe.enabled | bool | `false` | Set to 'true' to enable the liveness probe on Jira containers.  |
+| jira.livenessProbe.initialDelaySeconds | int | `10` | The initial delay (in seconds) for the Jira container liveness probe, after which the probe will start running.  |
+| jira.livenessProbe.periodSeconds | int | `5` | How often (in seconds) the Jira container liveness probe will run  |
+| jira.livenessProbe.failureThreshold | int | `12` | The number of consecutive failures of the Jira container liveness probe before the pod fails liveness checks.  |
 | jira.accessLog.mountPath | string | `"/opt/atlassian/jira/logs"` | The path within the Jira container where the local-home volume should be mounted in order to capture access logs.  |
 | jira.accessLog.localHomeSubPath | string | `"log"` | The subdirectory within the local-home volume where access logs should be stored.  |
 | jira.clustering.enabled | bool | `false` | Set to 'true' if Data Center clustering should be enabled This will automatically configure cluster peer discovery between cluster nodes.  |
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 12b24c3..7a999c1 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: jira
 description: A chart for installing Jira Data Center on Kubernetes
 type: application
-version: 1.4.1-bb.0
+version: 1.4.1-bb.1
 appVersion: 9.0.0
 kubeVersion: ">=1.19.x-0"
 keywords:
diff --git a/chart/templates/statefulset.yaml b/chart/templates/statefulset.yaml
index f977687..4e186d5 100644
--- a/chart/templates/statefulset.yaml
+++ b/chart/templates/statefulset.yaml
@@ -125,6 +125,15 @@ spec:
             initialDelaySeconds: {{ .Values.jira.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.jira.readinessProbe.periodSeconds }}
             failureThreshold: {{ .Values.jira.readinessProbe.failureThreshold }}
+          {{- if .Values.jira.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.jira.ports.http }}
+              path: {{ .Values.jira.service.contextPath }}/status
+            initialDelaySeconds: {{ .Values.jira.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.jira.livenessProbe.periodSeconds }}
+            failureThreshold: {{ .Values.jira.livenessProbe.failureThreshold }}
+          {{- end }}
           {{- with .Values.jira.containerSecurityContext}}
           securityContext:
           {{- toYaml . | nindent 12}}
diff --git a/chart/values.yaml b/chart/values.yaml
index b79c779..2f3e966 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -483,6 +483,26 @@ jira:
     #
     failureThreshold: 30
 
+  # Confirm that Jira is up and running with a ReadinessProbe
+  # https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes
+  #
+  livenessProbe:
+    enabled: false
+
+    # -- The initial delay (in seconds) for the Jira container readiness probe,
+    # after which the probe will start running.
+    #
+    initialDelaySeconds: 10
+    
+    # -- How often (in seconds) the Jira container readiness probe will run
+    #
+    periodSeconds: 5
+    
+    # -- The number of consecutive failures of the Jira container readiness probe
+    # before the pod fails readiness checks.
+    #
+    failureThreshold: 12
+
   # Jira log configuration
   #
   accessLog:
-- 
GitLab


From 1bed319c40c1cce79b38087a116c8972b3f3f9ed Mon Sep 17 00:00:00 2001
From: Adam Toy <adam.toy@rancherfederal.com>
Date: Mon, 11 Jul 2022 10:35:25 -0400
Subject: [PATCH 2/7] Fix shared home labels

---
 chart/templates/bigbang/shared-home-pv.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/templates/bigbang/shared-home-pv.yaml b/chart/templates/bigbang/shared-home-pv.yaml
index 9235bb0..cfe411b 100644
--- a/chart/templates/bigbang/shared-home-pv.yaml
+++ b/chart/templates/bigbang/shared-home-pv.yaml
@@ -4,7 +4,7 @@ kind: PersistentVolume
 metadata:
   name: {{ include "common.names.fullname" . }}-shared-home-pv
   labels:
-  {{- include "jira.labels" . | nindent 4 }}
+  {{- include "common.labels.commonLabels" . | nindent 4 }}
 spec:
   capacity:
     storage: {{ .Values.volumes.sharedHome.persistentVolumeClaim.resources.requests.storage }}
-- 
GitLab


From f2e68bb30c307092bc6e864cb8de54ed578241df Mon Sep 17 00:00:00 2001
From: Adam Toy <adam.toy@rancherfederal.com>
Date: Mon, 11 Jul 2022 11:52:10 -0400
Subject: [PATCH 3/7] Increase intialDelaySeconds to 5min

---
 chart/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/values.yaml b/chart/values.yaml
index 2f3e966..a48bbef 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -492,7 +492,7 @@ jira:
     # -- The initial delay (in seconds) for the Jira container readiness probe,
     # after which the probe will start running.
     #
-    initialDelaySeconds: 10
+    initialDelaySeconds: 300
     
     # -- How often (in seconds) the Jira container readiness probe will run
     #
-- 
GitLab


From 6ffa04a5078eb94d1cc8953caa788abe19b79a31 Mon Sep 17 00:00:00 2001
From: Branden Cobb <cobb_branden@bah.com>
Date: Mon, 11 Jul 2022 15:59:04 +0000
Subject: [PATCH 4/7] Fix version reference

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bda0e54..6e044d3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # jira
 
-![Version: 1.4.1-bb.0](https://img.shields.io/badge/Version-1.4.1--bb.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.0.0](https://img.shields.io/badge/AppVersion-9.0.0-informational?style=flat-square)
+![Version: 1.4.1-bb.1](https://img.shields.io/badge/Version-1.4.1--bb.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.0.0](https://img.shields.io/badge/AppVersion-9.0.0-informational?style=flat-square)
 
 A chart for installing Jira Data Center on Kubernetes
 
-- 
GitLab


From c6fce5bfd5066a374bc086c5ba3078f8c3c78654 Mon Sep 17 00:00:00 2001
From: Adam Toy <adam.toy@rancherfederal.com>
Date: Mon, 11 Jul 2022 12:04:21 -0400
Subject: [PATCH 5/7] Fix values

---
 chart/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/values.yaml b/chart/values.yaml
index a48bbef..f836a06 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -483,7 +483,7 @@ jira:
     #
     failureThreshold: 30
 
-  # Confirm that Jira is up and running with a ReadinessProbe
+  # Confirm that Jira is up and running with a Liveness
   # https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes
   #
   livenessProbe:
-- 
GitLab


From 699874bf91999578763b422343c8c3ad5fb8a0b0 Mon Sep 17 00:00:00 2001
From: Adam Toy <adam.toy@rancherfederal.com>
Date: Mon, 11 Jul 2022 12:05:11 -0400
Subject: [PATCH 6/7] Fix values

---
 chart/values.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/chart/values.yaml b/chart/values.yaml
index f836a06..054f32c 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -489,17 +489,17 @@ jira:
   livenessProbe:
     enabled: false
 
-    # -- The initial delay (in seconds) for the Jira container readiness probe,
+    # -- The initial delay (in seconds) for the Jira container liveness probe,
     # after which the probe will start running.
     #
     initialDelaySeconds: 300
     
-    # -- How often (in seconds) the Jira container readiness probe will run
+    # -- How often (in seconds) the Jira container liveness probe will run
     #
     periodSeconds: 5
     
-    # -- The number of consecutive failures of the Jira container readiness probe
-    # before the pod fails readiness checks.
+    # -- The number of consecutive failures of the Jira container liveness probe
+    # before the pod fails liveness checks.
     #
     failureThreshold: 12
 
-- 
GitLab


From 4c6a606e589442b9c1ccf5e68fc2f66b8ef1b417 Mon Sep 17 00:00:00 2001
From: Adam Toy <adam.toy@rancherfederal.com>
Date: Mon, 11 Jul 2022 12:09:09 -0400
Subject: [PATCH 7/7] Fix values reference

---
 chart/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/values.yaml b/chart/values.yaml
index 054f32c..dad8f64 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -484,7 +484,7 @@ jira:
     failureThreshold: 30
 
   # Confirm that Jira is up and running with a Liveness
-  # https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes
+  # https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-a-liveness-command
   #
   livenessProbe:
     enabled: false
-- 
GitLab