Merge branch 'master' of github.com:arangodb/kube-arangodb

Author: James Keogh

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## [0.3.1](https://github.com/arangodb/kube-arangodb/tree/0.3.1) (2018-09-25)
+[Full Changelog](https://github.com/arangodb/kube-arangodb/compare/0.3.0...0.3.1)
+
+**Closed issues:**
+
+- Helm chart not deploying custom resource definitions [\#254](https://github.com/arangodb/kube-arangodb/issues/254)
+- `go get` failing due to nonexistent arangodb/arangosync repo [\#249](https://github.com/arangodb/kube-arangodb/issues/249)
+- Helm chart download links broken \(404\) [\#248](https://github.com/arangodb/kube-arangodb/issues/248)
+- Make it easy to deploy in another namespace [\#230](https://github.com/arangodb/kube-arangodb/issues/230)
+- Deployment Failed to Start in different Namespace other than Default [\#223](https://github.com/arangodb/kube-arangodb/issues/223)
+
+**Merged pull requests:**
+
+- Bugfix/sed on linux [\#259](https://github.com/arangodb/kube-arangodb/pull/259)
+- README updates, removing `kubectl apply -f crd.yaml` [\#256](https://github.com/arangodb/kube-arangodb/pull/256)
+- Include CRD in helm chart [\#255](https://github.com/arangodb/kube-arangodb/pull/255)
+
 ## [0.3.0](https://github.com/arangodb/kube-arangodb/tree/0.3.0) (2018-09-07)
 [Full Changelog](https://github.com/arangodb/kube-arangodb/compare/0.2.2...0.3.0)
 

README.md

@@ -41,20 +41,19 @@ it is intended to be.
 ```bash
 # The following will install the operator for `ArangoDeployment` &
 # `ArangoDeplomentReplication` resources.
-helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.0/kube-arangodb.tgz
+helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.1/kube-arangodb.tgz
 # To use `ArangoLocalStorage`, also run
-helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.0/kube-arangodb-storage.tgz
+helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.1/kube-arangodb-storage.tgz
 ```
 
 ## Installation of latest release using Kubectl
 
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.0/manifests/crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.0/manifests/arango-deployment.yaml
+kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.1/manifests/arango-deployment.yaml
 # To use `ArangoLocalStorage`, also run
-kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.0/manifests/arango-storage.yaml
+kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.1/manifests/arango-storage.yaml
 # To use `ArangoDeploymentReplication`, also run
-kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.0/manifests/arango-deployment-replication.yaml
+kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.1/manifests/arango-deployment-replication.yaml
 ```
 
 ## Building

VERSION

@@ -1 +1 @@
-0.3.0+git
+0.3.1+git

docs/Manual/Deployment/Kubernetes/ServicesAndLoadBalancer.md

@@ -72,7 +72,7 @@ additions:
 ## Load balancer
 
 If you want full control of the `Services` needed to access the ArangoDB deployment
-from outside your Kubernetes cluster, set `spec.externalAccess.Type` of the `ArangoDeployment` to `None`
+from outside your Kubernetes cluster, set `spec.externalAccess.type` of the `ArangoDeployment` to `None`
 and create a `Service` as specified below.
 
 Create  a `Service` of type `LoadBalancer` or `NodePort`, depending on your

docs/design/acceptance_test.md

@@ -10,10 +10,10 @@ Before the test, record the following parameters for the platform the test is ex
 
 - Name of the platform
 - Version of the platform
-- Upstream Kubernetes version used by the platform
-- Number of nodes used by the Kubernetes cluster
+- Upstream Kubernetes version used by the platform (run `kubctrl version`)
+- Number of nodes used by the Kubernetes cluster (run `kubectrl get node`)
 - `StorageClasses` provided by the platform (run `kubectl get storageclass`)
-- Does the platform use RBAC?
+- Does the platform use RBAC? (run `kubectl describe clusterrolebinding`)
 - Does the platform support services of type `LoadBalancer`?
 
 If one of the above questions can have multiple answers (e.g. different Kubernetes versions)

manifests/arango-deployment-replication.yaml

@@ -1,3 +1,23 @@
+## deployment-replication/crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: arangodeploymentreplications.replication.database.arangodb.com
+spec:
+  group: replication.database.arangodb.com
+  names:
+    kind: ArangoDeploymentReplication
+    listKind: ArangoDeploymentReplicationList
+    plural: arangodeploymentreplications
+    shortNames:
+    - arangorepl
+    singular: arangodeploymentreplication
+  scope: Namespaced
+  version: v1alpha
+
+
+---
+
 ## deployment-replication/rbac.yaml
 
 
@@ -103,7 +123,7 @@ spec:
       containers:
       - name: operator
         imagePullPolicy: IfNotPresent
-        image: arangodb/kube-arangodb@sha256:46053f371917445a52cbde69a9acc72bb065fa4a80f3fafa3fb98ab84911c570
+        image: arangodb/kube-arangodb@sha256:f1c0806031ca85e489a1abcd3cb6b80a7972e47ccf59826b0f8a86c38e443fbc
         args:
           - --operator.deployment-replication
         env:

manifests/arango-deployment.yaml

@@ -1,3 +1,24 @@
+## deployment/crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: arangodeployments.database.arangodb.com
+spec:
+  group: database.arangodb.com
+  names:
+    kind: ArangoDeployment
+    listKind: ArangoDeploymentList
+    plural: arangodeployments
+    shortNames:
+    - arangodb
+    - arango
+    singular: arangodeployment
+  scope: Namespaced
+  version: v1alpha
+
+
+---
+
 ## deployment/rbac.yaml
 
 
@@ -103,7 +124,7 @@ spec:
       containers:
       - name: operator
         imagePullPolicy: IfNotPresent
-        image: arangodb/kube-arangodb@sha256:46053f371917445a52cbde69a9acc72bb065fa4a80f3fafa3fb98ab84911c570
+        image: arangodb/kube-arangodb@sha256:f1c0806031ca85e489a1abcd3cb6b80a7972e47ccf59826b0f8a86c38e443fbc
         args:
           - --operator.deployment
           - --chaos.allowed=false

manifests/arango-storage.yaml

@@ -1,3 +1,23 @@
+## storage/crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: arangolocalstorages.storage.arangodb.com
+spec:
+  group: storage.arangodb.com
+  names:
+    kind: ArangoLocalStorage
+    listKind: ArangoLocalStorageList
+    plural: arangolocalstorages
+    shortNames:
+    - arangostorage
+    singular: arangolocalstorage
+  scope: Cluster
+  version: v1alpha
+
+
+---
+
 ## storage/rbac.yaml
 
 
@@ -121,7 +141,7 @@ spec:
       containers:
       - name: operator
         imagePullPolicy: IfNotPresent
-        image: arangodb/kube-arangodb@sha256:46053f371917445a52cbde69a9acc72bb065fa4a80f3fafa3fb98ab84911c570
+        image: arangodb/kube-arangodb@sha256:f1c0806031ca85e489a1abcd3cb6b80a7972e47ccf59826b0f8a86c38e443fbc
         args:
         - --operator.storage
         env:

scripts/patch_readme.sh

@@ -10,10 +10,24 @@ if [ -z $VERSION ]; then
     exit 1
 fi
 
+function replaceInFile {
+    local EXPR=$1
+    local FILE=$2
+    case $(uname) in
+        Darwin)
+            sed -e "${EXPR}" -i "" ${FILE}
+            ;;
+        *)
+            sed -i --expression "${EXPR}" ${FILE}
+            ;;
+    esac
+}
+
+
 f=README.md
-sed -e "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/arango-deployment.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/arango-deployment.yaml@g" -i "" $f
-sed -e "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/arango-deployment-replication.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/arango-deployment-replication.yaml@g" -i "" $f
-sed -e "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/arango-storage.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/arango-storage.yaml@g" -i "" $f
+replaceInFile "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/arango-deployment.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/arango-deployment.yaml@g" ${f}
+replaceInFile "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/arango-deployment-replication.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/arango-deployment-replication.yaml@g" ${f}
+replaceInFile "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/arango-storage.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/arango-storage.yaml@g" ${f}
 
-sed -e "s@^helm install https://github.com/arangodb/kube-arangodb/releases/download/.*/kube-arangodb.tgz\$@helm install https://github.com/arangodb/kube-arangodb/releases/download/${VERSION}/kube-arangodb.tgz@g" -i "" $f
-sed -e "s@^helm install https://github.com/arangodb/kube-arangodb/releases/download/.*/kube-arangodb-storage.tgz\$@helm install https://github.com/arangodb/kube-arangodb/releases/download/${VERSION}/kube-arangodb-storage.tgz@g" -i "" $f
+replaceInFile "s@^helm install https://github.com/arangodb/kube-arangodb/releases/download/.*/kube-arangodb.tgz\$@helm install https://github.com/arangodb/kube-arangodb/releases/download/${VERSION}/kube-arangodb.tgz@g" ${f}
+replaceInFile "s@^helm install https://github.com/arangodb/kube-arangodb/releases/download/.*/kube-arangodb-storage.tgz\$@helm install https://github.com/arangodb/kube-arangodb/releases/download/${VERSION}/kube-arangodb-storage.tgz@g" ${f}