Patched docu and Makefile.

arangodb · Oct 31, 2018 · 0f4ce5f · 0f4ce5f
1 parent 2b23bcb
commit 0f4ce5f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -52,6 +52,7 @@ ifndef MANIFESTSUFFIX
 	MANIFESTSUFFIX := -dev
 endif
 endif
+MANIFESTPATHCRD := manifests/arango-crd$(MANIFESTSUFFIX).yaml
 MANIFESTPATHDEPLOYMENT := manifests/arango-deployment$(MANIFESTSUFFIX).yaml
 MANIFESTPATHDEPLOYMENTREPLICATION := manifests/arango-deployment-replication$(MANIFESTSUFFIX).yaml
 MANIFESTPATHSTORAGE := manifests/arango-storage$(MANIFESTSUFFIX).yaml
@@ -236,6 +237,7 @@ endif
 
 .PHONY: manifests
 manifests: $(GOBUILDDIR)
+	echo Building manifests
 	GOPATH=$(GOBUILDDIR) go run $(ROOTDIR)/tools/manifests/manifest_builder.go \
 		--output-suffix=$(MANIFESTSUFFIX) \
 		--image=$(OPERATORIMAGE) \
@@ -299,6 +301,7 @@ ifneq ($(DEPLOYMENTNAMESPACE), default)
 	$(ROOTDIR)/scripts/kube_delete_namespace.sh $(DEPLOYMENTNAMESPACE)
 	kubectl create namespace $(DEPLOYMENTNAMESPACE)
 endif
+	kubectl apply -f $(MANIFESTPATHCRD)
 	kubectl apply -f $(MANIFESTPATHSTORAGE)
 	kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
 	kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
@@ -403,9 +406,11 @@ delete-operator:
 	kubectl delete -f $(MANIFESTPATHDEPLOYMENT) --ignore-not-found
 	kubectl delete -f $(MANIFESTPATHDEPLOYMENTREPLICATION) --ignore-not-found
 	kubectl delete -f $(MANIFESTPATHSTORAGE) --ignore-not-found
+	kubectl delete -f $(MANIFESTPATHCRD) --ignore-not-found
 
 .PHONY: redeploy-operator
 redeploy-operator: delete-operator manifests
+	kubectl apply -f $(MANIFESTPATHCRD)
 	kubectl apply -f $(MANIFESTPATHSTORAGE)
 	kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
 	kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)

diff --git a/docs/Manual/Deployment/Kubernetes/Usage.md b/docs/Manual/Deployment/Kubernetes/Usage.md
@@ -14,6 +14,7 @@ run (replace `<version>` with the version of the operator that you want to insta
 
 ```bash
 export URLPREFIX=https://github.com/arangodb/kube-arangodb/releases/download/<version>
+helm install $URLPREFIX/kube-arangodb-crd.tgz
 helm install $URLPREFIX/kube-arangodb.tgz
 ```
 
@@ -40,6 +41,7 @@ run (replace `<version>` with the version of the operator that you want to insta
 
 ```bash
 export URLPREFIX=https://raw.githubusercontent.com/arangodb/kube-arangodb/<version>/manifests
+kubectl apply -f $URLPREFIX/arango-crd.yaml
 kubectl apply -f $URLPREFIX/arango-deployment.yaml
 ```
 

diff --git a/manifests/.gitignore b/manifests/.gitignore
@@ -2,4 +2,4 @@ arango-deployment-dev.yaml
 arango-deployment-replication-dev.yaml
 arango-storage-dev.yaml
 arango-test-dev.yaml
-arango-crd-dev.yaml
+arango-crd-dev.yaml
diff --git a/scripts/patch_readme.sh b/scripts/patch_readme.sh
@@ -21,7 +21,7 @@ function replaceInFile {
             sed -i --expression "${EXPR}" ${FILE}
             ;;
     esac
-}arango-deployment-operator-5bbc447b4c
+}
 
 
 f=README.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ function replaceInFile { @@
                 sed -i --expression "${EXPR}" ${FILE}
                 ;;
         esac
-    }arango-deployment-operator-5bbc447b4c
+    }
     f=README.md
@@ Expand Down @@