From 355d3b8256d6eb5a4e642e2873264a31eb6b4fa5 Mon Sep 17 00:00:00 2001
From: Adrian Brennig <adrian@dex.blue>
Date: Fri, 14 Dec 2018 15:20:41 +0100
Subject: [PATCH 1/2] Add namespace to dns name in REPLICATION_GROUP_SEEDS
environment variable Signed-off-by: Adrian Brennig <mail@adrian-brennig.de>
---
pkg/resources/statefulsets/statefulset.go | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkg/resources/statefulsets/statefulset.go b/pkg/resources/statefulsets/statefulset.go
index ebfea7a10..b66ec3f82 100644
--- a/pkg/resources/statefulsets/statefulset.go
+++ b/pkg/resources/statefulsets/statefulset.go
@@ -20,19 +20,18 @@ import (
"strconv"
"strings"
- apps "k8s.io/api/apps/v1beta1"
- "k8s.io/api/core/v1"
- corev1 "k8s.io/api/core/v1"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/runtime/schema"
- "k8s.io/apimachinery/pkg/util/intstr"
-
"github.com/oracle/mysql-operator/pkg/apis/mysql/v1alpha1"
"github.com/oracle/mysql-operator/pkg/constants"
agentopts "github.com/oracle/mysql-operator/pkg/options/agent"
operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
"github.com/oracle/mysql-operator/pkg/resources/secrets"
"github.com/oracle/mysql-operator/pkg/version"
+ apps "k8s.io/api/apps/v1beta1"
+ "k8s.io/api/core/v1"
+ corev1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/runtime/schema"
+ "k8s.io/apimachinery/pkg/util/intstr"
)
const (
@@ -147,11 +146,12 @@ func mysqlRootPassword(cluster *v1alpha1.Cluster) v1.EnvVar {
}
}
-func getReplicationGroupSeeds(name string, members int) string {
+func getReplicationGroupSeeds(name string, namespace string, members int) string {
seeds := []string{}
for i := 0; i < members; i++ {
- seeds = append(seeds, fmt.Sprintf("%[1]s-%[2]d.%[1]s:%[3]d", name, i, replicationGroupPort))
+ seeds = append(seeds, fmt.Sprintf("%[1]s-%[2]d.%[1]s.%[3]s:%[4]d", name, i, namespace, replicationGroupPort))
}
+ fmt.Println("generated seeds:", strings.Join(seeds, ","))
return strings.Join(seeds, ",")
}
@@ -232,7 +232,7 @@ func mysqlAgentContainer(cluster *v1alpha1.Cluster, mysqlAgentImage string, root
agentVersion = version
}
- replicationGroupSeeds := getReplicationGroupSeeds(cluster.Name, members)
+ replicationGroupSeeds := getReplicationGroupSeeds(cluster.Name, cluster.Namespace, members)
var resourceLimits corev1.ResourceRequirements
if cluster.Spec.Resources != nil && cluster.Spec.Resources.Agent != nil {
From 679cdb324414d40310983ff690946553e27fd06b Mon Sep 17 00:00:00 2001
From: Adrian Brennig <mail@adrian-brennig.de>
Date: Sat, 15 Dec 2018 14:04:43 +0100
Subject: [PATCH 2/2] - Restore import order - remove Println in
getReplicationGroupSeeds Signed-off-by: Adrian Brennig
<mail@adrian-brennig.de>
---
pkg/resources/statefulsets/statefulset.go | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkg/resources/statefulsets/statefulset.go b/pkg/resources/statefulsets/statefulset.go
index b66ec3f82..02f026103 100644
--- a/pkg/resources/statefulsets/statefulset.go
+++ b/pkg/resources/statefulsets/statefulset.go
@@ -20,18 +20,19 @@ import (
"strconv"
"strings"
- "github.com/oracle/mysql-operator/pkg/apis/mysql/v1alpha1"
- "github.com/oracle/mysql-operator/pkg/constants"
- agentopts "github.com/oracle/mysql-operator/pkg/options/agent"
- operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
- "github.com/oracle/mysql-operator/pkg/resources/secrets"
- "github.com/oracle/mysql-operator/pkg/version"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/api/core/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/intstr"
+
+ "github.com/oracle/mysql-operator/pkg/apis/mysql/v1alpha1"
+ "github.com/oracle/mysql-operator/pkg/constants"
+ agentopts "github.com/oracle/mysql-operator/pkg/options/agent"
+ operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
+ "github.com/oracle/mysql-operator/pkg/resources/secrets"
+ "github.com/oracle/mysql-operator/pkg/version"
)
const (
@@ -151,7 +152,6 @@ func getReplicationGroupSeeds(name string, namespace string, members int) string
for i := 0; i < members; i++ {
seeds = append(seeds, fmt.Sprintf("%[1]s-%[2]d.%[1]s.%[3]s:%[4]d", name, i, namespace, replicationGroupPort))
}
- fmt.Println("generated seeds:", strings.Join(seeds, ","))
return strings.Join(seeds, ",")
}