Skip to content

[ca] In the CA server, ensure we always have a cluster ID #2340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cyli merged 1 commit into from
Aug 3, 2017
Merged

[ca] In the CA server, ensure we always have a cluster ID #2340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions ca/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func NewServer(store *store.MemoryStore, securityConfig *SecurityConfig) *Server
started: make(chan struct{}),
reconciliationRetryInterval: defaultReconciliationRetryInterval,
rootReconciliationRetryInterval: defaultRootReconciliationInterval,
// clusterID will be set on every call to Run
clusterID: securityConfig.ClientTLSCreds.Organization(),
}
}

Expand Down Expand Up @@ -440,29 +440,28 @@ func (s *Server) Run(ctx context.Context) error {
var (
nodes []*api.Node
cluster *api.Cluster
err error
)
updates, cancel, err := store.ViewAndWatch(
s.store,
func(readTx store.ReadTx) error {
clusters, err := store.FindClusters(readTx, store.ByName(store.DefaultClusterName))
if err != nil {
return err
}
if len(clusters) != 1 {
cluster = store.GetCluster(readTx, s.clusterID)
if cluster == nil {
return errors.New("could not find cluster object")
}
cluster = clusters[0]
nodes, err = store.FindNodes(readTx, store.All)
return err
},
api.EventCreateNode{},
api.EventUpdateNode{},
api.EventDeleteNode{},
api.EventUpdateCluster{},
api.EventUpdateCluster{
Cluster: &api.Cluster{ID: s.clusterID},
Checks: []api.ClusterCheckFunc{api.ClusterCheckID},
},
)

// call once to ensure that the join tokens and local/external CA signer are always set
s.clusterID = cluster.ID
rootReconciler := &rootRotationReconciler{
ctx: log.WithField(ctx, "method", "(*Server).rootRotationReconciler"),
clusterID: s.clusterID,
Expand Down