[Feature] Allow to disable external port (#906)

Author: ajanikow

CHANGELOG.md

@@ -8,6 +8,7 @@
 - (ARM64) Add support for ARM64 enablement
 - (Cleanup) Reorganize main reconciliation context
 - (Bugfix) Unreachable condition
+- (Feature) Allow to disable external port (sidecar managed connection)
 
 ## [1.2.7](https://github.com/arangodb/kube-arangodb/tree/1.2.7) (2022-01-17)
 - Add Plan BackOff functionality

pkg/apis/deployment/v1/conditions.go

@@ -22,7 +22,7 @@ package v1
 
 import (
 	"github.com/arangodb/kube-arangodb/pkg/util"
-	v1 "k8s.io/api/core/v1"
+	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -102,7 +102,7 @@ type Condition struct {
 	// Type of  condition.
 	Type ConditionType `json:"type"`
 	// Status of the condition, one of True, False, Unknown.
-	Status v1.ConditionStatus `json:"status"`
+	Status core.ConditionStatus `json:"status"`
 	// The last time this condition was updated.
 	LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"`
 	// Last time the condition transitioned from one status to another.
@@ -116,7 +116,18 @@ type Condition struct {
 }
 
 func (c Condition) IsTrue() bool {
-	return c.Status == v1.ConditionTrue
+	return c.Status == core.ConditionTrue
+}
+
+// Equal checks for equality
+func (c Condition) Equal(other Condition) bool {
+	return c.Type == other.Type &&
+		c.Status == other.Status &&
+		util.TimeCompareEqual(c.LastUpdateTime, other.LastUpdateTime) &&
+		util.TimeCompareEqual(c.LastTransitionTime, other.LastTransitionTime) &&
+		c.Reason == other.Reason &&
+		c.Message == other.Message &&
+		c.Hash == other.Hash
 }
 
 // ConditionList is a list of conditions.
@@ -143,30 +154,20 @@ func (list ConditionList) Equal(other ConditionList) bool {
 	return true
 }
 
-// Equal checks for equality
-func (c Condition) Equal(other Condition) bool {
-	return c.Type == other.Type &&
-		c.Status == other.Status &&
-		util.TimeCompareEqual(c.LastUpdateTime, other.LastUpdateTime) &&
-		util.TimeCompareEqual(c.LastTransitionTime, other.LastTransitionTime) &&
-		c.Reason == other.Reason &&
-		c.Message == other.Message &&
-		c.Hash == other.Hash
-}
-
 // IsTrue return true when a condition with given type exists and its status is `True`.
 func (list ConditionList) IsTrue(conditionType ConditionType) bool {
 	c, found := list.Get(conditionType)
 	return found && c.IsTrue()
 }
 
-// GetValue returns *bool value in case if condition exists, nil otherwise
-func (list ConditionList) GetValue(conditionType ConditionType) *bool {
-	c, found := list.Get(conditionType)
-	if found {
-		return util.NewBool(c.IsTrue())
+// Check create a condition checker.
+func (list ConditionList) Check(conditionType ConditionType) ConditionCheck {
+	c, ok := list.Get(conditionType)
+
+	return conditionCheck{
+		condition: c,
+		exists:    ok,
 	}
-	return nil
 }
 
 // Get a condition by type.
@@ -211,9 +212,9 @@ func (list ConditionList) Index(conditionType ConditionType) int {
 
 func (list *ConditionList) update(conditionType ConditionType, status bool, reason, message, hash string) bool {
 	src := *list
-	statusX := v1.ConditionFalse
+	statusX := core.ConditionFalse
 	if status {
-		statusX = v1.ConditionTrue
+		statusX = core.ConditionTrue
 	}
 
 	index := list.Index(conditionType)

pkg/apis/deployment/v1/conditions_check.go

@@ -0,0 +1,102 @@
+//
+// DISCLAIMER
+//
+// Copyright 2016-2022 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
+//
+
+package v1
+
+import "time"
+
+type ConditionCheck interface {
+	Evaluate() bool
+
+	Exists() ConditionCheck
+	IsTrue() ConditionCheck
+	IsFalse() ConditionCheck
+
+	LastTransition(d time.Duration) ConditionCheck
+}
+
+var _ ConditionCheck = conditionCheck{}
+
+type conditionCheck struct {
+	condition Condition
+	exists    bool
+}
+
+func (c conditionCheck) LastTransition(d time.Duration) ConditionCheck {
+	if c.exists && (!c.condition.LastTransitionTime.IsZero() && time.Since(c.condition.LastTransitionTime.Time) >= d) {
+		return c
+	}
+
+	return newConditionCheckConst(false)
+}
+
+func (c conditionCheck) IsTrue() ConditionCheck {
+	if c.condition.IsTrue() {
+		return c
+	}
+
+	return newConditionCheckConst(false)
+}
+
+func (c conditionCheck) IsFalse() ConditionCheck {
+	if !c.condition.IsTrue() {
+		return c
+	}
+
+	return newConditionCheckConst(false)
+}
+
+func (c conditionCheck) Evaluate() bool {
+	return true
+}
+
+func (c conditionCheck) Exists() ConditionCheck {
+	if c.exists {
+		return c
+	}
+
+	return newConditionCheckConst(false)
+}
+
+func newConditionCheckConst(c bool) ConditionCheck {
+	return conditionCheckConst(c)
+}
+
+type conditionCheckConst bool
+
+func (c conditionCheckConst) LastTransition(d time.Duration) ConditionCheck {
+	return c
+}
+
+func (c conditionCheckConst) IsTrue() ConditionCheck {
+	return c
+}
+
+func (c conditionCheckConst) IsFalse() ConditionCheck {
+	return c
+}
+
+func (c conditionCheckConst) Evaluate() bool {
+	return bool(c)
+}
+
+func (c conditionCheckConst) Exists() ConditionCheck {
+	return c
+}