Merged in master

Author: ewoutp

pkg/deployment/reconcile/plan_builder.go

@@ -82,7 +82,7 @@ func createPlan(log zerolog.Logger, apiObject k8sutil.APIObject,
 	getTLSKeyfile func(group api.ServerGroup, member api.MemberStatus) (string, error),
 	getTLSCA func(string) (string, string, bool, error),
 	getPVC func(pvcName string) (*v1.PersistentVolumeClaim, error),
-	createEvent func(evt *v1.Event)) (api.Plan, bool) {
+	createEvent func(evt *k8sutil.Event)) (api.Plan, bool) {
 	if len(currentPlan) > 0 {
 		// Plan already exists, complete that first
 		return currentPlan, false

pkg/deployment/reconcile/plan_builder_storage.go

@@ -35,7 +35,7 @@ import (
 // different storage class or a difference in storage resource requirements.
 func createRotateServerStoragePlan(log zerolog.Logger, apiObject k8sutil.APIObject, spec api.DeploymentSpec, status api.DeploymentStatus,
 	getPVC func(pvcName string) (*v1.PersistentVolumeClaim, error),
-	createEvent func(evt *v1.Event)) api.Plan {
+	createEvent func(evt *k8sutil.Event)) api.Plan {
 	if spec.GetMode() == api.DeploymentModeSingle {
 		// Storage cannot be changed in single server deployments
 		return nil

pkg/deployment/reconcile/plan_builder_test.go

@@ -34,6 +34,7 @@ import (
 
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
 	"github.com/arangodb/kube-arangodb/pkg/util"
+	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
 )
 
 // TestCreatePlanSingleScale creates a `single` deployment to test the creating of scaling plan.
@@ -47,7 +48,7 @@ func TestCreatePlanSingleScale(t *testing.T) {
 	getPVC := func(pvcName string) (*v1.PersistentVolumeClaim, error) {
 		return nil, maskAny(fmt.Errorf("Not implemented"))
 	}
-	createEvent := func(evt *v1.Event) {}
+	createEvent := func(evt *k8sutil.Event) {}
 	log := zerolog.Nop()
 	spec := api.DeploymentSpec{
 		Mode: api.NewMode(api.DeploymentModeSingle),
@@ -105,7 +106,7 @@ func TestCreatePlanActiveFailoverScale(t *testing.T) {
 	getPVC := func(pvcName string) (*v1.PersistentVolumeClaim, error) {
 		return nil, maskAny(fmt.Errorf("Not implemented"))
 	}
-	createEvent := func(evt *v1.Event) {}
+	createEvent := func(evt *k8sutil.Event) {}
 	log := zerolog.Nop()
 	spec := api.DeploymentSpec{
 		Mode: api.NewMode(api.DeploymentModeActiveFailover),
@@ -180,7 +181,7 @@ func TestCreatePlanClusterScale(t *testing.T) {
 	getPVC := func(pvcName string) (*v1.PersistentVolumeClaim, error) {
 		return nil, maskAny(fmt.Errorf("Not implemented"))
 	}
-	createEvent := func(evt *v1.Event) {}
+	createEvent := func(evt *k8sutil.Event) {}
 	log := zerolog.Nop()
 	spec := api.DeploymentSpec{
 		Mode: api.NewMode(api.DeploymentModeCluster),

pkg/util/k8sutil/events.go

@@ -173,7 +173,7 @@ func NewPlanAbortedEvent(apiObject APIObject, itemType, memberID, role string) *
 
 // NewCannotChangeStorageClassEvent creates an event indicating that an item would need to use a different StorageClass,
 // but this is not possible for the given reason.
-func NewCannotChangeStorageClassEvent(apiObject APIObject, memberID, role, subReason string) *v1.Event {
+func NewCannotChangeStorageClassEvent(apiObject APIObject, memberID, role, subReason string) *Event {
 	event := newDeploymentEvent(apiObject)
 	event.Type = v1.EventTypeNormal
 	event.Reason = fmt.Sprintf("%s Member StorageClass Cannot Change", strings.Title(role))