From 0f4ce5f8c1a2d5112322679f940d1c58eff583f3 Mon Sep 17 00:00:00 2001 From: lamai93 Date: Wed, 31 Oct 2018 10:31:07 +0100 Subject: [PATCH] Patched docu and Makefile. --- Makefile | 5 +++++ docs/Manual/Deployment/Kubernetes/Usage.md | 2 ++ manifests/.gitignore | 2 +- scripts/patch_readme.sh | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 51f534871..6a230ca22 100644 --- 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 index dac960c3b..12b2d2944 100644 --- a/docs/Manual/Deployment/Kubernetes/Usage.md +++ b/docs/Manual/Deployment/Kubernetes/Usage.md @@ -14,6 +14,7 @@ run (replace `` with the version of the operator that you want to insta ```bash export URLPREFIX=https://github.com/arangodb/kube-arangodb/releases/download/ +helm install $URLPREFIX/kube-arangodb-crd.tgz helm install $URLPREFIX/kube-arangodb.tgz ``` @@ -40,6 +41,7 @@ run (replace `` with the version of the operator that you want to insta ```bash export URLPREFIX=https://raw.githubusercontent.com/arangodb/kube-arangodb//manifests +kubectl apply -f $URLPREFIX/arango-crd.yaml kubectl apply -f $URLPREFIX/arango-deployment.yaml ``` diff --git a/manifests/.gitignore b/manifests/.gitignore index fea187599..7f3592412 100644 --- 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 \ No newline at end of file +arango-crd-dev.yaml diff --git a/scripts/patch_readme.sh b/scripts/patch_readme.sh index 79ba83e20..73aaa4228 100755 --- 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