Merge pull request #54 from simrandhaliw/singleton-operator-conversion-webhook-validation-check

Add installModes validation check for CRD conversion webhook support

Author: simrandhaliw

crds/zz_defs.go

@@ -23,7 +23,9 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -539,6 +541,7 @@ google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

go.sum

@@ -168,6 +168,29 @@ func validateInstallModes(csv *v1alpha1.ClusterServiceVersion) (errs []errors.Er
 		}
 	}
 
+	// validate installModes when conversionCRDs field is present in csv.Spec.Webhookdefinitions
+	// check if WebhookDefinitions is present
+	if len(csv.Spec.WebhookDefinitions) != 0 {
+		for _, WebhookDefinition := range csv.Spec.WebhookDefinitions {
+			// check if ConversionCRDs is present
+			if len(WebhookDefinition.ConversionCRDs) != 0 {
+				supportsOnlyAllNamespaces := true
+				// check if AllNamespaces is supported and other install modes are not supported
+				for _, installMode := range csv.Spec.InstallModes {
+					if installMode.Type == "AllNamespaces" && !installMode.Supported {
+						supportsOnlyAllNamespaces = false
+					}
+					if installMode.Type != "AllNamespaces" && installMode.Supported {
+						supportsOnlyAllNamespaces = false
+					}
+				}
+				if supportsOnlyAllNamespaces == false {
+					errs = append(errs, errors.ErrInvalidCSV("only AllNamespaces InstallModeType is supported when conversionCRDs is present", csv.GetName()))
+				}
+			}
+		}
+	}
+
 	// all installModes should not be `false`
 	if !anySupported {
 		errs = append(errs, errors.ErrInvalidCSV("none of InstallModeTypes are supported", csv.GetName()))

pkg/validation/internal/csv.go

@@ -32,6 +32,23 @@ func TestValidateCSV(t *testing.T) {
 			},
 			filepath.Join("testdata", "noInstallMode.csv.yaml"),
 		},
+		{
+			validatorFuncTest{
+				description: "valid install modes when dealing with conversionCRDs",
+				wantErr:     false,
+			},
+			filepath.Join("testdata", "correct.csv.with.conversion.webhook.yaml"),
+		},
+		{
+			validatorFuncTest{
+				description: "invalid install modes when dealing with conversionCRDs",
+				wantErr:     true,
+				errors: []errors.Error{
+					errors.ErrInvalidCSV("only AllNamespaces InstallModeType is supported when conversionCRDs is present", "etcdoperator.v0.9.0"),
+				},
+			},
+			filepath.Join("testdata", "incorrect.csv.with.conversion.webhook.yaml"),
+		},
 	}
 	for _, c := range cases {
 		b, err := ioutil.ReadFile(c.csvPath)