standardize port and use in clusterctl

Author: deitch

cmd/clusterctl/main.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/packethost/cluster-api-provider-packet/pkg/cloud/packet"
 	"github.com/packethost/cluster-api-provider-packet/pkg/cloud/packet/deployer"
+	"github.com/packethost/cluster-api-provider-packet/pkg/cloud/packet/util"
 	"k8s.io/klog"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/cmd"
 	"sigs.k8s.io/cluster-api/pkg/apis/cluster/common"
@@ -39,6 +40,7 @@ func main() {
 
 	// get a deployer, which is needed at various stages
 	deployer, err := deployer.New(deployer.Params{
+		Port:   util.ControlPort,
 		Client: client,
 	})
 	if err != nil {

cmd/manager/main.go

@@ -26,6 +26,7 @@ import (
 	"github.com/packethost/cluster-api-provider-packet/pkg/cloud/packet/actuators/machine"
 	"github.com/packethost/cluster-api-provider-packet/pkg/cloud/packet/actuators/machine/machineconfig"
 	"github.com/packethost/cluster-api-provider-packet/pkg/cloud/packet/deployer"
+	"github.com/packethost/cluster-api-provider-packet/pkg/cloud/packet/util"
 	"k8s.io/klog"
 	clusterapis "sigs.k8s.io/cluster-api/pkg/apis"
 	"sigs.k8s.io/cluster-api/pkg/apis/cluster/common"
@@ -38,10 +39,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
 )
 
-const (
-	controlPort = 6443
-)
-
 func main() {
 	klog.InitFlags(nil)
 
@@ -79,7 +76,7 @@ func main() {
 	// get a deployer, which is needed at various stages
 	deployer, err := deployer.New(deployer.Params{
 		Client: client,
-		Port:   controlPort,
+		Port:   util.ControlPort,
 	})
 	if err != nil {
 		klog.Fatalf(err.Error())

pkg/cloud/packet/util/util.go

@@ -15,6 +15,7 @@ const (
 	clusterIDTag  = "cluster-api-provider-packet:cluster-id"
 	MasterTag     = "kubernetes.io/role:master"
 	WorkerTag     = "kubernetes.io/role:node"
+	ControlPort   = 6443
 )
 
 func MachineProviderFromProviderConfig(providerConfig clusterv1.ProviderSpec) (*packetconfigv1.PacketMachineProviderConfig, error) {