Improvements and bug fixes for krel obs specs

cmd/krel/cmd/obs_specs.go

@@ -22,115 +22,99 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"k8s.io/release/pkg/obs/options"
 	"k8s.io/release/pkg/obs/specs"
 )
 
-var obsOpts = options.New()
+var specsOpts = specs.DefaultOptions()
 
 // obsSpecsCmd represents the subcommand for `krel obs specs`
 var obsSpecsCmd = &cobra.Command{
 	Use:           "specs",
-	Short:         "generate specs and binary archives",
+	Short:         "generate specs and artifacts archive",
 	SilenceUsage:  true,
 	SilenceErrors: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return runGenerateOBSSpecs(obsOpts)
+		return runGenerateOBSSpecs(specsOpts)
 	},
 }
 
 func init() {
 	obsSpecsCmd.PersistentFlags().StringVar(
-		&obsOpts.Package,
+		&specsOpts.Package,
 		"package",
-		obsOpts.Package,
+		specsOpts.Package,
 		"package to create specs and archives for",
 	)
 
 	obsSpecsCmd.PersistentFlags().StringVar(
-		&obsOpts.Channel,
-		"channel",
-		obsOpts.Channel,
-		"channel to create specs for",
-	)
-
-	obsSpecsCmd.PersistentFlags().StringSliceVar(
-		&obsOpts.Architectures,
-		"arch",
-		obsOpts.Architectures,
-		"architectures to download binaries for when creating the archive",
-	)
-
-	obsSpecsCmd.PersistentFlags().StringVar(
-		&obsOpts.Version,
+		&specsOpts.Version,
 		"version",
-		obsOpts.Version,
+		specsOpts.Version,
 		"package version",
 	)
 
 	obsSpecsCmd.PersistentFlags().StringVar(
-		&obsOpts.Revision,
+		&specsOpts.Revision,
 		"revision",
-		obsOpts.Revision,
+		specsOpts.Revision,
 		"package revision",
 	)
 
 	obsSpecsCmd.PersistentFlags().StringVar(
-		&obsOpts.PackageSourceBase,
+		&specsOpts.Channel,
+		"channel",
+		specsOpts.Channel,
+		"channel to create specs for",
+	)
+
+	obsSpecsCmd.PersistentFlags().StringSliceVar(
+		&specsOpts.Architectures,
+		"architectures",
+		specsOpts.Architectures,
+		"architectures to download binaries for when creating the archive",
+	)
+
+	obsSpecsCmd.PersistentFlags().StringVar(
+		&specsOpts.PackageSourceBase,
 		"package-source",
-		obsOpts.PackageSourceBase,
+		specsOpts.PackageSourceBase,
 		"source to download artifacts for package",
 	)
 
 	obsSpecsCmd.PersistentFlags().StringVar(
-		&obsOpts.SpecTemplatePath,
+		&specsOpts.SpecTemplatePath,
 		"template-dir",
-		obsOpts.SpecTemplatePath,
+		specsOpts.SpecTemplatePath,
 		"template directory containing spec files",
 	)
 
 	obsSpecsCmd.PersistentFlags().StringVar(
-		&obsOpts.SpecOutputPath,
+		&specsOpts.SpecOutputPath,
 		"output",
-		obsOpts.SpecOutputPath,
+		specsOpts.SpecOutputPath,
 		"output directory to store specs and archives",
 	)
 
 	obsSpecsCmd.PersistentFlags().BoolVar(
-		&obsOpts.SpecOnly,
+		&specsOpts.SpecOnly,
 		"spec-only",
-		obsOpts.SpecOnly,
+		specsOpts.SpecOnly,
 		"only create specs without downloading binaries and creating archives",
 	)
 
 	obsCmd.AddCommand(obsSpecsCmd)
 }
 
-func runGenerateOBSSpecs(opts *options.Options) (err error) {
-	logrus.Debugf("Using options: %+v", opts)
+func runGenerateOBSSpecs(opts *specs.Options) (err error) {
+	logrus.Debugf("Using options: %s", opts.String())
 
 	if err := opts.Validate(); err != nil {
 		return fmt.Errorf("running krel obs: %w", err)
 	}
 
-	client := specs.New(opts)
-
-	pkgDef, err := client.ConstructPackageDefinition()
-	if err != nil {
-		return fmt.Errorf("running krel obs: %w", err)
-	}
-
-	if err = client.BuildSpecs(pkgDef, opts.SpecOnly); err != nil {
+	if err := specs.New(opts).Run(); err != nil {
 		return fmt.Errorf("running krel obs: %w", err)
 	}
 
-	if !opts.SpecOnly {
-		if err = client.BuildArtifactsArchive(pkgDef); err != nil {
-			return fmt.Errorf("running krel obs: %w", err)
-		}
-	}
-
-	logrus.Infof("krel obs done, files available in %s", opts.SpecOutputPath)
-
 	return nil
 }

go.mod

@@ -40,8 +40,8 @@ require (
 	sigs.k8s.io/bom v0.5.2-0.20230519223618-1ebaa9ce375f
 	sigs.k8s.io/mdtoc v1.1.0
 	sigs.k8s.io/promo-tools/v3 v3.6.0
-	sigs.k8s.io/release-sdk v0.10.2-0.20230524114850-ade46299d040
-	sigs.k8s.io/release-utils v0.7.4
+	sigs.k8s.io/release-sdk v0.10.2-0.20230526102852-a20f93c51631
+	sigs.k8s.io/release-utils v0.7.5-0.20230526101452-f7d5a1fbd5ad
 	sigs.k8s.io/yaml v1.3.0
 	sigs.k8s.io/zeitgeist v0.4.1
 )

go.sum

@@ -1611,10 +1611,10 @@ sigs.k8s.io/mdtoc v1.1.0 h1:q3YtqYzmC2e0hgLXRIOm7/QLuPux1CX3ZHCwlbABxZo=
 sigs.k8s.io/mdtoc v1.1.0/go.mod h1:QZLVEdHH2iNIR4uHAZyvFRtjloHgVItk8lo/mzCtq3w=
 sigs.k8s.io/promo-tools/v3 v3.6.0 h1:C2L08ezrWm1aZI8Emd3iZPZQserLPRgzuqQVxvI0PUI=
 sigs.k8s.io/promo-tools/v3 v3.6.0/go.mod h1:XJ3jy0hJYs+hWKt8XsLHFzGQV8PUtvllvbxjN/E5RXI=
-sigs.k8s.io/release-sdk v0.10.2-0.20230524114850-ade46299d040 h1:W2x+/jyBHB8PDBBozU8FHfCPRQ44/zaIBNheapdvjS0=
-sigs.k8s.io/release-sdk v0.10.2-0.20230524114850-ade46299d040/go.mod h1:Go3wt8dMyJOayvZjANFfylamvCauGO4syI73kVHPGTw=
-sigs.k8s.io/release-utils v0.7.4 h1:17LmJrydpUloTCtaoWj95uKlcrUp4h2A9Sa+ZL+lV9w=
-sigs.k8s.io/release-utils v0.7.4/go.mod h1:JEt2QPHItd5Pg2UKLAU8PEaSlF4bUjCZimpxFDgymVU=
+sigs.k8s.io/release-sdk v0.10.2-0.20230526102852-a20f93c51631 h1:Nlfp/k1YPaEGjwrK+y3zlnIQcjSmb4g6LH9oXGKeZ+I=
+sigs.k8s.io/release-sdk v0.10.2-0.20230526102852-a20f93c51631/go.mod h1:Go3wt8dMyJOayvZjANFfylamvCauGO4syI73kVHPGTw=
+sigs.k8s.io/release-utils v0.7.5-0.20230526101452-f7d5a1fbd5ad h1:VIkuEZXIvpWG2kJJf4iphoN79zcINjJ6waUy8gAihtw=
+sigs.k8s.io/release-utils v0.7.5-0.20230526101452-f7d5a1fbd5ad/go.mod h1:fsXUqmj1ekJ5sfkmfP3J0x9gh96NwVucQO6sG9STMLM=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

pkg/obs/consts/consts.go

@@ -0,0 +1,97 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package consts
+
+import "github.com/sirupsen/logrus"
+
+const (
+	PackageCRITools      string = "cri-tools"
+	PackageKubeadm       string = "kubeadm"
+	PackageKubectl       string = "kubectl"
+	PackageKubelet       string = "kubelet"
+	PackageKubernetesCNI string = "kubernetes-cni"
+)
+
+const (
+	ChannelTypeRelease    string = "release"
+	ChannelTypePrerelease string = "prerelease"
+	ChannelTypeNightly    string = "nightly"
+)
+
+const (
+	ArchitectureAMD64 string = "amd64"
+	ArchitectureARM64 string = "arm64"
+	ArchitecturePPC64 string = "ppc64le"
+	ArchitectureS390X string = "s390x"
+)
+
+var (
+	SupportedChannels = []string{
+		ChannelTypeRelease,
+		ChannelTypePrerelease,
+		ChannelTypeNightly,
+	}
+
+	SupportedArchitectures = []string{
+		ArchitectureAMD64,
+		ArchitectureARM64,
+		ArchitecturePPC64,
+		ArchitectureS390X,
+	}
+)
+
+const (
+	DefaultReleaseDownloadLinkBase = "gs://kubernetes-release/release"
+	DefaultRevision                = "0"
+)
+
+func IsSupported(field string, input, expected []string) bool {
+	notSupported := []string{}
+
+	supported := false
+	for _, i := range input {
+		supported = false
+		for _, j := range expected {
+			if i == j {
+				supported = true
+				break
+			}
+		}
+
+		if !supported {
+			notSupported = append(notSupported, i)
+		}
+	}
+
+	if len(notSupported) > 0 {
+		logrus.Infof(
+			"Flag %s has an unsupported option: %v", field, notSupported,
+		)
+		return false
+	}
+
+	return true
+}
+
+func IsCoreKubernetesPackage(packageName string) bool {
+	switch packageName {
+	case PackageKubeadm, PackageKubectl, PackageKubelet:
+		return true
+	default:
+		return false
+	}
+}