Skip to content

Commit

Permalink
cluster: populate local registry information in the Cluster API object (
Browse files Browse the repository at this point in the history
  • Loading branch information
lizzthabet committed Mar 28, 2022
1 parent be0a079 commit d609f8f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
2 changes: 2 additions & 0 deletions internal/controllers/core/cluster/cache.go
Expand Up @@ -9,6 +9,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

"github.com/tilt-dev/tilt/internal/container"
"github.com/tilt-dev/tilt/internal/controllers/apis/cluster"
"github.com/tilt-dev/tilt/internal/docker"
"github.com/tilt-dev/tilt/internal/k8s"
Expand Down Expand Up @@ -41,6 +42,7 @@ type connection struct {
error string
createdAt time.Time
arch string
registry *container.Registry
}

func (k *ConnectionManager) GetK8sClient(clusterKey types.NamespacedName) (k8s.Client, metav1.MicroTime, error) {
Expand Down
16 changes: 16 additions & 0 deletions internal/controllers/core/cluster/reconciler.go
Expand Up @@ -113,6 +113,11 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
}
}

if conn.error == "" && conn.connType == connectionTypeK8s && conn.registry == nil {
reg := conn.k8sClient.LocalRegistry(ctx)
conn.registry = &reg
}

r.connManager.store(nn, conn)

status := conn.toStatus()
Expand Down Expand Up @@ -239,9 +244,20 @@ func (c *connection) toStatus() v1alpha1.ClusterStatus {
connectedAt = &t
}

var reg *v1alpha1.RegistryHosting
if c.registry != nil {
reg = &v1alpha1.RegistryHosting{
Host: c.registry.Host,
HostFromContainerRuntime: c.registry.HostFromCluster(),
// TODO(milas+lizz): expose from the Tilt registry object
// Help: c.registry.Help,
}
}

return v1alpha1.ClusterStatus{
Error: c.error,
Arch: c.arch,
ConnectedAt: connectedAt,
Registry: reg,
}
}

0 comments on commit d609f8f

Please sign in to comment.