Merge pull request #3715 from BenTheElder/fix-version

fix getting version from tarball
kubernetes-sigs · Aug 16, 2024 · 05e4519 · 05e4519
2 parents 6780994 + 66c045b
commit 05e4519
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
 	}