arangodb · ajanikow · May 3, 2024 · May 2, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - (Feature) (ML) Unify API
 - (Feature) (ML) Add TLS Secrets
 - (Feature) (ML) Allow to change API port
+- (Feature) (ML) Enable TLS
 
 ## [1.2.40](https://github.com/arangodb/kube-arangodb/tree/1.2.40) (2024-04-10)
 - (Feature) Add Core fields to the Scheduler Container Spec

diff --git a/pkg/apis/ml/v1alpha1/conditions.go b/pkg/apis/ml/v1alpha1/conditions.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2023 ArangoDB GmbH, Cologne, Germany
+// Copyright 2023-2024 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.
@@ -32,6 +32,7 @@ const (
 	ExtensionMetadataServiceValidCondition api.ConditionType = "MetadataServiceValid"
 	ExtensionServiceAccountReadyCondition  api.ConditionType = "ServiceAccountReady"
 	ExtensionStatefulSetReadyCondition     api.ConditionType = "ExtensionDeploymentReady"
+	ExtensionTLSEnabledCondition           api.ConditionType = "TLSEnabled"
 	LicenseValidCondition                  api.ConditionType = "LicenseValid"
 	CronJobSyncedCondition                 api.ConditionType = "CronJobSynced"
 	BatchJobSyncedCondition                api.ConditionType = "BatchJobSynced"

diff --git a/pkg/apis/ml/v1alpha1/extension_spec_deployment_tls.go b/pkg/apis/ml/v1alpha1/extension_spec_deployment_tls.go
@@ -27,3 +27,19 @@ type ArangoMLExtensionSpecDeploymentTLS struct {
 	// AltNames define TLS AltNames used when TLS on the ArangoDB is enabled
 	AltNames []string `json:"altNames,omitempty"`
 }
+
+func (a *ArangoMLExtensionSpecDeploymentTLS) IsEnabled() bool {
+	if a == nil || a.Enabled == nil {
+		return true
+	}
+
+	return *a.Enabled
+}
+
+func (a *ArangoMLExtensionSpecDeploymentTLS) GetAltNames() []string {
+	if a == nil || a.AltNames == nil {
+		return nil
+	}
+
+	return a.AltNames
+}
diff --git a/pkg/util/k8sutil/helpers/updator.go b/pkg/util/k8sutil/helpers/updator.go
@@ -0,0 +1,244 @@
+//
+// DISCLAIMER
+//
+// Copyright 2024 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 helpers
+
+import (
+	"context"
+
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	sharedApi "github.com/arangodb/kube-arangodb/pkg/apis/shared/v1"
+	"github.com/arangodb/kube-arangodb/pkg/logging"
+	operator "github.com/arangodb/kube-arangodb/pkg/operatorV2"
+	"github.com/arangodb/kube-arangodb/pkg/util"
+	"github.com/arangodb/kube-arangodb/pkg/util/errors"
+	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/kerrors"
+)
+
+type Action int
+
+func (a Action) Or(b Action) Action {
+	if b > a {
+		return b
+	}
+
+	return a
+}
+
+const (
+	ActionOK Action = iota
+	ActionReplace
+	ActionUpdate
+)
+
+type Object interface {
+	comparable
+	meta.Object
+}
+
+type Client[T Object] interface {
+	Get(ctx context.Context, name string, options meta.GetOptions) (T, error)
+	Update(ctx context.Context, object T, options meta.UpdateOptions) (T, error)
+	Create(ctx context.Context, object T, options meta.CreateOptions) (T, error)
+	Delete(ctx context.Context, name string, options meta.DeleteOptions) error
+}
+
+type Generate[T Object] func(ctx context.Context, ref *sharedApi.Object) (T, bool, string, error)
+
+func OperatorUpdate[T Object](ctx context.Context, logger logging.Logger, client Client[T], ref **sharedApi.Object, generator Generate[T], decisions ...Decision[T]) (bool, error) {
+	changed, err := Update[T](ctx, logger, client, ref, generator, decisions...)
+	if err != nil {
+		return false, err
+	}
+
+	if changed {
+		return true, operator.Reconcile("Change in resources")
+	}
+
+	return false, nil
+}
+
+func Update[T Object](ctx context.Context, logger logging.Logger, client Client[T], ref **sharedApi.Object, generator Generate[T], decisions ...Decision[T]) (bool, error) {
+	decision := Decision[T](EmptyDecision[T]).With(decisions...)
+
+	if ref == nil {
+		return false, errors.Errorf("Reference is nil")
+	}
+
+	currentRef := *ref
+
+	var discoveredObject T
+	var discoveredObjectExists bool
+
+	if currentRef != nil {
+		object, err := util.WithKubernetesContextTimeoutP2A2(ctx, client.Get, currentRef.GetName(), meta.GetOptions{})
+		if err != nil {
+			if !kerrors.Is(err, kerrors.NotFound) {
+				return false, err
+			}
+
+			*ref = nil
+			logger.
+				Str("name", currentRef.GetName()).
+				Str("checksum", currentRef.GetChecksum()).
+				Str("uid", string(currentRef.GetUID())).
+				Debug("Object has been removed")
+
+			return true, nil
+		}
+
+		if object.GetDeletionTimestamp() != nil {
+			// Object is currently deleting
+			logger.
+				Str("name", currentRef.GetName()).
+				Str("checksum", currentRef.GetChecksum()).
+				Str("uid", string(currentRef.GetUID())).
+				Debug("Object is currently deleting")
+			return true, nil
+		}
+
+		if object.GetUID() != currentRef.GetUID() {
+			logger.
+				Str("name", currentRef.GetName()).
+				Str("checksum", currentRef.GetChecksum()).
+				Str("uid", string(currentRef.GetUID())).
+				Warn("Recreation Required as UID changed")
+
+			if err := util.WithKubernetesContextTimeoutP1A2(ctx, client.Delete, currentRef.GetName(), meta.DeleteOptions{}); err != nil {
+				if !kerrors.Is(err, kerrors.NotFound) {
+					return false, err
+				}
+			}
+
+			return true, nil
+		}
+
+		discoveredObject = object
+		discoveredObjectExists = true
+	}
+
+	object, skip, checksum, err := generator(ctx, currentRef.DeepCopy())
+	if err != nil {
+		return false, err
+	}
+
+	if skip {
+		// Skip update as it is not required
+		return false, nil
+	}
+
+	if object == util.Default[T]() {
+		// Object is supposed to be removed
+		if currentRef == nil {
+			// Nothing to do
+			return false, nil
+		}
+
+		// Remove object
+		if err := util.WithKubernetesContextTimeoutP1A2(ctx, client.Delete, currentRef.GetName(), meta.DeleteOptions{}); err != nil {
+			if !kerrors.Is(err, kerrors.NotFound) {
+				return false, err
+			}
+		}
+
+		logger.
+			Str("name", currentRef.GetName()).
+			Str("checksum", currentRef.GetChecksum()).
+			Str("uid", string(currentRef.GetUID())).
+			Info("Object deletion has been requested")
+
+		return true, nil
+	}
+
+	if !discoveredObjectExists {
+		// Let's create Object
+		newObject, err := util.WithKubernetesContextTimeoutP2A2(ctx, client.Create, object, meta.CreateOptions{})
+		if err != nil {
+			return false, err
+		}
+
+		currentRef = util.NewType(sharedApi.NewObjectWithChecksum(newObject, checksum))
+		*ref = currentRef
+		logger.
+			Str("name", currentRef.GetName()).
+			Str("checksum", currentRef.GetChecksum()).
+			Str("uid", string(currentRef.GetUID())).
+			Info("Object has been created")
+
+		return true, nil
+	}
+
+	// Object exists, lets check if update is required
+	action, err := decision(ctx, DecisionObject[T]{
+		Checksum: currentRef.GetChecksum(),
+		Object:   discoveredObject,
+	}, DecisionObject[T]{
+		Checksum: checksum,
+		Object:   object,
+	})
+	if err != nil {
+		return false, err
+	}
+
+	switch action {
+	case ActionOK:
+		// Nothing to do
+		return false, nil
+	case ActionReplace:
+		// Object needs to be removed
+		logger.
+			Str("name", currentRef.GetName()).
+			Str("checksum", currentRef.GetChecksum()).
+			Str("uid", string(currentRef.GetUID())).
+			Info("Object needs to be replaced")
+
+		if err := util.WithKubernetesContextTimeoutP1A2(ctx, client.Delete, currentRef.GetName(), meta.DeleteOptions{}); err != nil {
+			if !kerrors.Is(err, kerrors.NotFound) {
+				return false, err
+			}
+		}
+
+		return true, nil
+	case ActionUpdate:
+		logger.
+			Str("name", currentRef.GetName()).
+			Str("checksum", currentRef.GetChecksum()).
+			Str("uid", string(currentRef.GetUID())).
+			Info("Object needs to be updated in-place")
+
+		newObject, err := util.WithKubernetesContextTimeoutP2A2(ctx, client.Update, object, meta.UpdateOptions{})
+		if err != nil {
+			if !kerrors.Is(err, kerrors.NotFound) {
+				return false, err
+			}
+
+			// Reconcile if object was not found
+			return true, nil
+		}
+
+		*ref = util.NewType(sharedApi.NewObjectWithChecksum(newObject, checksum))
+
+		return true, nil
+
+	default:
+		return false, errors.Errorf("Unknown action returned")
+	}
+}
diff --git a/pkg/util/k8sutil/helpers/updator_decition.go b/pkg/util/k8sutil/helpers/updator_decition.go
@@ -0,0 +1,85 @@
+//
+// DISCLAIMER
+//
+// Copyright 2024 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 helpers
+
+import (
+	"context"
+	"reflect"
+)
+
+type DecisionObject[T Object] struct {
+	Checksum string
+	Object   T
+}
+
+func EmptyDecision[T Object](ctx context.Context, current, expected DecisionObject[T]) (Action, error) {
+	return ActionOK, nil
+}
+
+type Decision[T Object] func(ctx context.Context, current, expected DecisionObject[T]) (Action, error)
+
+func (d Decision[T]) Call(ctx context.Context, current, expected DecisionObject[T]) (Action, error) {
+	if d == nil {
+		return EmptyDecision[T](ctx, current, expected)
+	}
+
+	return d(ctx, current, expected)
+}
+
+func (d Decision[T]) With(other ...Decision[T]) Decision[T] {
+	return func(ctx context.Context, current, expected DecisionObject[T]) (Action, error) {
+		action, err := d.Call(ctx, current, expected)
+		if err != nil {
+			return 0, err
+		}
+
+		for _, o := range other {
+			if action == ActionReplace {
+				return ActionReplace, nil
+			}
+
+			otherAction, err := o.Call(ctx, current, expected)
+			if err != nil {
+				return 0, err
+			}
+
+			action = action.Or(otherAction)
+		}
+
+		return action, nil
+	}
+}
+
+func ReplaceChecksum[T Object](ctx context.Context, current, expected DecisionObject[T]) (Action, error) {
+	if current.Checksum != expected.Checksum {
+		return ActionReplace, nil
+	}
+
+	return ActionOK, nil
+}
+
+func UpdateOwnerReference[T Object](ctx context.Context, current, expected DecisionObject[T]) (Action, error) {
+	if !reflect.DeepEqual(current.Object.GetOwnerReferences(), expected.Object.GetOwnerReferences()) {
+		return ActionUpdate, nil
+	}
+
+	return ActionOK, nil
+}