Skip to content
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.

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

feat: node key secret to configmap #466

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions controllers/cosmosfullnode_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type CosmosFullNodeReconciler struct {

cacheController *cosmos.CacheController
configMapControl fullnode.ConfigMapControl
nodeKeyControl fullnode.NodeKeyControl
nodeKeyCollector *fullnode.NodeKeyCollector
peerCollector *fullnode.PeerCollector
podControl fullnode.PodControl
pvcControl fullnode.PVCControl
Expand All @@ -69,7 +69,7 @@ func NewFullNode(

cacheController: cacheController,
configMapControl: fullnode.NewConfigMapControl(client),
nodeKeyControl: fullnode.NewNodeKeyControl(client),
nodeKeyCollector: fullnode.NewNodeKeyCollector(client),
peerCollector: fullnode.NewPeerCollector(client),
podControl: fullnode.NewPodControl(client, cacheController),
pvcControl: fullnode.NewPVCControl(client),
Expand Down Expand Up @@ -136,21 +136,21 @@ func (r *CosmosFullNodeReconciler) Reconcile(ctx context.Context, req ctrl.Reque
errs.Append(err)
}

// Reconcile Secrets.
err = r.nodeKeyControl.Reconcile(ctx, reporter, crd)
// Node keys are required for peers but created in config maps. Since config maps require peers, we need to resolve node keys first and pass them to both.
nodeKeys, err := r.nodeKeyCollector.Collect(ctx, crd)
if err != nil {
errs.Append(err)
}

// Find peer information that's used downstream.
peers, perr := r.peerCollector.Collect(ctx, crd)
peers, perr := r.peerCollector.Collect(ctx, crd, nodeKeys)
if perr != nil {
peers = peers.Default()
errs.Append(perr)
}

// Reconcile ConfigMaps.
configCksums, err := r.configMapControl.Reconcile(ctx, reporter, crd, peers)
configCksums, err := r.configMapControl.Reconcile(ctx, reporter, crd, peers, nodeKeys)
if err != nil {
errs.Append(err)
}
Expand Down
16 changes: 14 additions & 2 deletions internal/fullnode/configmap_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,18 @@ import (
"github.com/strangelove-ventures/cosmos-operator/internal/diff"
"github.com/strangelove-ventures/cosmos-operator/internal/kube"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
)

const (
configOverlayFile = "config-overlay.toml"
appOverlayFile = "app-overlay.toml"
nodeKeyFile = "node_key.json"
)

// BuildConfigMaps creates a ConfigMap with configuration to be mounted as files into containers.
// Currently, the config.toml (for Comet) and app.toml (for the Cosmos SDK).
func BuildConfigMaps(crd *cosmosv1.CosmosFullNode, peers Peers) ([]diff.Resource[*corev1.ConfigMap], error) {
// Currently, the config.toml (for Comet), app.toml (for the Cosmos SDK) and node_key.json.
func BuildConfigMaps(crd *cosmosv1.CosmosFullNode, peers Peers, nodeKeys NodeKeys) ([]diff.Resource[*corev1.ConfigMap], error) {
var (
buf = bufPool.Get().(*bytes.Buffer)
cms = make([]diff.Resource[*corev1.ConfigMap], 0, crd.Spec.Replicas)
Expand Down Expand Up @@ -66,6 +68,16 @@ func BuildConfigMaps(crd *cosmosv1.CosmosFullNode, peers Peers) ([]diff.Resource
}
buf.Reset()

nodeKey, ok := nodeKeys[client.ObjectKey{Name: instanceName(crd, i), Namespace: crd.Namespace}]

if !ok {
return nil, kube.UnrecoverableError(fmt.Errorf("node key not found for %s", instanceName(crd, i)))
}

nodeKeyValue := string(nodeKey.MarshaledNodeKey)

data[nodeKeyFile] = nodeKeyValue

var cm corev1.ConfigMap
cm.Name = instanceName(crd, i)
cm.Namespace = crd.Namespace
Expand Down
Loading
Loading