From 66c045ba3c746015cbfa3be4d7e570197b2ca033 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Fri, 16 Aug 2024 11:37:51 -0700 Subject: [PATCH] fix getting version from tarball the docker tags are mangled --- pkg/build/nodeimage/internal/kube/builder_remote.go | 2 +- pkg/build/nodeimage/internal/kube/builder_tarball.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/build/nodeimage/internal/kube/builder_remote.go b/pkg/build/nodeimage/internal/kube/builder_remote.go index 8420559be4..86133312dc 100644 --- a/pkg/build/nodeimage/internal/kube/builder_remote.go +++ b/pkg/build/nodeimage/internal/kube/builder_remote.go @@ -77,7 +77,7 @@ func (b *remoteBuilder) Build() (Bits, error) { } binDir := filepath.Join(tmpDir, "kubernetes/server/bin") - contents, err := os.ReadFile(filepath.Join(binDir, "kube-apiserver.docker_tag")) + contents, err := os.ReadFile(filepath.Join(tmpDir, "kubernetes/version")) if err != nil { return nil, err } diff --git a/pkg/build/nodeimage/internal/kube/builder_tarball.go b/pkg/build/nodeimage/internal/kube/builder_tarball.go index aace608006..61443f7f1a 100644 --- a/pkg/build/nodeimage/internal/kube/builder_tarball.go +++ b/pkg/build/nodeimage/internal/kube/builder_tarball.go @@ -20,8 +20,9 @@ import ( "fmt" "os" "path/filepath" - "sigs.k8s.io/kind/pkg/log" "strings" + + "sigs.k8s.io/kind/pkg/log" ) // TODO(bentheelder): plumb through arch @@ -57,7 +58,7 @@ func (b *directoryBuilder) Build() (Bits, error) { } binDir := filepath.Join(tmpDir, "kubernetes/server/bin") - contents, err := os.ReadFile(filepath.Join(binDir, "kube-apiserver.docker_tag")) + contents, err := os.ReadFile(filepath.Join(tmpDir, "kubernetes/version")) if err != nil { return nil, err }