Merge branch 'master' into fixed-tag-for-jenkins

arangodb · Mar 13, 2018 · e09dceb · e09dceb
2 parents c4b78ae + d7b3196
commit e09dceb
Show file tree

Hide file tree

Showing 25 changed files with 13 additions and 846 deletions.
diff --git a/Makefile b/Makefile
@@ -208,7 +208,7 @@ run-unit-tests: $(GOBUILDDIR) $(SOURCES)
 		-w /usr/code/ \
 		golang:$(GOVERSION) \
 		go test $(TESTVERBOSEOPTIONS) \
-			$(REPOPATH)/pkg/apis/arangodb/v1alpha \
+			$(REPOPATH)/pkg/apis/deployment/v1alpha \
 			$(REPOPATH)/pkg/deployment \
 			$(REPOPATH)/pkg/util/k8sutil \
 			$(REPOPATH)/pkg/util/k8sutil/test

diff --git a/pkg/deployment/plan_builder_test.go b/pkg/deployment/plan_builder_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	api "github.com/arangodb/k8s-operator/pkg/apis/arangodb/v1alpha"
+	api "github.com/arangodb/k8s-operator/pkg/apis/deployment/v1alpha"
 )
 
 // TestCreatePlanSingleScale creates a `single` deployment to test the creating of scaling plan.

diff --git a/pkg/deployment/pod_creator_agent_args_test.go b/pkg/deployment/pod_creator_agent_args_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	api "github.com/arangodb/k8s-operator/pkg/apis/arangodb/v1alpha"
+	api "github.com/arangodb/k8s-operator/pkg/apis/deployment/v1alpha"
 )
 
 // TestCreateArangodArgsAgent tests createArangodArgs for agent.

diff --git a/pkg/deployment/pod_creator_coordinator_args_test.go b/pkg/deployment/pod_creator_coordinator_args_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	api "github.com/arangodb/k8s-operator/pkg/apis/arangodb/v1alpha"
+	api "github.com/arangodb/k8s-operator/pkg/apis/deployment/v1alpha"
 )
 
 // TestCreateArangodArgsCoordinator tests createArangodArgs for coordinator.

diff --git a/pkg/deployment/pod_creator_dbserver_args_test.go b/pkg/deployment/pod_creator_dbserver_args_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	api "github.com/arangodb/k8s-operator/pkg/apis/arangodb/v1alpha"
+	api "github.com/arangodb/k8s-operator/pkg/apis/deployment/v1alpha"
 )
 
 // TestCreateArangodArgsDBServer tests createArangodArgs for dbserver.

diff --git a/pkg/deployment/pod_creator_single_args_test.go b/pkg/deployment/pod_creator_single_args_test.go
@@ -27,7 +27,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	api "github.com/arangodb/k8s-operator/pkg/apis/arangodb/v1alpha"
+	api "github.com/arangodb/k8s-operator/pkg/apis/deployment/v1alpha"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/generated/clientset/versioned/typed/arangodb/v1alpha/arangodb_client.go b/pkg/generated/clientset/versioned/typed/arangodb/v1alpha/arangodb_client.go
diff --git a/pkg/generated/clientset/versioned/typed/arangodb/v1alpha/arangodeployment.go b/pkg/generated/clientset/versioned/typed/arangodb/v1alpha/arangodeployment.go
diff --git a/pkg/generated/clientset/versioned/typed/arangodb/v1alpha/doc.go b/pkg/generated/clientset/versioned/typed/arangodb/v1alpha/doc.go
diff --git a/pkg/generated/clientset/versioned/typed/arangodb/v1alpha/fake/doc.go b/pkg/generated/clientset/versioned/typed/arangodb/v1alpha/fake/doc.go