Maksytka/kind
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kind.git synced 2025-12-01 07:26:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3815 from BenTheElder/version-fallback

Browse Source 
add fallback version detection for tarballs < v1.31
This commit is contained in:
Kubernetes Prow Robot
2024-12-10 18:16:03 +00:00
committed by GitHub
parent 8759112b9f 794538f726
commit f72c0eeb49
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/build/nodeimage/internal/kube/builder_remote.go
View File

@@ -27,6 +27,7 @@ import (
"strings"
"time"
"sigs.k8s.io/kind/pkg/errors"
"sigs.k8s.io/kind/pkg/log"
)
@@ -78,8 +79,15 @@ func (b *remoteBuilder) Build() (Bits, error) {
binDir := filepath.Join(tmpDir, "kubernetes/server/bin")
contents, err := os.ReadFile(filepath.Join(tmpDir, "kubernetes/version"))
// fallback for Kubernetes < v1.31 which doesn't have the version file
// this approach only works for release tags as the format happens to match
// for pre-release builds the docker tag is mangled and not valid semver
if err != nil && os.IsNotExist(err) {
b.logger.Warn("WARNING: Using fallback version detection due to missing version file (This command works best with Kubernetes v1.31+)")
contents, err = os.ReadFile(filepath.Join(binDir, "kube-apiserver.docker_tag"))
}
if err != nil {
return nil, err
return nil, errors.Wrap(err, "failed to get version")
}
sourceVersionRaw := strings.TrimSpace(string(contents))
return &bits{

10
pkg/build/nodeimage/internal/kube/builder_tarball.go
View File

@@ -22,6 +22,7 @@ import (
"path/filepath"
"strings"
"sigs.k8s.io/kind/pkg/errors"
"sigs.k8s.io/kind/pkg/log"
)
@@ -59,8 +60,15 @@ func (b *directoryBuilder) Build() (Bits, error) {
binDir := filepath.Join(tmpDir, "kubernetes/server/bin")
contents, err := os.ReadFile(filepath.Join(tmpDir, "kubernetes/version"))
// fallback for Kubernetes < v1.31 which doesn't have the version file
// this approach only works for release tags as the format happens to match
// for pre-release builds the docker tag is mangled and not valid semver
if err != nil && os.IsNotExist(err) {
b.logger.Warn("WARNING: Using fallback version detection due to missing version file (This command works best with Kubernetes v1.31+)")
contents, err = os.ReadFile(filepath.Join(binDir, "kube-apiserver.docker_tag"))
}
if err != nil {
return nil, err
return nil, errors.Wrap(err, "failed to get version")
}
sourceVersionRaw := strings.TrimSpace(string(contents))
return &bits{