Register nodes into orchestrator at upgrade time

Author: AMecea

hack/charts/mysql-operator/values.yaml

@@ -60,7 +60,7 @@ orchestrator:
   image: quay.io/presslabs/mysql-operator-orchestrator:latest
 
   # orchestrator user and password to manage MySQL clusters
-  topologyUser: sys_orchestrator
+  topologyUser: orchestrator
   topologyPassword:  # this is empty and will be random generated if not specified
 
   resources:
@@ -105,7 +105,7 @@ orchestrator:
 
   # key value map of orchestrator conf directives.
   # see: https://github.com/github/orchestrator/blob/master/conf/orchestrator-sample.conf.json
-  # the following keys are manages and thus cannot be ovewritten:
+  # the following keys are manages and thus cannot be overwritten:
   #   - ListenAddress :3000
   #   - MySQLTopologyCredentialsConfigFile /orchestrator/conf/orc-topology.cnf
   #   - BackendDB sqlite

pkg/controller/mysqlcluster/internal/upgrades/upgrades.go

@@ -33,6 +33,7 @@ import (
 	"github.com/presslabs/mysql-operator/pkg/internal/mysqlcluster"
 	"github.com/presslabs/mysql-operator/pkg/options"
 	orc "github.com/presslabs/mysql-operator/pkg/orchestrator"
+	"github.com/presslabs/mysql-operator/pkg/util/constants"
 )
 
 var log = logf.Log.WithName("upgrades.cluster")
@@ -69,14 +70,20 @@ func (u *upgrader) Run(ctx context.Context) error {
 		return err
 	}
 
+	// register old nodes in new orchestrator
+	for _, ns := range u.cluster.Status.Nodes {
+		if err = u.orcClient.Discover(ns.Name, constants.MysqlPort); err != nil {
+			log.Error(err, "failed to discover old hosts in new orchestrator - continue", "host", ns.Name)
+		}
+	}
+
+	// retrieve instances from orchestrator
 	insts, err := u.instancesFromOrc()
 	if err != nil {
 		return err
 	}
 
-	// more than 1 replica so there is the case when node 0 is slave so mark all other nodes as
-	// in maintenance except node 0.
-	// TODO: or set promotion rules
+	// more than 1 replica so there is the case when node 0 is slave so scale down to 1
 	if int(*sts.Spec.Replicas) > 1 {
 		one := int32(1)
 		sts.Spec.Replicas = &one