Waiting from previous Pod

Author: mmontes11

main.go

@@ -10,11 +10,17 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 
+	"github.com/go-logr/logr"
 	"github.com/mariadb-operator/agent/pkg/filemanager"
 	"github.com/mariadb-operator/agent/pkg/logger"
 	"github.com/mariadb-operator/init/pkg/config"
 	mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1"
+	"github.com/mariadb-operator/mariadb-operator/pkg/pod"
+	"github.com/mariadb-operator/mariadb-operator/pkg/statefulset"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -32,13 +38,11 @@ var (
 
 type Env struct {
 	podName             string
-	podNamespace        string
 	mariadbRootPassword string
 }
 
 func main() {
-	flag.StringVar(&logLevel, "log-level", "info", "Log level to use, one of: "+
-		"debug, info, warn, error, dpanic, panic, fatal.")
+	flag.StringVar(&logLevel, "log-level", "info", "Log level to use, one of: debug, info, warn, error, dpanic, panic, fatal.")
 	flag.StringVar(&logTimeEncoder, "log-time-encoder", "epoch", "Log time encoder to use, one of: "+
 		"epoch, millis, nano, iso8601, rfc3339 or rfc3339nano")
 	flag.BoolVar(&logDev, "log-dev", false, "Enable development logs")
@@ -104,11 +108,30 @@ func main() {
 		logger.Error(err, "Error writing Galera config")
 		os.Exit(1)
 	}
-	logger.Info("Configuring bootstrap")
-	if err := fileManager.WriteConfigFile(config.BootstrapFileName, config.BootstrapFile); err != nil {
-		logger.Error(err, "Error writing bootstrap config")
+
+	idx, err := statefulset.PodIndex(env.podName)
+	if err != nil {
+		logger.Error(err, "error getting index from Pod", "pod", env.podName)
 		os.Exit(1)
 	}
+
+	if *idx == 0 {
+		logger.Info("Configuring bootstrap")
+		if err := fileManager.WriteConfigFile(config.BootstrapFileName, config.BootstrapFile); err != nil {
+			logger.Error(err, "Error writing bootstrap config")
+			os.Exit(1)
+		}
+	} else {
+		previousPodName, err := previousPodName(mdb, *idx)
+		if err != nil {
+			logger.Error(err, "error getting previous Pod")
+			os.Exit(1)
+		}
+		if err := waitForPreviousPod(ctx, mdb, previousPodName, clientset, logger); err != nil {
+			logger.Error(err, "error getting previous Pod", "pod", previousPodName)
+			os.Exit(1)
+		}
+	}
 	logger.Info("Init done")
 }
 
@@ -117,17 +140,12 @@ func env() (*Env, error) {
 	if podName == "" {
 		return nil, errors.New("environment variable 'POD_NAME' is required")
 	}
-	podNamespace := os.Getenv("POD_NAMESPACE")
-	if podNamespace == "" {
-		return nil, errors.New("environment variable 'POD_NAMESPACE' is required")
-	}
 	mariadbRootPassword := os.Getenv("MARIADB_ROOT_PASSWORD")
 	if mariadbRootPassword == "" {
 		return nil, errors.New("environment variable 'MARIADB_ROOT_PASSWORD' is required")
 	}
 	return &Env{
 		podName:             podName,
-		podNamespace:        podNamespace,
 		mariadbRootPassword: mariadbRootPassword,
 	}, nil
 }
@@ -141,11 +159,7 @@ func restConfig() (*rest.Config, error) {
 
 func mariadb(ctx context.Context, name, namespace string, clientset *kubernetes.Clientset) (*mariadbv1alpha1.MariaDB, error) {
 	path := fmt.Sprintf("/apis/mariadb.mmontes.io/v1alpha1/namespaces/%s/mariadbs/%s", namespace, name)
-	bytes, err := clientset.
-		RESTClient().
-		Get().
-		AbsPath(path).
-		DoRaw(ctx)
+	bytes, err := clientset.RESTClient().Get().AbsPath(path).DoRaw(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("error requesting '%s' MariaDB in namespace '%s': %v", name, namespace, err)
 	}
@@ -155,3 +169,27 @@ func mariadb(ctx context.Context, name, namespace string, clientset *kubernetes.
 	}
 	return &mdb, nil
 }
+
+func previousPodName(mariadb *mariadbv1alpha1.MariaDB, podIndex int) (string, error) {
+	if podIndex == 0 {
+		return "", fmt.Errorf("Pod '%s' is the first Pod", statefulset.PodName(mariadb.ObjectMeta, podIndex))
+	}
+	previousPodIndex := podIndex - 1
+	return statefulset.PodName(mariadb.ObjectMeta, previousPodIndex), nil
+}
+
+func waitForPreviousPod(ctx context.Context, mariadb *mariadbv1alpha1.MariaDB, previousPodName string, clientset *kubernetes.Clientset,
+	logger logr.Logger) error {
+	return wait.PollImmediateUntilWithContext(ctx, 1*time.Second, func(context.Context) (bool, error) {
+		previousPod, err := clientset.CoreV1().Pods(mariadb.Namespace).Get(ctx, previousPodName, metav1.GetOptions{})
+		if err != nil {
+			return false, nil
+		}
+		if !pod.PodReady(previousPod) {
+			logger.V(1).Info("Previous Pod not ready", "pod", previousPodName)
+			return false, nil
+		}
+		logger.V(1).Info("Previous Pod ready", "pod", previousPodName)
+		return true, nil
+	})
+}

make/deploy.mk

@@ -1,5 +1,4 @@
-CLUSTER ?= init
-CLUSTER_OPERATOR ?= mdb
+CLUSTER ?= mdb
 
 ##@ Docker
 
@@ -30,31 +29,10 @@ docker-inspect: ## Inspect docker image.
 
 .PHONY: docker-load
 docker-load: ## Load docker image in KIND.
-	kind load docker-image --name ${CLUSTER_OPERATOR} ${IMG}
+	kind load docker-image --name ${CLUSTER} ${IMG}
 
 ##@ Cluster
 
-KIND_CONFIG ?= hack/config/kind.yaml
-KIND_IMAGE ?= kindest/node:v1.26.0
-
-.PHONY: cluster
-cluster: kind ## Create the kind cluster.
-	$(KIND) create cluster --name $(CLUSTER) --config $(KIND_CONFIG)
-
-.PHONY: cluster-delete
-cluster-delete: kind ## Delete the kind cluster.
-	$(KIND) delete cluster --name $(CLUSTER)
-
 .PHONY: cluster-ctx
 cluster-ctx: ## Sets cluster context.
 	@kubectl config use-context kind-$(CLUSTER)
-
-##@ MariaDB
-
-.PHONY: mariadb
-mariadb: ## Create a MariaDB galera in kind.
-	@./hack/mariadb.sh
-
-.PHONY: mariadb-delete
-mariadb-delete: ## Delete the MariaDB galera cluster.
-	@./hack/mariadb-delete.sh