K8SPS-285: Add startup probe for router (#360)

Co-authored-by: Viacheslav Sarzhan <[email protected]>

Author: egegunes

api/v1alpha1/perconaservermysql_types.go

@@ -508,6 +508,22 @@ func (cr *PerconaServerMySQL) CheckNSetDefaults(ctx context.Context, serverVersi
 		cr.Spec.Proxy.Router = new(MySQLRouterSpec)
 	}
 
+	if cr.Spec.Proxy.Router.StartupProbe.InitialDelaySeconds == 0 {
+		cr.Spec.Proxy.Router.StartupProbe.InitialDelaySeconds = 5
+	}
+	if cr.Spec.Proxy.Router.StartupProbe.PeriodSeconds == 0 {
+		cr.Spec.Proxy.Router.StartupProbe.PeriodSeconds = 5
+	}
+	if cr.Spec.Proxy.Router.StartupProbe.FailureThreshold == 0 {
+		cr.Spec.Proxy.Router.StartupProbe.FailureThreshold = 1
+	}
+	if cr.Spec.Proxy.Router.StartupProbe.SuccessThreshold == 0 {
+		cr.Spec.Proxy.Router.StartupProbe.SuccessThreshold = 1
+	}
+	if cr.Spec.Proxy.Router.StartupProbe.TimeoutSeconds == 0 {
+		cr.Spec.Proxy.Router.StartupProbe.TimeoutSeconds = 3
+	}
+
 	if cr.Spec.Proxy.Router.ReadinessProbe.PeriodSeconds == 0 {
 		cr.Spec.Proxy.Router.ReadinessProbe.PeriodSeconds = 5
 	}

build/Dockerfile

@@ -88,6 +88,7 @@ COPY build/ps-entrypoint.sh /opt/percona-server-mysql-operator/ps-entrypoint.sh
 COPY build/heartbeat-entrypoint.sh /opt/percona-server-mysql-operator/heartbeat-entrypoint.sh
 COPY build/router-entrypoint.sh /opt/percona-server-mysql-operator/router-entrypoint.sh
 COPY build/router_readiness_check.sh /opt/percona-server-mysql-operator/router_readiness_check.sh
+COPY build/router_startup_check.sh /opt/percona-server-mysql-operator/router_startup_check.sh
 COPY build/orc-entrypoint.sh /opt/percona-server-mysql-operator/orc-entrypoint.sh
 COPY build/orchestrator.conf.json /opt/percona-server-mysql-operator/orchestrator.conf.json
 COPY build/ps-init-entrypoint.sh /opt/percona-server-mysql-operator/ps-init-entrypoint.sh

build/ps-init-entrypoint.sh

@@ -14,6 +14,7 @@ install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "${OPERATORDIR}/orchestrator.conf
 
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "${OPERATORDIR}/router-entrypoint.sh" "${BINDIR}/router-entrypoint.sh"
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "${OPERATORDIR}/router_readiness_check.sh" "${BINDIR}/router_readiness_check.sh"
+install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "${OPERATORDIR}/router_startup_check.sh" "${BINDIR}/router_startup_check.sh"
 
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "${OPERATORDIR}/bootstrap" "${BINDIR}/bootstrap"
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "${OPERATORDIR}/healthcheck" "${BINDIR}/healthcheck"

build/router_startup_check.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+OPERATOR_PASS=$(</etc/mysql/mysql-users-secret/operator)
+
+if [[ $(curl -k -s -u operator:"${OPERATOR_PASS}" -o /dev/null -w %{http_code} https://localhost:8443/api/20190715/router/status) != 200 ]]; then
+	echo "Router is not ready"
+fi

e2e-tests/tests/gr-bootstrap/02-assert.yaml

@@ -0,0 +1,10 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 30
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: 02-write-data
+data:
+  data: "100500"

e2e-tests/tests/gr-bootstrap/02-write-data.yaml

@@ -14,3 +14,7 @@ commands:
       run_mysql \
       	"INSERT myDB.myTable (id) VALUES (100500)" \
       	"-h $(get_mysql_router_service $(get_cluster_name)) -P 6446 -uroot -proot_password"
+
+      data=$(run_mysql "SELECT * FROM myDB.myTable" "-h $(get_mysql_router_service $(get_cluster_name)) -P 6446 -uroot -proot_password")
+
+      kubectl create configmap -n "${NAMESPACE}" 02-write-data --from-literal=data="${data}"

pkg/router/router.go

@@ -304,6 +304,7 @@ func routerContainer(cr *apiv1alpha1.PerconaServerMySQL) corev1.Container {
 		TerminationMessagePath:   "/dev/termination-log",
 		TerminationMessagePolicy: corev1.TerminationMessageReadFile,
 		SecurityContext:          spec.ContainerSecurityContext,
+		StartupProbe:             k8s.ExecProbe(spec.StartupProbe, []string{"/opt/percona/router_startup_check.sh"}),
 		ReadinessProbe:           k8s.ExecProbe(spec.ReadinessProbe, []string{"/opt/percona/router_readiness_check.sh"}),
 	}
 }