Add validation for Kind and APIVersion (openshift#152)

* Add validation for Kind and APIVersion

Signed-off-by: Josef Karasek <[email protected]>

* Update pkg/validation/internal/csv.go

Co-authored-by: Eric Stroczynski <[email protected]>

Co-authored-by: Eric Stroczynski <[email protected]>
Upstream-repository: api
Upstream-commit: c9b1e7ef82b8081a3eb52c48d0ca9039f2e3a27e

Author: 2 people

staging/api/pkg/validation/internal/csv.go

@@ -48,6 +48,8 @@ func validateCSV(csv *v1alpha1.ClusterServiceVersion) errors.ManifestResult {
 	result.Add(checkFields(*csv)...)
 	// validate case sensitive annotation names
 	result.Add(ValidateAnnotationNames(csv.GetAnnotations(), csv.GetName())...)
+	// validate Version and Kind
+	result.Add(validateVersionKind(csv)...)
 	return result
 }
 
@@ -194,3 +196,15 @@ func validateInstallModes(csv *v1alpha1.ClusterServiceVersion) (errs []errors.Er
 	}
 	return errs
 }
+
+// validateVersionKind checks presence of GroupVersionKind.Version and GroupVersionKind.Kind
+func validateVersionKind(csv *v1alpha1.ClusterServiceVersion) (errs []errors.Error) {
+	gvk := csv.GroupVersionKind()
+	if gvk.Version == "" {
+		errs = append(errs, errors.ErrInvalidCSV("'apiVersion' is missing", csv.GetName()))
+	}
+	if gvk.Kind == "" {
+		errs = append(errs, errors.ErrInvalidCSV("'kind' is missing", csv.GetName()))
+	}
+	return
+}