Skip to content

Commit 90c520c

Browse files
author
lamai93
committed
Merge remote-tracking branch 'origin/master' into feature/advertised-endpoints
2 parents 96648af + 9d87eab commit 90c520c

File tree

85 files changed

+14903
-8838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+14903
-8838
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Change Log
22

3+
## [0.3.5](https://github.com/arangodb/kube-arangodb/tree/0.3.5) (2018-11-20)
4+
[Full Changelog](https://github.com/arangodb/kube-arangodb/compare/0.3.4...0.3.5)
5+
6+
**Closed issues:**
7+
8+
- Istio compatibility issue [\#260](https://github.com/arangodb/kube-arangodb/issues/260)
9+
10+
**Merged pull requests:**
11+
12+
- Fixing imageID retrieval issue when sidecars are injected. [\#302](https://github.com/arangodb/kube-arangodb/pull/302)
13+
- Bug fix/fix immutable reset [\#301](https://github.com/arangodb/kube-arangodb/pull/301)
14+
- Fixing small type in readme [\#300](https://github.com/arangodb/kube-arangodb/pull/300)
15+
- Make timeout configurable. [\#298](https://github.com/arangodb/kube-arangodb/pull/298)
16+
- fixed getLoadBalancerIP to also handle hostnames [\#297](https://github.com/arangodb/kube-arangodb/pull/297)
17+
318
## [0.3.4](https://github.com/arangodb/kube-arangodb/tree/0.3.4) (2018-11-06)
419
[Full Changelog](https://github.com/arangodb/kube-arangodb/compare/0.3.3...0.3.4)
520

‎Jenkinsfile.groovy‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,16 @@ def buildTestSteps(Map myParams, String kubeConfigRoot, String kubeconfig) {
8181
return {
8282
timestamps {
8383
timeout(time: myParams.LONG ? 180 : 30) {
84-
withCredentials([string(credentialsId: 'ENTERPRISEIMAGE', variable: 'DEFAULTENTERPRISEIMAGE')]) {
84+
withCredentials([
85+
string(credentialsId: 'ENTERPRISEIMAGE', variable: 'DEFAULTENTERPRISEIMAGE'),
86+
string(credentialsId: 'ENTERPRISELICENSE', variable: 'DEFAULTENTERPRISELICENSE'),
87+
]) {
8588
withEnv([
8689
"CLEANDEPLOYMENTS=1",
8790
"DEPLOYMENTNAMESPACE=${myParams.TESTNAMESPACE}-${env.GIT_COMMIT}",
8891
"DOCKERNAMESPACE=${myParams.DOCKERNAMESPACE}",
8992
"ENTERPRISEIMAGE=${myParams.ENTERPRISEIMAGE}",
93+
"ENTERPRISELICENSE=${myParams.ENTERPRISELICENSE}",
9094
"ARANGODIMAGE=${myParams.ARANGODIMAGE}",
9195
"IMAGETAG=jenkins-test",
9296
"KUBECONFIG=${kubeConfigRoot}/${kubeconfig}",
@@ -132,6 +136,7 @@ pipeline {
132136
string(name: 'TESTNAMESPACE', defaultValue: 'jenkins', description: 'TESTNAMESPACE sets the kubernetes namespace to ru tests in (this must be short!!)', )
133137
string(name: 'ENTERPRISEIMAGE', defaultValue: '', description: 'ENTERPRISEIMAGE sets the docker image used for enterprise tests', )
134138
string(name: 'ARANGODIMAGE', defaultValue: '', description: 'ARANGODIMAGE sets the docker image used for tests (except enterprise and update tests)', )
139+
string(name: 'ENTERPRISELICENSE', defaultValue: '', description: 'ENTERPRISELICENSE sets the enterprise license key for enterprise tests', )
135140
string(name: 'TESTOPTIONS', defaultValue: '', description: 'TESTOPTIONS is used to pass additional test options to the integration test', )
136141
}
137142
stages {

‎Makefile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ endif
7373
ifndef ENTERPRISEIMAGE
7474
ENTERPRISEIMAGE := $(DEFAULTENTERPRISEIMAGE)
7575
endif
76+
ifndef ENTERPRISELICENSE
77+
ENTERPRISELICENSE := $(DEFAULTENTERPRISELICENSE)
78+
endif
7679
DASHBOARDBUILDIMAGE := kube-arangodb-dashboard-builder
7780

7881
ifndef ALLOWCHAOS
@@ -99,7 +102,7 @@ ifdef VERBOSE
99102
endif
100103

101104
SOURCES := $(shell find $(SRCDIR) -name '*.go' -not -path './test/*')
102-
DASHBOARDSOURCES := $(shell find $(DASHBOARDDIR)/src -name '*.js' -not -path './test/*')
105+
DASHBOARDSOURCES := $(shell find $(DASHBOARDDIR)/src -name '*.js' -not -path './test/*') $(DASHBOARDDIR)/package.json
103106

104107
.PHONY: all
105108
all: verify-generated build
@@ -307,7 +310,8 @@ endif
307310
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
308311
kubectl apply -f $(MANIFESTPATHTEST)
309312
$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
310-
$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ARANGODIMAGE)" "$(ENTERPRISEIMAGE)" $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
313+
$(ROOTDIR)/scripts/kube_create_license_key_secret.sh "$(DEPLOYMENTNAMESPACE)" '$(ENTERPRISELICENSE)'
314+
$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ARANGODIMAGE)" '$(ENTERPRISEIMAGE)' $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
311315

312316
$(DURATIONTESTBIN): $(GOBUILDDIR) $(SOURCES)
313317
@mkdir -p $(BINDIR)

‎README.md‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,40 +23,41 @@ it is intended to be.
2323

2424
### Production readiness state
2525

26-
| Platform | Kubernetes version | ArangoDB version | State | Production ready | Remarks |
27-
|----------------------|--------------------|------------------|-------|------------------|-|
26+
| Platform | Kubernetes version | ArangoDB version | State | Production ready | Remarks |
27+
|----------------------|--------------------|------------------|-------|------------------|-----------------------|
2828
| Google GKE | 1.10 | >= 3.3.13 | Runs | Yes | Don't use micro nodes |
29-
| Amazon EKS | 1.10 | >= 3.3.13 | Runs | No |
30-
| Amazon & Kops | 1.10 | >= 3.3.13 | Runs | No |
31-
| Azure AKS | 1.10 | >= 3.3.13 | ? | No |
32-
| OpenShift | 1.10 | >= 3.3.13 | Runs | No |
33-
| Pivotal PKS | 1.10 | >= 3.3.13 | ? | No |
34-
| Scaleway Kubernetes | 1.10 | >= 3.3.13 | ? | No |
35-
| Bare metal (kubeadm) | 1.10 | >= 3.3.13 | Runs | No |
36-
| Minikube | 1.10 | >= 3.3.13 | Runs | Not intended |
37-
| Docker for Mac Edge | 1.10 | >= 3.3.13 | Runs | Not intended |
29+
| Google GKE | 1.11 | >= 3.3.13 | Runs | Yes | Don't use micro nodes |
30+
| Amazon EKS | 1.11 | >= 3.3.13 | Runs | Yes | |
31+
| Pivotal PKS | 1.11 | >= 3.3.13 | Runs | Yes | |
32+
| Amazon & Kops | 1.10 | >= 3.3.13 | Runs | No | |
33+
| Azure AKS | 1.10 | >= 3.3.13 | Runs | No | |
34+
| OpenShift | 1.10 | >= 3.3.13 | Runs | No | |
35+
| Bare metal (kubeadm) | 1.10 | >= 3.3.13 | Runs | No | |
36+
| Minikube | 1.10 | >= 3.3.13 | Runs | Not intended | |
37+
| Docker for Mac Edge | 1.10 | >= 3.3.13 | Runs | Not intended | |
38+
| Scaleway Kubernetes | 1.10 | >= 3.3.13 | ? | No | |
3839

3940
## Installation of latest release using Helm
4041

4142
```bash
4243
# The following will install the custom resources required by the operators.
43-
helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.4/kube-arangodb-crd.tgz
44+
helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.5/kube-arangodb-crd.tgz
4445
# The following will install the operator for `ArangoDeployment` &
45-
# `ArangoDeplomentReplication` resources.
46-
helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.4/kube-arangodb.tgz
46+
# `ArangoDeploymentReplication` resources.
47+
helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.5/kube-arangodb.tgz
4748
# To use `ArangoLocalStorage`, also run
48-
helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.4/kube-arangodb-storage.tgz
49+
helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.5/kube-arangodb-storage.tgz
4950
```
5051

5152
## Installation of latest release using Kubectl
5253

5354
```bash
54-
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.4/manifests/arango-crd.yaml
55-
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.4/manifests/arango-deployment.yaml
55+
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.5/manifests/arango-crd.yaml
56+
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.5/manifests/arango-deployment.yaml
5657
# To use `ArangoLocalStorage`, also run
57-
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.4/manifests/arango-storage.yaml
58+
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.5/manifests/arango-storage.yaml
5859
# To use `ArangoDeploymentReplication`, also run
59-
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.4/manifests/arango-deployment-replication.yaml
60+
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.5/manifests/arango-deployment-replication.yaml
6061
```
6162

6263
## Building

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.4+git
1+
0.3.5+git

‎dashboard/assets.go‎

Lines changed: 82 additions & 52 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)