From ccf9453029856f9f3a2e9f3f0662e8cbed0ba7b9 Mon Sep 17 00:00:00 2001
From: Marc LeBlanc <marc.leblanc@sourcegraph.com>
Date: Sat, 13 Jul 2024 20:05:46 -0600
Subject: [PATCH 1/3] Disabling sg-test-connection via busybox by default

---
 charts/sourcegraph/templates/tests/test-connection.yaml | 4 +++-
 charts/sourcegraph/values.yaml                          | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/charts/sourcegraph/templates/tests/test-connection.yaml b/charts/sourcegraph/templates/tests/test-connection.yaml
index 8bf16f39..d84d4117 100644
--- a/charts/sourcegraph/templates/tests/test-connection.yaml
+++ b/charts/sourcegraph/templates/tests/test-connection.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.sgTestConnection.enabled -}}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -12,4 +13,5 @@ spec:
       image: busybox
       command: ['wget']
       args: ['sourcegraph-frontend:30080/']
-  restartPolicy: Never
\ No newline at end of file
+  restartPolicy: Never
+{{- end }}
diff --git a/charts/sourcegraph/values.yaml b/charts/sourcegraph/values.yaml
index 21689827..18089d18 100644
--- a/charts/sourcegraph/values.yaml
+++ b/charts/sourcegraph/values.yaml
@@ -1084,6 +1084,10 @@ searcher:
   # -- Size of the PVC for searcher pods to store cache data
   storageSize: 26Gi
 
+sgTestConnection:
+  # Run a connection test after instance startup, for CI/CD testing
+  enabled: false
+
 storageClass:
   # -- Enable creation of storageClass.
   # Disable if you have your own existing storage class

From 7de91e53365e6231be70f33c54b9c6423a55b5c9 Mon Sep 17 00:00:00 2001
From: Marc <7050295+marcleblanc2@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:55:13 -0600
Subject: [PATCH 2/3] Don't change default behaviour of sgTestConnection

---
 charts/sourcegraph/values.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/sourcegraph/values.yaml b/charts/sourcegraph/values.yaml
index 18089d18..d7bde505 100644
--- a/charts/sourcegraph/values.yaml
+++ b/charts/sourcegraph/values.yaml
@@ -1086,7 +1086,8 @@ searcher:
 
 sgTestConnection:
   # Run a connection test after instance startup, for CI/CD testing
-  enabled: false
+  # Setting to true to not change default behaviour
+  enabled: true
 
 storageClass:
   # -- Enable creation of storageClass.

From b8e74c52f64afbf7bd87316ddf0c9f8c70e36688 Mon Sep 17 00:00:00 2001
From: Marc LeBlanc <marc.leblanc@sourcegraph.com>
Date: Thu, 31 Oct 2024 17:19:24 -0600
Subject: [PATCH 3/3] Add config to customize which image gets used for the
 connection test

---
 charts/sourcegraph/templates/tests/test-connection.yaml | 2 +-
 charts/sourcegraph/values.yaml                          | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/sourcegraph/templates/tests/test-connection.yaml b/charts/sourcegraph/templates/tests/test-connection.yaml
index d84d4117..250641bd 100644
--- a/charts/sourcegraph/templates/tests/test-connection.yaml
+++ b/charts/sourcegraph/templates/tests/test-connection.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   containers:
     - name: wget
-      image: busybox
+      image: {{ include "sourcegraph.image" (list . "sgTestConnection") }}
       command: ['wget']
       args: ['sourcegraph-frontend:30080/']
   restartPolicy: Never
diff --git a/charts/sourcegraph/values.yaml b/charts/sourcegraph/values.yaml
index d7bde505..4d76e04c 100644
--- a/charts/sourcegraph/values.yaml
+++ b/charts/sourcegraph/values.yaml
@@ -1088,6 +1088,11 @@ sgTestConnection:
   # Run a connection test after instance startup, for CI/CD testing
   # Setting to true to not change default behaviour
   enabled: true
+  image:
+    # -- Docker image tag for the sg-test-connection pod
+    defaultTag: ''
+    # -- Docker image name for the sg-test-connection pod
+    name: "busybox"
 
 storageClass:
   # -- Enable creation of storageClass.