Add API version for operator.yaml (#1016)

pkg/kudoctl/cmd/repo_index_test.go

@@ -35,7 +35,7 @@ func TestRepoIndexCmd(t *testing.T) {
 			riCmd := newRepoIndexCmd(fs, out, &time)
 			for key, value := range tt.flags {
 				if err := riCmd.Flags().Set(key, value); err != nil {
-					t.Fatal(err)
+					t.Fatalf("%s: %v", tt.name, err)
 				}
 			}
 			err := riCmd.RunE(riCmd, tt.arguments)

pkg/kudoctl/cmd/testdata/index.yaml.golden

@@ -2,7 +2,7 @@ apiVersion: v1
 entries:
   zookeeper:
   - appVersion: 3.4.10
-    digest: fa8d91d993397b0c8738d30826db4c562ad46affb4cc4acae9ade653d91258e0
+    digest: 0ab20aad336fa631e532d234cd98c75b755b3cac00f87abbf21165d48a017575
     maintainers:
     - email: [email protected]
       name: Alena Varkockova

pkg/kudoctl/packages/package.go

@@ -26,10 +26,10 @@ const (
 	operatorFileName      = "operator.yaml"
 	templateFileNameRegex = "templates/.*.yaml"
 	paramsFileName        = "params.yaml"
+	ServerAPIVersion      = "kudo.dev/v1alpha1"
+	PackageAPIVersion     = "kudo.dev/v1beta1"
 )
 
-const apiVersion = "kudo.dev/v1alpha1"
-
 // Resources is collection of CRDs that are used when installing operator
 // during installation, package format is converted to this structure
 type Resources struct {
@@ -47,6 +47,7 @@ type PackageFiles struct {
 
 // Operator is a representation of the KEP-9 Operator YAML
 type Operator struct {
+	APIVersion        string                   `json:"apiVersion,omitempty"`
 	Name              string                   `json:"name"`
 	Description       string                   `json:"description,omitempty"`
 	Version           string                   `json:"version"`
@@ -87,6 +88,12 @@ func parsePackageFile(filePath string, fileBytes []byte, currentPackage *Package
 		if err := yaml.Unmarshal(fileBytes, &currentPackage.Operator); err != nil {
 			return errors.Wrap(err, "failed to unmarshal operator file")
 		}
+		if currentPackage.Operator.APIVersion == "" {
+			currentPackage.Operator.APIVersion = PackageAPIVersion
+		}
+		if currentPackage.Operator.APIVersion != PackageAPIVersion {
+			return fmt.Errorf("expecting supported API version %s but got %s", PackageAPIVersion, currentPackage.Operator.APIVersion)
+		}
 	case isTemplateFile(filePath):
 		pathParts := strings.Split(filePath, "templates/")
 		name := pathParts[len(pathParts)-1]
@@ -177,7 +184,7 @@ func (p *PackageFiles) getCRDs() (*Resources, error) {
 	operator := &v1alpha1.Operator{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Operator",
-			APIVersion: apiVersion,
+			APIVersion: ServerAPIVersion,
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   p.Operator.Name,
@@ -196,7 +203,7 @@ func (p *PackageFiles) getCRDs() (*Resources, error) {
 	fv := &v1alpha1.OperatorVersion{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "OperatorVersion",
-			APIVersion: apiVersion,
+			APIVersion: ServerAPIVersion,
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   fmt.Sprintf("%s-%s", p.Operator.Name, p.Operator.Version),
@@ -220,7 +227,7 @@ func (p *PackageFiles) getCRDs() (*Resources, error) {
 	instance := &v1alpha1.Instance{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Instance",
-			APIVersion: apiVersion,
+			APIVersion: ServerAPIVersion,
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   fmt.Sprintf("%s-instance", p.Operator.Name),

pkg/kudoctl/packages/package_test.go

@@ -24,7 +24,7 @@ func TestReadFileSystemPackage(t *testing.T) {
 		goldenFiles  string
 	}{
 		{"zookeeper", "zk1", "testdata/zk", "testdata/zk-crd-golden1"},
-		{"zookeeper", "zk2", "testdata/zk.tgz", "testdata/zk-crd-golden2"},
+		{"zookeeper zipped", "zk2", "testdata/zk.tgz", "testdata/zk-crd-golden2"},
 	}
 	var fs = afero.NewOsFs()
 

pkg/kudoctl/packages/testdata/zk/operator.yaml

@@ -1,3 +1,4 @@
+apiVersion: kudo.dev/v1beta1
 name: "zookeeper"
 version: "0.1.0"
 appVersion: "3.4.10"

pkg/kudoctl/util/repo/index_test.go

@@ -167,6 +167,7 @@ func TestAddPackageVersionErrorConditions(t *testing.T) {
 
 func TestMapPackageFileToPackageVersion(t *testing.T) {
 	o := packages.Operator{
+		APIVersion:        packages.ServerAPIVersion,
 		Name:              "kafka",
 		Description:       "",
 		Version:           "1.0.0",

test/e2e/cli-install-uninstall/first-operator/operator.yaml

@@ -1,3 +1,4 @@
+apiVersion: kudo.dev/v1beta1
 name: "first-operator"
 version: "0.1.0"
 kubernetesVersion: 1.13.0

test/integration/cli-install/cli-install-operator/operator.yaml

@@ -1,3 +1,4 @@
+apiVersion: kudo.dev/v1beta1
 name: "cli-install-operator"
 version: "0.1.0"
 kudoVersion: 0.3.0

test/integration/first-operator-test/first-operator/operator.yaml

@@ -1,3 +1,4 @@
+apiVersion: kudo.dev/v1beta1
 name: "first-operator"
 version: "0.1.0"
 kubernetesVersion: 1.13.0

test/integration/install-existing-crds-in-operator/crd-operator/operator.yaml

@@ -1,3 +1,4 @@
+apiVersion: kudo.dev/v1beta1
 name: "crd-operator"
 version: "0.1.0"
 kubernetesVersion: 1.13

test/integration/operator-with-custom-crd/operator/operator.yaml

@@ -1,3 +1,4 @@
+apiVersion: kudo.dev/v1beta1
 name: "crd-operator"
 version: "0.1.0"
 kubernetesVersion: 1.13

test/integration/upgrade-command/first-operator/operator.yaml

@@ -1,3 +1,4 @@
+apiVersion: kudo.dev/v1beta1
 name: "upgrade-operator"
 version: "0.1.0"
 kubernetesVersion: 1.13

test/integration/upgrade-command/second-operator/operator.yaml

@@ -1,3 +1,4 @@
+apiVersion: kudo.dev/v1beta1
 name: "upgrade-operator"
 version: "0.2.0"
 kubernetesVersion: 1.13