Port kubernetes package to supervisor
This replaces the ad-hoc goroutine and process management
previously in the kubernetes package with a nice supervisor-based
implementation which should make it easier to understand and more
reliable. It also prevents creation of more ad-hoc launching code
for future features (like CSI & Provisioning).
Since porting SmalltownNode is rather involved I just instantiated a
new supervision tree in the Kubernetes main service and wired it
up to the old interface. Once we port SmalltownNode we can just
remove the legacy Start() method and directly call Run().
Test Plan:
Passes Bazel tests, Kubernetes functionality was manually
tested by running `bazel run //core/cmd/dbg -- kubectl run -i --image alpine:edge sh`
to verify that Kubernetes still works properly. Automated tests for this
are being worked on.
X-Origin-Diff: phab/D534
GitOrigin-RevId: 001de38eaa5c7ee661bf5db9a7c3d0125c1b6af2
diff --git a/core/internal/kubernetes/scheduler.go b/core/internal/kubernetes/scheduler.go
index 75dea97..d3ee20b 100644
--- a/core/internal/kubernetes/scheduler.go
+++ b/core/internal/kubernetes/scheduler.go
@@ -20,11 +20,12 @@
"context"
"encoding/pem"
"fmt"
+ "io"
"os/exec"
"go.etcd.io/etcd/clientv3"
- "go.uber.org/zap"
+ "git.monogon.dev/source/nexantic.git/core/internal/common/supervisor"
"git.monogon.dev/source/nexantic.git/core/pkg/fileargs"
)
@@ -48,31 +49,29 @@
return &config, nil
}
-func (s *Service) runScheduler(ctx context.Context, config schedulerConfig) error {
- args, err := fileargs.New()
- if err != nil {
- panic(err) // If this fails, something is very wrong. Just crash.
+func runScheduler(config schedulerConfig, output io.Writer) supervisor.Runnable {
+ return func(ctx context.Context) error {
+ args, err := fileargs.New()
+ if err != nil {
+ panic(err) // If this fails, something is very wrong. Just crash.
+ }
+ defer args.Close()
+ cmd := exec.CommandContext(ctx, "/kubernetes/bin/kube", "kube-scheduler",
+ args.FileOpt("--kubeconfig", "kubeconfig", config.kubeConfig),
+ "--port=0", // Kill insecure serving
+ args.FileOpt("--tls-cert-file", "server-cert.pem",
+ pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: config.serverCert})),
+ args.FileOpt("--tls-private-key-file", "server-key.pem",
+ pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: config.serverKey})),
+ )
+ if args.Error() != nil {
+ return fmt.Errorf("failed to use fileargs: %w", err)
+ }
+ cmd.Stdout = output
+ cmd.Stderr = output
+ supervisor.Signal(ctx, supervisor.SignalHealthy)
+ err = cmd.Run()
+ fmt.Fprintf(output, "scheduler stopped: %v\n", err)
+ return err
}
- defer args.Close()
- cmd := exec.CommandContext(ctx, "/kubernetes/bin/kube", "kube-scheduler",
- args.FileOpt("--kubeconfig", "kubeconfig", config.kubeConfig),
- "--port=0", // Kill insecure serving
- args.FileOpt("--tls-cert-file", "server-cert.pem",
- pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: config.serverCert})),
- args.FileOpt("--tls-private-key-file", "server-key.pem",
- pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: config.serverKey})),
- )
- if args.Error() != nil {
- return fmt.Errorf("failed to use fileargs: %w", err)
- }
- cmd.Stdout = s.schedulerLogs
- cmd.Stderr = s.schedulerLogs
- err = cmd.Run()
- fmt.Fprintf(s.schedulerLogs, "scheduler stopped: %v\n", err)
- if ctx.Err() == context.Canceled {
- s.logger.Info("scheduler stopped", zap.Error(err))
- } else {
- s.logger.Warn("scheduler stopped unexpectedly", zap.Error(err))
- }
- return err
}