Merge pull request #3231 from saschagrunert/obs-specs

k8s-ci-robot · web-flow · commit e229265a11b0 · 2023-08-28T04:11:43.000-07:00
`krel obs specs`: Stronger defaults
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,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ var (`
`57`	`57`	`const (`
`58`	`58`	`DefaultReleaseDownloadLinkBase = "gs://kubernetes-release/release"`
`59`	`59`	`DefaultRevision = "0"`
	`60`	`+ DefaultSpecTemplatePath = "cmd/krel/templates/latest"`
`60`	`61`	`)`
`61`	`62`
`62`	`63`	`func IsSupported(field string, input, expected []string) bool {`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,9 @@ func DefaultOptions() *Options {`
`78`	`78`	`consts.ArchitecturePPC64,`
`79`	`79`	`consts.ArchitectureS390X,`
`80`	`80`	`},`
	`81`	`+ Channel: consts.ChannelTypeRelease,`
	`82`	`+ SpecOutputPath: ".",`
	`83`	`+ SpecTemplatePath: consts.DefaultSpecTemplatePath,`
`81`	`84`	`}`
`82`	`85`	`}`
`83`	`86`