Use kustomize for install manifest generation

Makefile

@@ -5,10 +5,11 @@ SDK_VERSION = v0.17.2
 MACHINE = $(shell uname -m)
 BUILD_IMAGE = golang:1.14.2
 BASE_IMAGE = storageos/base-image:0.2.1
-BUILD_DIR = "build"
+BUILD_DIR = "${CURDIR}/build"
 OPERATOR_SDK = $(BUILD_DIR)/operator-sdk
 YQ = $(BUILD_DIR)/yq
 GOLANGCI_LINT = $(BUILD_DIR)/golangci-lint
+KUSTOMIZE = $(BUILD_DIR)/kustomize
 OUTPUT_DIR = $(BUILD_DIR)/_output
 
 # Set the new version before running the release target.
@@ -160,7 +161,7 @@ dev-image: operator-sdk operator-docker ## Build an image quickly for testing (f
 
 ##@ Third-party tools
 
-.PHONY: operator-sdk yq golangci-lint
+.PHONY: operator-sdk yq golangci-lint kustomize
 
 operator-sdk: ## Download operator-sdk.
 	# Download sdk only if it's not available.
@@ -180,6 +181,13 @@ golangci-lint: ## Install golangci-lint
 		curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(BUILD_DIR) v1.27.0; \
 	fi
 
+kustomize: ## Install kustomize.
+	@if [ ! -f $(KUSTOMIZE) ]; then \
+		curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh  | bash && \
+		mv kustomize $(KUSTOMIZE); \
+	fi
+
+
 ##############################
 # Tests                      #
 ##############################
@@ -224,9 +232,12 @@ metadata-zip: ## Generate OLM metadata-zip bundle.
 		deploy/olm/storageos/storageosnfsserver.crd.yaml \
 		deploy/olm/csv-rhel/storageos.v*.clusterserviceversion.yaml
 
+update-image: kustomize
+	cd deploy/ && $(KUSTOMIZE) edit set image storageos/cluster-operator=$(OPERATOR_IMAGE)
+
 # Generates a single manifest for installing the operator.
-install-manifest: yq ## Generate operator install manifest file.
-	bash scripts/create-manifest.sh $(OPERATOR_IMAGE)
+install-manifest: kustomize update-image ## Generate operator install manifest file.
+	$(KUSTOMIZE) build deploy/ > storageos-operator.yaml
 
 
 

deploy/config.env

@@ -0,0 +1,16 @@
+RELATED_IMAGE_STORAGEOS_NODE
+RELATED_IMAGE_STORAGEOS_INIT
+RELATED_IMAGE_CSIV1_CLUSTER_DRIVER_REGISTRAR
+RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR
+RELATED_IMAGE_CSIV1_EXTERNAL_PROVISIONER
+RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER
+RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V2
+RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER
+RELATED_IMAGE_CSIV1_LIVENESS_PROBE
+RELATED_IMAGE_CSIV0_DRIVER_REGISTRAR
+RELATED_IMAGE_CSIV0_EXTERNAL_PROVISIONER
+RELATED_IMAGE_CSIV0_EXTERNAL_ATTACHER
+RELATED_IMAGE_NFS
+RELATED_IMAGE_KUBE_SCHEDULER
+JAEGER_ENDPOINT
+JAEGER_SERVICE_NAME

deploy/crds/kustomization.yaml

@@ -0,0 +1,5 @@
+resources:
+- storageos.com_jobs_crd.yaml
+- storageos.com_nfsservers_crd.yaml
+- storageos.com_storageosclusters_crd.yaml
+- storageos.com_storageosupgrades_crd.yaml

deploy/kustomization.yaml

@@ -0,0 +1,21 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: storageos-operator
+
+resources:
+- crds
+- namespace.yaml
+- role.yaml
+- service_account.yaml
+- role_binding.yaml
+- operator.yaml
+
+configMapGenerator:
+- envs:
+  - config.env
+  name: storageos-cluster-operator
+
+images:
+- name: storageos/cluster-operator
+  newName: storageos/cluster-operator
+  newTag: test

deploy/operator.yaml

@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: storageos-cluster-operator
-  namespace: storageos-operator
   labels:
     app.kubernetes.io/name: storageos-operator
     app.kubernetes.io/instance: storageos-cluster-operator
@@ -33,34 +32,6 @@ spec:
           - cluster-operator
           imagePullPolicy: IfNotPresent
           env:
-            - name: RELATED_IMAGE_STORAGEOS_NODE
-              value: ""
-            - name: RELATED_IMAGE_STORAGEOS_INIT
-              value: ""
-            - name: RELATED_IMAGE_CSIV1_CLUSTER_DRIVER_REGISTRAR
-              value: ""
-            - name: RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR
-              value: ""
-            - name: RELATED_IMAGE_CSIV1_EXTERNAL_PROVISIONER
-              value: ""
-            - name: RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER
-              value: ""
-            - name: RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V2
-              value: ""
-            - name: RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER
-              value: ""
-            - name: RELATED_IMAGE_CSIV1_LIVENESS_PROBE
-              value: ""
-            - name: RELATED_IMAGE_CSIV0_DRIVER_REGISTRAR
-              value: ""
-            - name: RELATED_IMAGE_CSIV0_EXTERNAL_PROVISIONER
-              value: ""
-            - name: RELATED_IMAGE_CSIV0_EXTERNAL_ATTACHER
-              value: ""
-            - name: RELATED_IMAGE_NFS
-              value: ""
-            - name: RELATED_IMAGE_KUBE_SCHEDULER
-              value: ""
             - name: WATCH_NAMESPACE
               valueFrom:
                 fieldRef:
@@ -77,10 +48,9 @@ spec:
               value: "storageos-cluster-operator"
             - name: DISABLE_SCHEDULER_WEBHOOK
               value: "false"
-            - name: JAEGER_ENDPOINT
-              value: ""
-            - name: JAEGER_SERVICE_NAME
-              value: ""
+          envFrom:
+          - configMapRef:
+              name: storageos-cluster-operator
       tolerations:
       - key: "key"
         operator: "Equal"

deploy/secret.yaml

@@ -14,11 +14,11 @@ data:
   # tls.crt:
   # tls.key:
   # Add base64 encoded creds below for CSI credentials.
-  # csiProvisionUsername:
-  # csiProvisionPassword:
-  # csiControllerPublishUsername:
-  # csiControllerPublishPassword:
-  # csiNodePublishUsername:
-  # csiNodePublishPassword:
-  # csiControllerExpandUsername:
-  # csiControllerExpandPassword:
+  csiProvisionUsername: c3RvcmFnZW9z
+  csiProvisionPassword: c3RvcmFnZW9z
+  csiControllerPublishUsername: c3RvcmFnZW9z
+  csiControllerPublishPassword: c3RvcmFnZW9z
+  csiNodePublishUsername: c3RvcmFnZW9z
+  csiNodePublishPassword: c3RvcmFnZW9z
+  csiControllerExpandUsername: c3RvcmFnZW9z
+  csiControllerExpandPassword: c3RvcmFnZW9z

deploy/service_account.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: storageoscluster-operator-sa
-  namespace: storageos-operator
   labels:
     app: storageos
     app.kubernetes.io/name: storageos-operator

deploy/storageos-operators.olm.cr.yaml

@@ -21,6 +21,8 @@ metadata:
 type: "kubernetes.io/storageos"
 data:
   # echo -n '<secret>' | base64
+  apiUsername: c3RvcmFnZW9z
+  apiPassword: c3RvcmFnZW9z
   csiProvisionUsername: c3RvcmFnZW9z
   csiProvisionPassword: c3RvcmFnZW9z
   csiControllerPublishUsername: c3RvcmFnZW9z