response to comments

tilt-dev · May 6, 2022 · a41253a · a41253a
1 parent 7343f4c
commit a41253a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/internal/cli/wire_gen.go b/internal/cli/wire_gen.go
diff --git a/internal/controllers/core/cluster/reconciler.go b/internal/controllers/core/cluster/reconciler.go
@@ -46,13 +46,14 @@ const (
 )
 
 type Reconciler struct {
- globalCtx context.Context
- ctrlClient ctrlclient.Client
- store store.RStore
- requeuer *indexer.Requeuer
- clock clockwork.Clock
- connManager *ConnectionManager
- base xdg.Base
+ globalCtx context.Context
+ ctrlClient ctrlclient.Client
+ store store.RStore
+ requeuer *indexer.Requeuer
+ clock clockwork.Clock
+ connManager *ConnectionManager
+ base xdg.Base
+ apiServerName model.APIServerName
 
  localDockerEnv docker.LocalEnv
  dockerClientFactory DockerClientFactory
@@ -81,6 +82,7 @@ func NewReconciler(
  k8sClientFactory KubernetesClientFactory,
  wsList *server.WebsocketList,
  base xdg.Base,
+ apiServerName model.APIServerName,
 ) *Reconciler {
  requeuer := indexer.NewRequeuer()
 
@@ -97,6 +99,7 @@ func NewReconciler(
  wsList: wsList,
  clusterHealth: newClusterHealthMonitor(globalCtx, clock, requeuer),
  base: base,
+ apiServerName: apiServerName,
  }
 }
 
@@ -398,7 +401,8 @@ func (r *Reconciler) writeFrozenKubeConfig(ctx context.Context, nn types.Namespa
  }
 
  printer := printers.YAMLPrinter{}
- path, err := r.base.ConfigFile(filepath.Join("cluster", nn.Name))
+ path, err := r.base.RuntimeFile(
+ filepath.Join(string(r.apiServerName), "cluster", fmt.Sprintf("%s.yml", nn.Name)))
  if err != nil {
  logger.Get(ctx).Warnf("Writing Kubernetes config: %v", err)
  return ""

diff --git a/internal/controllers/core/cluster/reconciler_test.go b/internal/controllers/core/cluster/reconciler_test.go
@@ -288,7 +288,8 @@ func newFixture(t *testing.T) *fixture {
  FakeDockerClientOrError(dockerClient, nil),
  FakeKubernetesClientOrError(k8sClient, nil),
  server.NewWebsocketList(),
- base)
+ base,
+ "tilt-default")
  requeueChan := make(chan indexer.RequeueForTestResult, 1)
  indexer.StartSourceForTesting(cfb.Context(), r.requeuer, r, requeueChan)
  return &fixture{

diff --git a/internal/engine/upper_test.go b/internal/engine/upper_test.go
@@ -3398,7 +3398,7 @@ func newTestFixture(t *testing.T, options ...fixtureOptions) *testFixture {
  clr := cluster.NewReconciler(ctx, cdc, st, clock, clusterClients, docker.LocalEnv{},
  cluster.FakeDockerClientOrError(dockerClient, nil),
  cluster.FakeKubernetesClientOrError(kClient, nil),
- wsl, base)
+ wsl, base, "tilt-default")
  dclsr := dockercomposelogstream.NewReconciler(cdc, st)
 
  cb := controllers.NewControllerBuilder(tscm, controllers.ProvideControllers(

diff --git a/internal/k8s/env.go b/internal/k8s/env.go
@@ -26,7 +26,7 @@ type APIConfigOrError struct {
 func ProvideAPIConfig(clientLoader clientcmd.ClientConfig, contextOverride KubeContextOverride, namespaceOverride NamespaceOverride) APIConfigOrError {
  config, err := clientLoader.RawConfig()
  if err != nil {
- return APIConfigOrError{Error: errors.Wrap(err, "Loading Kubernetes current-context")}
+ return APIConfigOrError{Error: errors.Wrap(err, "Loading Kubernetes config")}
  }
 
  // NOTE(nick): The RawConfig() accessor doesn't handle overrides.
@@ -45,7 +45,7 @@ func ProvideAPIConfig(clientLoader clientcmd.ClientConfig, contextOverride KubeC
 
  err = clientcmd.ConfirmUsable(config, config.CurrentContext)
  if err != nil {
- return APIConfigOrError{Error: errors.Wrap(err, "Overriding Kubernetes context")}
+ return APIConfigOrError{Error: errors.Wrap(err, "Loading Kubernetes config")}
  }
 
  return APIConfigOrError{Config: &config}