Merge branch 'master' into deployment-phase

Author: ewoutp

Jenkinsfile.groovy

@@ -26,6 +26,11 @@ def fetchParamsFromGitLog() {
         myParams[entry.key] = entry.value;
     }
 
+    // Is this a LONG test?
+    if ("${env.JOB_NAME}" == "kube-arangodb-long") {
+        myParams["LONG"] = true;
+    }
+
     // Fetch params configured in git commit messages 
     // Syntax: [ci OPT=value]
     // Example: [ci TESTOPTIONS="-test.run ^TestSimpleSingle$"]

Makefile

@@ -50,6 +50,7 @@ endif
 endif
 MANIFESTPATHDEPLOYMENT := manifests/arango-deployment$(MANIFESTSUFFIX).yaml
 MANIFESTPATHSTORAGE := manifests/arango-storage$(MANIFESTSUFFIX).yaml
+MANIFESTPATHTEST := manifests/arango-test$(MANIFESTSUFFIX).yaml
 ifndef DEPLOYMENTNAMESPACE
 	DEPLOYMENTNAMESPACE := default
 endif
@@ -75,7 +76,7 @@ TESTLENGTHOPTIONS := -test.short
 TESTTIMEOUT := 20m
 ifeq ($(LONG), 1)
 	TESTLENGTHOPTIONS :=
-	TESTTIMEOUT := 40m
+	TESTTIMEOUT := 60m
 endif
 ifdef VERBOSE
 	TESTVERBOSEOPTIONS := -v 
@@ -216,6 +217,7 @@ run-unit-tests: $(GOBUILDDIR) $(SOURCES)
 		golang:$(GOVERSION) \
 		go test $(TESTVERBOSEOPTIONS) \
 			$(REPOPATH)/pkg/apis/deployment/v1alpha \
+			$(REPOPATH)/pkg/apis/storage/v1alpha \
 			$(REPOPATH)/pkg/deployment/reconcile \
 			$(REPOPATH)/pkg/deployment/resources \
 			$(REPOPATH)/pkg/util/k8sutil \
@@ -251,6 +253,7 @@ endif
 	kubectl apply -f manifests/crd.yaml
 	kubectl apply -f $(MANIFESTPATHSTORAGE)
 	kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
+	kubectl apply -f $(MANIFESTPATHTEST)
 	$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
 	$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ENTERPRISEIMAGE)" $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
 ifneq ($(DEPLOYMENTNAMESPACE), default)
@@ -312,6 +315,7 @@ minikube-start:
 
 .PHONY: delete-operator
 delete-operator:
+	kubectl delete -f $(MANIFESTPATHTEST) --ignore-not-found
 	kubectl delete -f $(MANIFESTPATHDEPLOYMENT) --ignore-not-found
 	kubectl delete -f $(MANIFESTPATHSTORAGE) --ignore-not-found
 
@@ -320,4 +324,5 @@ redeploy-operator: delete-operator manifests
 	kubectl apply -f manifests/crd.yaml
 	kubectl apply -f $(MANIFESTPATHSTORAGE)
 	kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
+	kubectl apply -f $(MANIFESTPATHTEST)
 	kubectl get pods 

manifests/.gitignore

@@ -1,2 +1,3 @@
 arango-deployment-dev.yaml
-arango-storage-dev.yaml
+arango-storage-dev.yaml
+arango-test-dev.yaml

manifests/templates/deployment/rbac.yaml

@@ -69,4 +69,4 @@ subjects:
   name: {{ .Deployment.Operator.ServiceAccountName }}
   namespace: {{ .Deployment.Operator.Namespace }}
 
-{{- end -}}
+{{- end -}}

manifests/templates/test/rbac.yaml

@@ -0,0 +1,31 @@
+{{- if .RBAC -}}
+
+## Cluster role granting access to resources needed by the integration tests.
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: {{ .Test.RoleName }}
+rules:
+- apiGroups: [""]
+  resources: ["nodes"]
+  verbs: ["list"]
+
+---
+
+## Bind the cluster role granting access to ArangoLocalStorage resources
+## to the default service account of the configured namespace.
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ .Test.RoleBindingName }}
+  namespace: {{ .Test.Namespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ .Test.RoleName }}
+subjects:
+- kind: ServiceAccount
+  name: {{ .Test.ServiceAccountName }}
+  namespace: {{ .Test.Namespace }}
+
+{{- end -}}

pkg/apis/deployment/v1alpha/member_status.go

@@ -22,6 +22,12 @@
 
 package v1alpha
 
+import (
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
 // MemberStatus holds the current status of a single member (server)
 type MemberStatus struct {
 	// ID holds the unique ID of the member.
@@ -35,4 +41,40 @@ type MemberStatus struct {
 	PodName string `json:"podName,omitempty"`
 	// Conditions specific to this member
 	Conditions ConditionList `json:"conditions,omitempty"`
+	// RecentTerminatons holds the times when this member was recently terminated.
+	// First entry is the oldest. (do not add omitempty, since we want to be able to switch from a list to an empty list)
+	RecentTerminations []metav1.Time `json:"recent-terminations"`
+}
+
+// RemoveTerminationsBefore removes all recent terminations before the given timestamp.
+// It returns the number of terminations that have been removed.
+func (s *MemberStatus) RemoveTerminationsBefore(timestamp time.Time) int {
+	removed := 0
+	for {
+		if len(s.RecentTerminations) == 0 {
+			// Nothing left
+			return removed
+		}
+		if s.RecentTerminations[0].Time.Before(timestamp) {
+			// Let's remove it
+			s.RecentTerminations = s.RecentTerminations[1:]
+			removed++
+		} else {
+			// First (oldest) is not before given timestamp, we're done
+			return removed
+		}
+	}
+}
+
+// RecentTerminationsSince returns the number of terminations since the given timestamp.
+func (s MemberStatus) RecentTerminationsSince(timestamp time.Time) int {
+	count := 0
+	for idx := len(s.RecentTerminations) - 1; idx >= 0; idx-- {
+		if s.RecentTerminations[idx].Time.Before(timestamp) {
+			// This termination is before the timestamp, so we're done
+			return count
+		}
+		count++
+	}
+	return count
 }

pkg/apis/deployment/v1alpha/member_status_test.go

@@ -0,0 +1,53 @@
+//
+// DISCLAIMER
+//
+// Copyright 2018 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+// Author Ewout Prangsma
+//
+
+package v1alpha
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// TestMemberStatusRecentTerminations tests the functions related to MemberStatus.RecentTerminations.
+func TestMemberStatusRecentTerminations(t *testing.T) {
+	relTime := func(delta time.Duration) metav1.Time {
+		return metav1.Time{Time: time.Now().Add(delta)}
+	}
+
+	s := MemberStatus{}
+	assert.Equal(t, 0, s.RecentTerminationsSince(time.Now().Add(-time.Hour)))
+	assert.Equal(t, 0, s.RemoveTerminationsBefore(time.Now()))
+
+	s.RecentTerminations = []metav1.Time{metav1.Now()}
+	assert.Equal(t, 1, s.RecentTerminationsSince(time.Now().Add(-time.Minute)))
+	assert.Equal(t, 0, s.RecentTerminationsSince(time.Now().Add(time.Minute)))
+	assert.Equal(t, 0, s.RemoveTerminationsBefore(time.Now().Add(-time.Hour)))
+
+	s.RecentTerminations = []metav1.Time{relTime(-time.Hour), relTime(-time.Minute), relTime(time.Minute)}
+	assert.Equal(t, 3, s.RecentTerminationsSince(time.Now().Add(-time.Hour*2)))
+	assert.Equal(t, 2, s.RecentTerminationsSince(time.Now().Add(-time.Minute*2)))
+	assert.Equal(t, 2, s.RemoveTerminationsBefore(time.Now()))
+	assert.Len(t, s.RecentTerminations, 1)
+}

pkg/apis/deployment/v1alpha/zz_generated.deepcopy.go

@@ -371,6 +371,13 @@ func (in *MemberStatus) DeepCopyInto(out *MemberStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.RecentTerminations != nil {
+		in, out := &in.RecentTerminations, &out.RecentTerminations
+		*out = make([]v1.Time, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 	return
 }
 

pkg/apis/storage/v1alpha/local_storage_spec.go

@@ -45,6 +45,11 @@ func (s LocalStorageSpec) Validate() error {
 	if len(s.LocalPath) == 0 {
 		return maskAny(errors.Wrapf(ValidationError, "localPath cannot be empty"))
 	}
+	for _, p := range s.LocalPath {
+		if len(p) == 0 {
+			return maskAny(errors.Wrapf(ValidationError, "localPath cannot contain empty strings"))
+		}
+	}
 	return nil
 }
 

pkg/apis/storage/v1alpha/local_storage_spec_test.go

@@ -0,0 +1,58 @@
+//
+// DISCLAIMER
+//
+// Copyright 2018 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+// Author Jan Christoph Uhde
+//
+
+package v1alpha
+
+import (
+	"testing"
+
+	//"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+)
+
+// Test creation of local storage spec
+func TestLocalStorageSpecCreation(t *testing.T) {
+
+	class := StorageClassSpec{"SpecName", true}
+	local := LocalStorageSpec{StorageClass: class, LocalPath: []string{""}}
+	assert.Error(t, local.Validate())
+
+	class = StorageClassSpec{"spec-name", true}
+	local = LocalStorageSpec{StorageClass: class, LocalPath: []string{""}}
+	assert.Error(t, local.Validate(), "should fail as the empty sting is not a valid path")
+
+	class = StorageClassSpec{"spec-name", true}
+	local = LocalStorageSpec{StorageClass: class, LocalPath: []string{}}
+	assert.True(t, IsValidation(local.Validate()))
+}
+
+// Test reset of local storage spec
+func TestLocalStorageSpecReset(t *testing.T) {
+	class := StorageClassSpec{"spec-name", true}
+	source := LocalStorageSpec{StorageClass: class, LocalPath: []string{"/a/path", "/another/path"}}
+	target := LocalStorageSpec{}
+	resetImmutableFieldsResult := source.ResetImmutableFields(&target)
+	expected := []string{"storageClass.name", "localPath"}
+	assert.Equal(t, expected, resetImmutableFieldsResult)
+	assert.Equal(t, source.LocalPath, target.LocalPath)
+	assert.Equal(t, source.StorageClass.Name, target.StorageClass.Name)
+}