Revert "scripts/create_container: fix cockroachdb startup"
This reverts commit 25aee769a555d34ae3c9f12560a8a29986601034.
This was uh messed up in phabricator and contains changes that shouldn't
have landed.
Test Plan: it's a revert.
X-Origin-Diff: phab/D567
GitOrigin-RevId: 0dee3a91f708a9c2aba6cc7dbc929c3c887647c3
diff --git a/core/internal/kubernetes/controller-manager.go b/core/internal/kubernetes/controller-manager.go
index a6b4b5d..20d4605 100644
--- a/core/internal/kubernetes/controller-manager.go
+++ b/core/internal/kubernetes/controller-manager.go
@@ -27,7 +27,6 @@
"go.etcd.io/etcd/clientv3"
"git.monogon.dev/source/nexantic.git/core/internal/common/supervisor"
- "git.monogon.dev/source/nexantic.git/core/internal/kubernetes/pki"
"git.monogon.dev/source/nexantic.git/core/pkg/fileargs"
)
@@ -44,19 +43,19 @@
func getPKIControllerManagerConfig(consensusKV clientv3.KV) (*controllerManagerConfig, error) {
var config controllerManagerConfig
var err error
- config.rootCA, _, err = pki.GetCert(consensusKV, "id-ca")
+ config.rootCA, _, err = getCert(consensusKV, "id-ca")
if err != nil {
return nil, fmt.Errorf("failed to get ID root CA: %w", err)
}
- config.serverCert, config.serverKey, err = pki.GetCert(consensusKV, "controller-manager")
+ config.serverCert, config.serverKey, err = getCert(consensusKV, "controller-manager")
if err != nil {
return nil, fmt.Errorf("failed to get controller-manager serving certificate: %w", err)
}
- config.serviceAccountPrivKey, err = pki.GetSingle(consensusKV, "service-account-privkey.der")
+ config.serviceAccountPrivKey, err = getSingle(consensusKV, "service-account-privkey.der")
if err != nil {
return nil, fmt.Errorf("failed to get serviceaccount privkey: %w", err)
}
- config.kubeConfig, err = pki.GetSingle(consensusKV, "controller-manager.kubeconfig")
+ config.kubeConfig, err = getSingle(consensusKV, "controller-manager.kubeconfig")
if err != nil {
return nil, fmt.Errorf("failed to get controller-manager kubeconfig: %w", err)
}