Run kustomizer standalone

Author: pmtk

pkg/cmd/run.go

@@ -209,7 +209,6 @@ func RunMicroshift(cfg *config.Config) error {
 	util.Must(m.AddService(controllers.NewInfrastructureServices(cfg)))
 	util.Must(m.AddService(controllers.NewClusterPolicyController(cfg)))
 	util.Must(m.AddService(controllers.NewVersionManager(cfg)))
-	util.Must(m.AddService(kustomize.NewKustomizer(cfg)))
 	util.Must(m.AddService(node.NewKubeletServer(cfg)))
 	util.Must(m.AddService(loadbalancerservice.NewLoadbalancerServiceController(cfg)))
 	util.Must(m.AddService(controllers.NewKubeStorageVersionMigrator(cfg)))
@@ -273,6 +272,9 @@ func RunMicroshift(cfg *config.Config) error {
 			klog.Info("service does not support sd_notify readiness messages")
 		}
 
+		// After MicroShift's core becomes ready, run the kustomizer (delete and/or apply manifests).
+		kustomize.NewKustomizer(cfg).RunStandalone(runCtx)
+
 		// Watch for SIGTERM to exit, now that we are ready.
 		<-sigTerm
 		klog.Info("Interrupt received")

pkg/kustomize/kustomize.go

@@ -2,6 +2,7 @@ package kustomize
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"time"
@@ -21,7 +22,7 @@ import (
 
 const (
 	retryInterval = 10 * time.Second
-	retryTimeout  = 1 * time.Minute
+	retryTimeout  = 10 * time.Minute
 )
 
 type Kustomizer struct {
@@ -39,6 +40,15 @@ func NewKustomizer(cfg *config.Config) *Kustomizer {
 func (s *Kustomizer) Name() string           { return "kustomizer" }
 func (s *Kustomizer) Dependencies() []string { return []string{"kube-apiserver"} }
 
+func (s *Kustomizer) RunStandalone(ctx context.Context) {
+	ready, stopped := make(chan struct{}), make(chan struct{})
+	go func() {
+		if err := s.Run(ctx, ready, stopped); err != nil && !errors.Is(err, context.Canceled) {
+			klog.Errorf("Kustomizer failed: %v", err)
+		}
+	}()
+}
+
 func (s *Kustomizer) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error {
 	defer close(stopped)
 	defer close(ready)
@@ -57,6 +67,10 @@ func (s *Kustomizer) Run(ctx context.Context, ready chan<- struct{}, stopped cha
 	}
 
 	for _, path := range kustomizationPaths {
+		// TODO: Should these happen in parallel?
+		// Or there's no need? Even if ai-model-serving blocks for 5 minutes,
+		// the manifests that come after should immediately be applied
+		// (unless they also depend on some webhook that isn't up yet).
 		s.handleKustomizationPath(ctx, path, "Applying", applyKustomization)
 	}