Add Kustomize File (#240)

Author: chatton

cmd/testrunner/crds/crds.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
@@ -18,15 +17,15 @@ import (
 	"k8s.io/client-go/rest"
 )
 
-// EnsureCreation will locate all crd files "*_crd.yaml" in the given deploy directory and ensure that these
+// EnsureCreation will locate all crd files "*_crd.yaml" in the given crd directory and ensure that these
 // CRDs are created into the kubernetes cluster
-func EnsureCreation(config *rest.Config, deployDir string) error {
+func EnsureCreation(config *rest.Config, crdDir string) error {
 	apiextensionsClientSet, err := apiextensionsclientset.NewForConfig(config)
 	if err != nil {
 		return errors.Errorf("error creating apiextensions client set: %s", err)
 	}
 
-	crdFilePaths, err := allCrds(deployDir)
+	crdFilePaths, err := allCrds(crdDir)
 	if err != nil {
 		return errors.Errorf("error walking deploy directory: %s", err)
 	}
@@ -62,8 +61,7 @@ func marshalCRDFromYAMLBytes(bytes []byte, crd *apiextensionsv1beta1.CustomResou
 	return json.Unmarshal(jsonBytes, &crd)
 }
 
-func allCrds(deployDir string) ([]string, error) {
-	crdDir := path.Join(deployDir, "crds")
+func allCrds(crdDir string) ([]string, error) {
 	var crdFilePaths []string
 	err := filepath.Walk(crdDir, func(path string, info os.FileInfo, err error) error {
 		if info != nil && strings.HasSuffix(info.Name(), "_crd.yaml") {

cmd/testrunner/main.go

@@ -32,6 +32,7 @@ import (
 
 type flags struct {
 	deployDir               string
+	crdDir                  string
 	namespace               string
 	operatorImage           string
 	versionUpgradeHookImage string
@@ -41,9 +42,10 @@ type flags struct {
 }
 
 func parseFlags() flags {
-	var namespace, deployDir, operatorImage, versionUpgradeHookImage, testImage, test, performCleanup *string
+	var namespace, deployDir, crdDir, operatorImage, versionUpgradeHookImage, testImage, test, performCleanup *string
 	namespace = flag.String("namespace", "default", "the namespace the operator and tests should be deployed in")
-	deployDir = flag.String("deployDir", "deploy/", "the path to the directory which contains the yaml deployment files")
+	deployDir = flag.String("deployDir", "deploy/operator/", "the path to the directory which contains the yaml deployment files")
+	crdDir = flag.String("crdDir", "deploy/crds/", "the path to the directory which contains the yaml crd files")
 	operatorImage = flag.String("operatorImage", "quay.io/mongodb/community-operator-dev:latest", "the image which should be used for the operator deployment")
 	versionUpgradeHookImage = flag.String("versionUpgradeHookImage", "quay.io/mongodb/community-operator-pre-stop-hook:latest", "the version upgrade post-start hook image")
 	testImage = flag.String("testImage", "quay.io/mongodb/community-operator-e2e:latest", "the image which should be used for the operator e2e tests")
@@ -53,6 +55,7 @@ func parseFlags() flags {
 
 	return flags{
 		deployDir:               *deployDir,
+		crdDir:                  *crdDir,
 		namespace:               *namespace,
 		operatorImage:           *operatorImage,
 		versionUpgradeHookImage: *versionUpgradeHookImage,
@@ -87,7 +90,7 @@ func runCmd(f flags) error {
 
 	fmt.Printf("Ensured namespace: %s\n", f.namespace)
 
-	if err := crds.EnsureCreation(config, f.deployDir); err != nil {
+	if err := crds.EnsureCreation(config, f.crdDir); err != nil {
 		return errors.Errorf("could not ensure CRDs: %s", err)
 	}
 

deploy/kustomization.yaml

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+ - ./crds/mongodb.com_mongodb_crd.yaml
+ - ./operator/service_account.yaml
+ - ./operator/role.yaml
+ - ./operator/role_binding.yaml
+ - ./operator/operator.yaml
+

deploy/operator.yaml renamed to deploy/operator/operator.yaml

@@ -42,7 +42,7 @@ If you want to deploy the operator on OpenShift you will have to provide the env
 
 See [here](../deploy/crds/mongodb.com_v1_mongodb_openshift_cr.yaml) for an example of how to provide the required configuration for a MongoDB ReplicaSet.
 
-See [here](../deploy/operator_openshift.yaml) for an example of how to configure the Operator deployment.
+See [here](../deploy/openshift/operator_openshift.yaml) for an example of how to configure the Operator deployment.
 
 ### Example
 

deploy/role.yaml renamed to deploy/operator/role.yaml

@@ -42,7 +42,7 @@ To install the MongoDB Community Kubernetes Operator:
 
    a. Invoke the following `kubectl` command to install the Operator in the specified namespace:
       ```
-      kubectl create -f deploy/ --namespace <my-namespace>
+      kubectl create -f deploy/operator/ --namespace <my-namespace>
       ```
    b. Verify that the Operator installed successsfully:
       ```

deploy/role_binding.yaml renamed to deploy/operator/role_binding.yaml

@@ -15,15 +15,15 @@
 
 
 def _load_operator_service_account() -> Dict:
-    return load_yaml_from_file("deploy/service_account.yaml")
+    return load_yaml_from_file("deploy/operator/service_account.yaml")
 
 
 def _load_operator_role() -> Dict:
-    return load_yaml_from_file("deploy/role.yaml")
+    return load_yaml_from_file("deploy/operator/role.yaml")
 
 
 def _load_operator_role_binding() -> Dict:
-    return load_yaml_from_file("deploy/role_binding.yaml")
+    return load_yaml_from_file("deploy/operator/role_binding.yaml")
 
 
 def _load_operator_deployment(operator_image: str) -> Dict: