Merge pull request #3231 from saschagrunert/obs-specs

`krel obs specs`: Stronger defaults
kubernetes · Aug 28, 2023 · e229265 · e229265
2 parents 7288ca7 + ec4761e
commit e229265
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/pkg/obs/consts/consts.go b/pkg/obs/consts/consts.go
@@ -57,6 +57,7 @@ var (
 const (
 	DefaultReleaseDownloadLinkBase = "gs://kubernetes-release/release"
 	DefaultRevision                = "0"
+	DefaultSpecTemplatePath        = "cmd/krel/templates/latest"
 )
 
 func IsSupported(field string, input, expected []string) bool {

diff --git a/pkg/obs/obs.go b/pkg/obs/obs.go
@@ -58,7 +58,7 @@ const (
 
 	// defaultSpecTemplatePath is path inside Google Cloud Build where package
 	// specs for kubeadm, kubectl, and kubelet are located.
-	defaultSpecTemplatePath = workspaceDir + "/go/src/k8s.io/release/cmd/krel/templates/latest"
+	defaultSpecTemplatePath = workspaceDir + "/go/src/k8s.io/release/" + consts.DefaultSpecTemplatePath
 
 	// obsRoot is path inside Google Cloud Build where OBS project and packages
 	// are checked out.

diff --git a/pkg/obs/specs/specs.go b/pkg/obs/specs/specs.go
@@ -78,6 +78,9 @@ func DefaultOptions() *Options {
 			consts.ArchitecturePPC64,
 			consts.ArchitectureS390X,
 		},
+		Channel:          consts.ChannelTypeRelease,
+		SpecOutputPath:   ".",
+		SpecTemplatePath: consts.DefaultSpecTemplatePath,
 	}
 }