mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-10-10 17:48:27 -04:00
Rename coordinator to bootstrapper and rename roles
This commit is contained in:
katexochen
Paul Meyer
parent
3280ed200c
commit
916e5d6b55
191 changed files with 1763 additions and 2030 deletions
|
|
@ -17,7 +17,7 @@ import (
|
|||
"math/big"
|
||||
"time"
|
||||
|
||||
"github.com/edgelesssys/constellation/coordinator/util"
|
||||
"github.com/edgelesssys/constellation/bootstrapper/util"
|
||||
"github.com/edgelesssys/constellation/internal/constants"
|
||||
"github.com/edgelesssys/constellation/internal/oid"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import (
|
|||
"net"
|
||||
"strconv"
|
||||
|
||||
"github.com/edgelesssys/constellation/coordinator/role"
|
||||
"github.com/edgelesssys/constellation/bootstrapper/role"
|
||||
"github.com/edgelesssys/constellation/internal/constants"
|
||||
)
|
||||
|
||||
|
|
@ -48,10 +48,9 @@ func InitServerEndpoints(ctx context.Context, lister InstanceLister) ([]string,
|
|||
}
|
||||
initServerEndpoints := []string{}
|
||||
for _, instance := range instances {
|
||||
// check if role of instance is "Coordinator"
|
||||
if instance.Role == role.Coordinator {
|
||||
if instance.Role == role.ControlPlane {
|
||||
for _, ip := range instance.PrivateIPs {
|
||||
initServerEndpoints = append(initServerEndpoints, net.JoinHostPort(ip, strconv.Itoa(constants.CoordinatorPort)))
|
||||
initServerEndpoints = append(initServerEndpoints, net.JoinHostPort(ip, strconv.Itoa(constants.BootstrapperPort)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,11 +169,11 @@ func Default() *Config {
|
|||
StateDiskSizeGB: 30,
|
||||
IngressFirewall: Firewall{
|
||||
{
|
||||
Name: "coordinator",
|
||||
Description: "Coordinator default port",
|
||||
Name: "bootstrapper",
|
||||
Description: "bootstrapper default port",
|
||||
Protocol: "tcp",
|
||||
IPRange: "0.0.0.0/0",
|
||||
FromPort: constants.CoordinatorPort,
|
||||
FromPort: constants.BootstrapperPort,
|
||||
},
|
||||
{
|
||||
Name: "wireguard",
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@ const (
|
|||
// KMSATLSPort is the port the KMS aTLS server listens on.
|
||||
KMSATLSPort = 9001
|
||||
// KMSNodePort is the aTLS port exposed as a NodePort.
|
||||
KMSNodePort = 30091
|
||||
CoordinatorPort = 9000
|
||||
EnclaveSSHPort = 2222
|
||||
SSHPort = 22
|
||||
WireguardPort = 51820
|
||||
NVMEOverTCPPort = 8009
|
||||
KMSNodePort = 30091
|
||||
BootstrapperPort = 9000
|
||||
EnclaveSSHPort = 2222
|
||||
SSHPort = 22
|
||||
WireguardPort = 51820
|
||||
NVMEOverTCPPort = 8009
|
||||
// Default NodePort Range
|
||||
// https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
|
||||
NodePortFrom = 30000
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package ssh
|
||||
|
||||
import (
|
||||
"github.com/edgelesssys/constellation/coordinator/initproto"
|
||||
"github.com/edgelesssys/constellation/bootstrapper/initproto"
|
||||
)
|
||||
|
||||
// FromProtoSlice converts a SSH UserKey definition from pubproto to the Go flavor.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import (
|
|||
"net"
|
||||
"testing"
|
||||
|
||||
"github.com/edgelesssys/constellation/coordinator/initproto"
|
||||
"github.com/edgelesssys/constellation/bootstrapper/initproto"
|
||||
"github.com/edgelesssys/constellation/internal/atls"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
|
|
|||
|
|
@ -10,35 +10,35 @@ type ConstellationState struct {
|
|||
UID string `json:"uid,omitempty"`
|
||||
CloudProvider string `json:"cloudprovider,omitempty"`
|
||||
|
||||
GCPNodes cloudtypes.Instances `json:"gcpnodes,omitempty"`
|
||||
GCPCoordinators cloudtypes.Instances `json:"gcpcoordinators,omitempty"`
|
||||
GCPNodeInstanceGroup string `json:"gcpnodeinstancegroup,omitempty"`
|
||||
GCPCoordinatorInstanceGroup string `json:"gcpcoordinatorinstancegroup,omitempty"`
|
||||
GCPNodeInstanceTemplate string `json:"gcpnodeinstancetemplate,omitempty"`
|
||||
GCPCoordinatorInstanceTemplate string `json:"gcpcoordinatorinstancetemplate,omitempty"`
|
||||
GCPNetwork string `json:"gcpnetwork,omitempty"`
|
||||
GCPSubnetwork string `json:"gcpsubnetwork,omitempty"`
|
||||
GCPFirewalls []string `json:"gcpfirewalls,omitempty"`
|
||||
GCPBackendService string `json:"gcpbackendservice,omitempty"`
|
||||
GCPHealthCheck string `json:"gcphealthcheck,omitempty"`
|
||||
GCPForwardingRule string `json:"gcpforwardingrule,omitempty"`
|
||||
GCPProject string `json:"gcpproject,omitempty"`
|
||||
GCPZone string `json:"gcpzone,omitempty"`
|
||||
GCPRegion string `json:"gcpregion,omitempty"`
|
||||
GCPServiceAccount string `json:"gcpserviceaccount,omitempty"`
|
||||
GCPWorkers cloudtypes.Instances `json:"gcpworkers,omitempty"`
|
||||
GCPControlPlanes cloudtypes.Instances `json:"gcpcontrolplanes,omitempty"`
|
||||
GCPWorkerInstanceGroup string `json:"gcpworkerinstancegroup,omitempty"`
|
||||
GCPControlPlaneInstanceGroup string `json:"gcpcontrolplaneinstancegroup,omitempty"`
|
||||
GCPWorkerInstanceTemplate string `json:"gcpworkerinstancetemplate,omitempty"`
|
||||
GCPControlPlaneInstanceTemplate string `json:"gcpcontrolplaneinstancetemplate,omitempty"`
|
||||
GCPNetwork string `json:"gcpnetwork,omitempty"`
|
||||
GCPSubnetwork string `json:"gcpsubnetwork,omitempty"`
|
||||
GCPFirewalls []string `json:"gcpfirewalls,omitempty"`
|
||||
GCPBackendService string `json:"gcpbackendservice,omitempty"`
|
||||
GCPHealthCheck string `json:"gcphealthcheck,omitempty"`
|
||||
GCPForwardingRule string `json:"gcpforwardingrule,omitempty"`
|
||||
GCPProject string `json:"gcpproject,omitempty"`
|
||||
GCPZone string `json:"gcpzone,omitempty"`
|
||||
GCPRegion string `json:"gcpregion,omitempty"`
|
||||
GCPServiceAccount string `json:"gcpserviceaccount,omitempty"`
|
||||
|
||||
AzureNodes cloudtypes.Instances `json:"azurenodes,omitempty"`
|
||||
AzureCoordinators cloudtypes.Instances `json:"azurecoordinators,omitempty"`
|
||||
AzureResourceGroup string `json:"azureresourcegroup,omitempty"`
|
||||
AzureLocation string `json:"azurelocation,omitempty"`
|
||||
AzureSubscription string `json:"azuresubscription,omitempty"`
|
||||
AzureTenant string `json:"azuretenant,omitempty"`
|
||||
AzureSubnet string `json:"azuresubnet,omitempty"`
|
||||
AzureNetworkSecurityGroup string `json:"azurenetworksecuritygroup,omitempty"`
|
||||
AzureNodesScaleSet string `json:"azurenodesscaleset,omitempty"`
|
||||
AzureCoordinatorsScaleSet string `json:"azurecoordinatorsscaleset,omitempty"`
|
||||
AzureADAppObjectID string `json:"azureadappobjectid,omitempty"`
|
||||
AzureWorkers cloudtypes.Instances `json:"azureworkers,omitempty"`
|
||||
AzureControlPlane cloudtypes.Instances `json:"azurecontrolplanes,omitempty"`
|
||||
AzureResourceGroup string `json:"azureresourcegroup,omitempty"`
|
||||
AzureLocation string `json:"azurelocation,omitempty"`
|
||||
AzureSubscription string `json:"azuresubscription,omitempty"`
|
||||
AzureTenant string `json:"azuretenant,omitempty"`
|
||||
AzureSubnet string `json:"azuresubnet,omitempty"`
|
||||
AzureNetworkSecurityGroup string `json:"azurenetworksecuritygroup,omitempty"`
|
||||
AzureWorkersScaleSet string `json:"azureworkersscaleset,omitempty"`
|
||||
AzureControlPlanesScaleSet string `json:"azurecontrolplanesscaleset,omitempty"`
|
||||
AzureADAppObjectID string `json:"azureadappobjectid,omitempty"`
|
||||
|
||||
QEMUNodes cloudtypes.Instances `json:"qemunodes,omitempty"`
|
||||
QEMUCoordinators cloudtypes.Instances `json:"qemucoordinators,omitempty"`
|
||||
QEMUWorkers cloudtypes.Instances `json:"qemuworkers,omitempty"`
|
||||
QEMUControlPlane cloudtypes.Instances `json:"qemucontrolplanes,omitempty"`
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue