cluster: fix a bug in k3d 5.4+ (#266)

Signed-off-by: Nick Santos <[email protected]> Signed-off-by: Nick Santos <[email protected]>
tilt-dev · Dec 6, 2022 · 10ef972 · 10ef972
1 parent f66abd9
commit 10ef972
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -59,7 +59,7 @@ jobs:
           sudo mv ./kind-linux-amd64 /usr/local/bin/kind
       - run: |
           set -ex
-          export TAG=v5.2.2
+          export TAG=v5.4.6
           curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
       - run: |
           set -ex

diff --git a/pkg/api/k3dv1alpha4/types.go b/pkg/api/k3dv1alpha4/types.go
@@ -13,6 +13,10 @@ type TypeMeta struct {
 	APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty"`
 }
 
+type ObjectMeta struct {
+	Name string `mapstructure:"name,omitempty" json:"name,omitempty" yaml:"name,omitempty"`
+}
+
 type VolumeWithNodeFilters struct {
 	Volume      string   `mapstructure:"volume" yaml:"volume,omitempty" json:"volume,omitempty"`
 	NodeFilters []string `mapstructure:"nodeFilters" yaml:"nodeFilters,omitempty" json:"nodeFilters,omitempty"`
@@ -94,7 +98,7 @@ type SimpleConfigRegistries struct {
 // SimpleConfig describes the toplevel k3d configuration file.
 type SimpleConfig struct {
 	TypeMeta     `yaml:",inline"`
-	Name         string                  `mapstructure:"name" yaml:"name,omitempty" json:"name,omitempty"`
+	ObjectMeta   `mapstructure:"metadata" yaml:"metadata,omitempty" json:"metadata,omitempty"`
 	Servers      int                     `mapstructure:"servers" yaml:"servers,omitempty" json:"servers,omitempty"` //nolint:lll    // default 1
 	Agents       int                     `mapstructure:"agents" yaml:"agents,omitempty" json:"agents,omitempty"`    //nolint:lll    // default 0
 	ExposeAPI    SimpleExposureOpts      `mapstructure:"kubeAPI" yaml:"kubeAPI,omitempty" json:"kubeAPI,omitempty"`

diff --git a/pkg/api/k3dv1alpha4/zz_generated.deepcopy.go b/pkg/api/k3dv1alpha4/zz_generated.deepcopy.go
diff --git a/pkg/cluster/admin_k3d_test.go b/pkg/cluster/admin_k3d_test.go
@@ -57,7 +57,8 @@ func TestK3DStartFlagsV5(t *testing.T) {
 	}, f.runner.LastArgs)
 	assert.Equal(t, f.runner.LastStdin, `kind: Simple
 apiVersion: k3d.io/v1alpha4
-name: my-cluster
+metadata:
+    name: my-cluster
 network: bar
 registries:
     use: