Rebase

pkg/apis/navigator/types.go

@@ -43,7 +43,7 @@ type CassandraClusterNodePool struct {
 	Datacenter    string
 	Resources     v1.ResourceRequirements
 	SchedulerName string
-	Seeds         *int64
+	Seeds         *int32
 }
 
 type CassandraClusterStatus struct {

pkg/apis/navigator/v1alpha1/defaults.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/jetstack/navigator/pkg/util"
+	"github.com/jetstack/navigator/pkg/util/ptr"
 )
 
 const (
@@ -25,6 +25,6 @@ func SetDefaults_CassandraClusterNodePool(np *CassandraClusterNodePool) {
 
 	// default to 1 seed if not specified
 	if np.Seeds == nil {
-		np.Seeds = util.Int64Ptr(1)
+		np.Seeds = ptr.Int32(1)
 	}
 }

pkg/apis/navigator/v1alpha1/types.go

@@ -78,7 +78,7 @@ type CassandraClusterNodePool struct {
 	// Seeds specifies the number of seed nodes to allocate in this nodepool. By
 	// default, 1 is selected.
 	// +optional
-	Seeds *int64 `json:"seeds,omitempty"`
+	Seeds *int32 `json:"seeds,omitempty"`
 }
 
 type CassandraClusterStatus struct {

pkg/apis/navigator/v1alpha1/zz_generated.conversion.go

@@ -173,7 +173,7 @@ func autoConvert_v1alpha1_CassandraClusterNodePool_To_navigator_CassandraCluster
 	out.Datacenter = in.Datacenter
 	out.Resources = in.Resources
 	out.SchedulerName = in.SchedulerName
-	out.Seeds = (*int64)(unsafe.Pointer(in.Seeds))
+	out.Seeds = (*int32)(unsafe.Pointer(in.Seeds))
 	return nil
 }
 
@@ -193,7 +193,7 @@ func autoConvert_navigator_CassandraClusterNodePool_To_v1alpha1_CassandraCluster
 	out.Datacenter = in.Datacenter
 	out.Resources = in.Resources
 	out.SchedulerName = in.SchedulerName
-	out.Seeds = (*int64)(unsafe.Pointer(in.Seeds))
+	out.Seeds = (*int32)(unsafe.Pointer(in.Seeds))
 	return nil
 }
 

pkg/apis/navigator/v1alpha1/zz_generated.deepcopy.go

@@ -105,7 +105,7 @@ func (in *CassandraClusterNodePool) DeepCopyInto(out *CassandraClusterNodePool)
 		if *in == nil {
 			*out = nil
 		} else {
-			*out = new(int64)
+			*out = new(int32)
 			**out = **in
 		}
 	}

pkg/apis/navigator/zz_generated.deepcopy.go

@@ -105,7 +105,7 @@ func (in *CassandraClusterNodePool) DeepCopyInto(out *CassandraClusterNodePool)
 		if *in == nil {
 			*out = nil
 		} else {
-			*out = new(int64)
+			*out = new(int32)
 			**out = **in
 		}
 	}

pkg/controllers/cassandra/seedlabeller/control.go

@@ -47,7 +47,7 @@ func (c *defaultSeedLabeller) labelSeedNodes(
 	np *v1alpha1.CassandraClusterNodePool,
 	set *appsv1beta1.StatefulSet,
 ) error {
-	for i := int64(0); i < np.Replicas; i++ {
+	for i := int32(0); i < np.Replicas; i++ {
 		pod, err := c.pods.Pods(cluster.Namespace).Get(fmt.Sprintf("%s-%d", set.Name, i))
 		if err != nil {
 			glog.Warningf("Couldn't get stateful set pod: %v", err)
@@ -59,11 +59,11 @@ func (c *defaultSeedLabeller) labelSeedNodes(
 
 		desiredLabel := ""
 		if isSeed {
-			desiredLabel = seedprovider.SeedLabelValue
+			desiredLabel = service.SeedLabelValue
 		}
 
 		labels := pod.Labels
-		value := labels[seedprovider.SeedLabelKey]
+		value := labels[service.SeedLabelKey]
 		if value == desiredLabel {
 			continue
 		}
@@ -72,9 +72,9 @@ func (c *defaultSeedLabeller) labelSeedNodes(
 		}
 
 		if isSeed {
-			labels[seedprovider.SeedLabelKey] = desiredLabel
+			labels[service.SeedLabelKey] = desiredLabel
 		} else {
-			delete(labels, seedprovider.SeedLabelKey)
+			delete(labels, service.SeedLabelKey)
 		}
 
 		podCopy := pod.DeepCopy()

pkg/util/util.go

@@ -11,7 +11,3 @@ func CalculateQuorum(num int32) int32 {
 	}
 	return (num / 2) + 1
 }
-
-func Int64Ptr(i int64) *int64 {
-	return &i
-}