utilize init container for the new .sh

Author: gkech

build/postgres-operator/Dockerfile

@@ -63,6 +63,9 @@ COPY --from=go_builder /usr/local/bin/pgbackrest /usr/local/bin/
 COPY --from=go_builder /licenses /licenses
 COPY build/postgres-operator/install-extensions.sh /usr/local/bin
 COPY build/postgres-operator/init-entrypoint.sh /usr/local/bin
+COPY build/postgres-operator/postgres-entrypoint.sh /usr/local/bin
+COPY build/postgres-operator/postgres-liveness-check.sh /usr/local/bin
+COPY build/postgres-operator/postgres-readiness-check.sh /usr/local/bin
 COPY hack/tools/queries /opt/crunchy/conf
 
 RUN chgrp -R 0 /opt/crunchy/conf && chmod -R g=u opt/crunchy/conf

build/postgres-operator/init-entrypoint.sh

@@ -6,3 +6,6 @@ set -o xtrace
 CRUNCHY_BINDIR="/opt/crunchy"
 
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/pgbackrest" "${CRUNCHY_BINDIR}/bin/pgbackrest"
+install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/postgres-entrypoint.sh" "${CRUNCHY_BINDIR}/bin/postgres-entrypoint.sh"
+install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/postgres-liveness-check.sh" "${CRUNCHY_BINDIR}/bin/postgres-liveness-check.sh"
+install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/postgres-readiness-check.sh" "${CRUNCHY_BINDIR}/bin/postgres-readiness-check.sh"

build/postgres-operator/postgres-entrypoint.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# /pgdata/ is already mounted to the pg database container with rw permissions
+recovery_file='/pgdata/sleep-forever'
+if [[ -f ${recovery_file} ]]; then
+	set +o xtrace
+	echo "The $recovery_file file is detected, node entered an infinite sleep"
+	echo "If you want to exit from the infinite sleep, remove the $recovery_file file"
+	while [ -f "${recovery_file}" ]; do
+		sleep 3
+	done
+	exit 0
+fi
+
+exec "$@"

build/postgres-operator/postgres-liveness-check.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+PATRONI_PORT=8008
+PATRONI_HOST=localhost
+
+# /pgdata/ is already mounted to the pg database container with rw permissions
+recovery_file='/pgdata/sleep-forever'
+if [ -f "${recovery_file}" ]; then
+	set +o xtrace
+	echo "The $recovery_file file is detected, node entered an infinite sleep"
+	echo "If you want to exit from the infinite sleep, remove the $recovery_file file"
+	exit 0
+fi
+
+response=$(curl -s -o /dev/null -w "%{http_code}" -k "https://${PATRONI_HOST}:${PATRONI_PORT}/liveness")
+
+if [[ $response -eq 200 ]]; then
+	exit 0
+fi
+exit 1

build/postgres-operator/postgres-readiness-check.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+PATRONI_PORT=8008
+PATRONI_HOST=localhost
+
+response=$(curl -s -o /dev/null -w "%{http_code}" -k "https://${PATRONI_HOST}:${PATRONI_PORT}/readiness")
+
+if [[ $response -eq 200 ]]; then
+	exit 0
+fi
+exit 1

internal/patroni/reconcile.go

@@ -107,7 +107,7 @@ func InstancePod(ctx context.Context,
 	container.Command = []string{"patroni", configDirectory}
 	// K8SPG-708 introduces a new entrypoint script in the percona-docker repository.
 	if inCluster.CompareVersion("2.7.0") >= 0 {
-		container.Command = []string{"/usr/local/bin/entrypoint.sh", "patroni", configDirectory}
+		container.Command = []string{"/opt/crunchy/bin/postgres-entrypoint.sh", "patroni", configDirectory}
 	}
 
 	container.Env = append(container.Env,
@@ -178,7 +178,7 @@ func livenessProbe(cluster *v1beta1.PostgresCluster) corev1.ProbeHandler {
 	if cluster.CompareVersion("2.7.0") >= 0 {
 		return corev1.ProbeHandler{
 			Exec: &corev1.ExecAction{
-				Command: []string{"bash", "-c", "/usr/local/bin/postgres-liveness-check.sh"},
+				Command: []string{"bash", "-c", "/opt/crunchy/bin/postgres-liveness-check.sh"},
 			},
 		}
 	}
@@ -199,7 +199,7 @@ func readinessProbe(cluster *v1beta1.PostgresCluster) corev1.ProbeHandler {
 	if cluster.CompareVersion("2.7.0") >= 0 {
 		return corev1.ProbeHandler{
 			Exec: &corev1.ExecAction{
-				Command: []string{"bash", "-c", "/usr/local/bin/postgres-readiness-check.sh"},
+				Command: []string{"bash", "-c", "/opt/crunchy/bin/postgres-readiness-check.sh"},
 			},
 		}
 	}

internal/patroni/reconcile_test.go

@@ -123,7 +123,7 @@ func TestInstancePod(t *testing.T) {
 			expectedSpec: `
 containers:
 - command:
-  - /usr/local/bin/entrypoint.sh
+  - /opt/crunchy/bin/postgres-entrypoint.sh
   - patroni
   - /etc/patroni
   env:
@@ -159,7 +159,7 @@ containers:
       command:
       - bash
       - -c
-      - /usr/local/bin/postgres-liveness-check.sh
+      - /opt/crunchy/bin/postgres-liveness-check.sh
     failureThreshold: 3
     initialDelaySeconds: 3
     periodSeconds: 10
@@ -171,7 +171,7 @@ containers:
       command:
       - bash
       - -c
-      - /usr/local/bin/postgres-readiness-check.sh
+      - /opt/crunchy/bin/postgres-readiness-check.sh
     failureThreshold: 3
     initialDelaySeconds: 3
     periodSeconds: 10