Getting env

Author: mmontes11

main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"flag"
 	"fmt"
 	"log"
@@ -20,30 +21,31 @@ import (
 )
 
 var (
-	logLevel       string
-	logTimeEncoder string
-	logDev         bool
-
-	configDir string
-	stateDir  string
-
+	logLevel         string
+	logTimeEncoder   string
+	logDev           bool
+	configDir        string
+	stateDir         string
 	mariadbName      string
 	mariadbNamespace string
 )
 
+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(&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")
-
 	flag.StringVar(&configDir, "config-dir", "/etc/mysql/mariadb.conf.d", "The directory that contains MariaDB configuration files")
 	flag.StringVar(&stateDir, "state-dir", "/var/lib/mysql", "The directory that contains MariaDB state files")
-
 	flag.StringVar(&mariadbName, "mariadb-name", "", "The name of the MariaDB to be initialized")
 	flag.StringVar(&mariadbNamespace, "mariadb-namespace", "", "The namespace of the MariaDB to be initialized")
-
 	flag.Parse()
 
 	ctx, cancel := signal.NotifyContext(context.Background(), []os.Signal{
@@ -61,10 +63,16 @@ func main() {
 		logger.WithDevelopment(logDev),
 	)
 	if err != nil {
-		log.Fatalf("error creating logger: %v", err)
+		log.Fatalf("Error creating logger: %v", err)
 	}
 	logger.Info("Staring init")
 
+	env, err := env()
+	if err != nil {
+		logger.Error(err, "Missing environment variables")
+		os.Exit(1)
+	}
+
 	restConfig, err := restConfig()
 	if err != nil {
 		logger.Error(err, "Error getting Kubernetes config")
@@ -86,14 +94,14 @@ func main() {
 		logger.Error(err, "Error creating file manager")
 		os.Exit(1)
 	}
-	configBytes, err := config.NewConfigFile(mdb).Marshal()
+	configBytes, err := config.NewConfigFile(mdb).Marshal(env.podName, env.mariadbRootPassword)
 	if err != nil {
-		logger.Error(err, "Error getting galera config")
+		logger.Error(err, "Error getting Galera config")
 		os.Exit(1)
 	}
 	logger.Info("Configuring Galera")
 	if err := fileManager.WriteConfigFile(config.ConfigFileName, configBytes); err != nil {
-		logger.Error(err, "Error writing galera config")
+		logger.Error(err, "Error writing Galera config")
 		os.Exit(1)
 	}
 	logger.Info("Configuring bootstrap")
@@ -104,6 +112,26 @@ func main() {
 	logger.Info("Init done")
 }
 
+func env() (*Env, error) {
+	podName := os.Getenv("POD_NAME")
+	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
+}
+
 func restConfig() (*rest.Config, error) {
 	if kubeconfig := os.Getenv("KUBECONFIG"); kubeconfig != "" {
 		return clientcmd.BuildConfigFromFlags("", kubeconfig)

make/dev.mk

@@ -27,7 +27,8 @@ dir: ## Create config and state directories for local development.
 	mkdir -p mariadb/state
 
 export KUBECONFIG ?= $(HOME)/.kube/config
-export HOSTNAME ?= mariadb-galera-0
+export POD_NAME ?= mariadb-galera-0
+export POD_NAMESPACE ?= default
 export MARIADB_ROOT_PASSWORD ?= mariadb
 RUN_FLAGS ?= --log-dev --log-level=debug --log-time-encoder=iso8601 --mariadb-name=mariadb-galera --mariadb-namespace=default --config-dir=mariadb/config --state-dir=mariadb/state
 .PHONY: run

pkg/config/config.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 	"text/template"
 
@@ -32,7 +31,7 @@ func NewConfigFile(mariadb *mariadbv1alpha1.MariaDB) *ConfigFile {
 	}
 }
 
-func (c *ConfigFile) Marshal() ([]byte, error) {
+func (c *ConfigFile) Marshal(podName, mariadbRootPassword string) ([]byte, error) {
 	tpl := createTpl("galera", `[mysqld]
 bind-address=0.0.0.0
 default_storage_engine=InnoDB
@@ -63,14 +62,6 @@ wsrep_sst_auth="root:{{ .RootPassword }}"
 	if err != nil {
 		return nil, fmt.Errorf("error getting SST: %v", err)
 	}
-	hostname := os.Getenv("HOSTNAME")
-	if hostname == "" {
-		return nil, errors.New("HOSTNAME environment variable not found")
-	}
-	rootPassword := os.Getenv("MARIADB_ROOT_PASSWORD")
-	if rootPassword == "" {
-		return nil, errors.New("MARIADB_ROOT_PASSWORD environment variable not found")
-	}
 
 	err = tpl.Execute(buf, struct {
 		ClusterAddress string
@@ -83,14 +74,14 @@ wsrep_sst_auth="root:{{ .RootPassword }}"
 	}{
 		ClusterAddress: clusterAddr,
 		Threads:        c.mariadb.Spec.Galera.ReplicaThreads,
-		Pod:            hostname,
+		Pod:            podName,
 		Service: statefulset.ServiceFQDNWithService(
 			c.mariadb.ObjectMeta,
 			ctrlresources.InternalServiceKey(c.mariadb).Name,
 		),
 		SST:          sst,
 		SSTAuth:      c.mariadb.Spec.Galera.SST == mariadbv1alpha1.SSTMariaBackup || c.mariadb.Spec.Galera.SST == mariadbv1alpha1.SSTMysqldump,
-		RootPassword: rootPassword,
+		RootPassword: mariadbRootPassword,
 	})
 	if err != nil {
 		return nil, err

pkg/config/config_test.go

@@ -9,14 +9,15 @@ import (
 
 func TestConfigMarshal(t *testing.T) {
 	tests := []struct {
-		name       string
-		mariadb    *mariadbv1alpha1.MariaDB
-		env        map[string]string
-		wantConfig string
-		wantErr    bool
+		name                string
+		mariadb             *mariadbv1alpha1.MariaDB
+		podName             string
+		mariadbRootPassword string
+		wantConfig          string
+		wantErr             bool
 	}{
 		{
-			name: "no env",
+			name: "no replicas",
 			mariadb: &mariadbv1alpha1.MariaDB{
 				ObjectMeta: v1.ObjectMeta{
 					Name:      "mariadb-galera",
@@ -27,12 +28,13 @@ func TestConfigMarshal(t *testing.T) {
 						SST:            mariadbv1alpha1.SSTRsync,
 						ReplicaThreads: 1,
 					},
-					Replicas: 3,
+					Replicas: 0,
 				},
 			},
-			env:        map[string]string{},
-			wantConfig: "",
-			wantErr:    true,
+			podName:             "mariadb-galera-0",
+			mariadbRootPassword: "mariadb",
+			wantConfig:          "",
+			wantErr:             true,
 		},
 		{
 			name: "rsync",
@@ -49,10 +51,8 @@ func TestConfigMarshal(t *testing.T) {
 					Replicas: 3,
 				},
 			},
-			env: map[string]string{
-				"HOSTNAME":              "mariadb-galera-0",
-				"MARIADB_ROOT_PASSWORD": "foo",
-			},
+			podName:             "mariadb-galera-0",
+			mariadbRootPassword: "mariadb",
 			//nolint:lll
 			wantConfig: `[mysqld]
 bind-address=0.0.0.0
@@ -89,10 +89,8 @@ wsrep_sst_method="rsync"
 					Replicas: 3,
 				},
 			},
-			env: map[string]string{
-				"HOSTNAME":              "mariadb-galera-1",
-				"MARIADB_ROOT_PASSWORD": "foo",
-			},
+			podName:             "mariadb-galera-1",
+			mariadbRootPassword: "mariadb",
 			//nolint:lll
 			wantConfig: `[mysqld]
 bind-address=0.0.0.0
@@ -111,19 +109,15 @@ wsrep_slave_threads=2
 wsrep_node_address="mariadb-galera-1.mariadb-galera-internal.default.svc.cluster.local"
 wsrep_node_name="mariadb-galera-1"
 wsrep_sst_method="mariabackup"
-wsrep_sst_auth="root:foo"
+wsrep_sst_auth="root:mariadb"
 `,
 			wantErr: false,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			config := NewConfigFile(tt.mariadb)
-			for k, v := range tt.env {
-				t.Setenv(k, v)
-			}
-
-			bytes, err := config.Marshal()
+			bytes, err := config.Marshal(tt.podName, tt.mariadbRootPassword)
 			if tt.wantErr && err == nil {
 				t.Fatal("error expected, got nil")
 			}