[Bugfix] Add GCP Plugin Support (#1925)

Author: ajanikow

.circleci/continue_config.yml

@@ -27,6 +27,7 @@ executors:
 jobs:
   check-code:
     executor: golang-executor
+    resource_class: xlarge
     environment:
       GOCACHE: "/tmp/go/cache"
       GOPATH: "/tmp/go/path"

CHANGELOG.md

@@ -12,6 +12,7 @@
 - (Bugfix) Enable Probes for Single & Gateway
 - (Bugfix) Fix Gateway Probes with Auth Enabled
 - (Bugfix) Remove Finalizer from Gateway
+- (Bugfix) Add GCP Plugin Support
 
 ## [1.2.49](https://github.com/arangodb/kube-arangodb/tree/1.2.49) (2025-06-17)
 - (Maintenance) Optimize go.mod

pkg/deployment/reconcile/action_runtime_container_image_update.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 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.
@@ -30,7 +30,6 @@ import (
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
 	"github.com/arangodb/kube-arangodb/pkg/deployment/rotation"
 	"github.com/arangodb/kube-arangodb/pkg/util/errors"
-	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
 	kresources "github.com/arangodb/kube-arangodb/pkg/util/k8sutil/resources"
 )
 
@@ -262,8 +261,6 @@ func (a actionRuntimeContainerImageUpdate) CheckProgress(ctx context.Context) (b
 		return true, false, nil
 	}
 
-	groupSpec := a.actionCtx.GetSpec().GetServerGroupSpec(a.action.Group)
-
 	cache, ok := a.actionCtx.ACS().ClusterCache(m.ClusterID)
 	if !ok {
 		a.log.Info("Cluster is not ready")
@@ -276,10 +273,6 @@ func (a actionRuntimeContainerImageUpdate) CheckProgress(ctx context.Context) (b
 		return true, false, nil
 	}
 
-	if err := k8sutil.EnsureFinalizerAbsent(ctx, cache.PodsModInterface().V1(), pod, k8sutil.GetFinalizers(groupSpec, a.action.Group)...); err != nil {
-		a.log.Err(err).Error("Unable to enforce finalizer")
-	}
-
 	name, image, ok := a.getContainerDetails()
 	if !ok {
 		a.log.Info("Unable to find container details")

pkg/platform/init.go

@@ -0,0 +1,23 @@
+//
+// DISCLAIMER
+//
+// Copyright 2025 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 platform
+
+import _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

pkg/platform/package_install.go

@@ -123,11 +123,13 @@ func packageInstallRunInstallRelease(cmd *cobra.Command, h executor.Handler, cli
 			return errors.Errorf("Chart %s is not ready", name)
 		}
 
-		if _, err := client.Arango().PlatformV1alpha1().ArangoPlatformServices(deployment.GetNamespace()).Get(ctx, name, meta.GetOptions{}); err != nil {
+		if svc, err := client.Arango().PlatformV1alpha1().ArangoPlatformServices(deployment.GetNamespace()).Get(ctx, name, meta.GetOptions{}); err != nil {
 			if !kerrors.IsNotFound(err) {
 				return err
 			}
 
+			logger.Debug("Installing Service: %s", name)
+
 			// Prepare Object
 			if _, err := client.Arango().PlatformV1alpha1().ArangoPlatformServices(deployment.GetNamespace()).Create(ctx, &platformApi.ArangoPlatformService{
 				ObjectMeta: meta.ObjectMeta{
@@ -147,31 +149,32 @@ func packageInstallRunInstallRelease(cmd *cobra.Command, h executor.Handler, cli
 			}, meta.CreateOptions{}); err != nil {
 				return err
 			}
-		}
 
-		// Prepare for update
-		svc, err := client.Arango().PlatformV1alpha1().ArangoPlatformServices(deployment.GetNamespace()).Get(ctx, name, meta.GetOptions{})
-		if err != nil {
-			return err
-		}
+			logger.Info("Installed Service: %s", name)
+		} else {
+			if svc.Spec.Deployment.GetName() != deployment.GetName() {
+				return errors.Errorf("Unable to change Deployment name for %s", name)
+			}
 
-		if svc.Spec.Deployment.GetName() != deployment.GetName() {
-			return errors.Errorf("Unable to change Deployment name for %s", name)
-		}
+			if svc.Spec.Chart.GetName() != chart.GetName() {
+				return errors.Errorf("Unable to change Chart name for %s", name)
+			}
 
-		if !svc.Spec.Values.Equals(sharedApi.Any(packageSpec.Overrides)) {
-			svc.Spec.Values = sharedApi.Any(packageSpec.Overrides)
-			_, err := client.Arango().PlatformV1alpha1().ArangoPlatformServices(deployment.GetNamespace()).Update(ctx, svc, meta.UpdateOptions{})
-			if err != nil {
-				return err
+			if !svc.Spec.Values.Equals(sharedApi.Any(packageSpec.Overrides)) {
+				svc.Spec.Values = sharedApi.Any(packageSpec.Overrides)
+				_, err := client.Arango().PlatformV1alpha1().ArangoPlatformServices(deployment.GetNamespace()).Update(ctx, svc, meta.UpdateOptions{})
+				if err != nil {
+					return err
+				}
+				logger.Info("Updated Service: %s", name)
 			}
 		}
 
 		// Ensure we wait for reconcile
 		time.Sleep(time.Second)
 
-		return h.Timeout(ctx, t, func(ctx context.Context, log logging.Logger, t executor.Thread, h executor.Handler) error {
-			svc, err := client.Arango().PlatformV1alpha1().ArangoPlatformServices(svc.GetNamespace()).Get(ctx, svc.GetName(), meta.GetOptions{})
+		if err := h.Timeout(ctx, t, func(ctx context.Context, log logging.Logger, t executor.Thread, h executor.Handler) error {
+			svc, err := client.Arango().PlatformV1alpha1().ArangoPlatformServices(deployment.GetNamespace()).Get(ctx, name, meta.GetOptions{})
 			if err != nil {
 				return err
 			}
@@ -189,7 +192,15 @@ func packageInstallRunInstallRelease(cmd *cobra.Command, h executor.Handler, cli
 			}
 
 			return io.EOF
-		}, 5*time.Minute, time.Second)
+		}, 5*time.Minute, time.Second); err != nil {
+			if errors.Is(err, io.EOF) {
+				return errors.Errorf("Service %s is not ready", name)
+			}
+
+			return err
+		}
+
+		return nil
 	})
 }
 
@@ -247,7 +258,7 @@ func packageInstallRunInstallChart(cmd *cobra.Command, h executor.Handler, clien
 			}
 		}
 
-		return h.Timeout(ctx, t, func(ctx context.Context, log logging.Logger, t executor.Thread, h executor.Handler) error {
+		if err := h.Timeout(ctx, t, func(ctx context.Context, log logging.Logger, t executor.Thread, h executor.Handler) error {
 			c, err := client.Arango().PlatformV1alpha1().ArangoPlatformCharts(ns).Get(ctx, name, meta.GetOptions{})
 			if err != nil {
 				return err
@@ -262,7 +273,15 @@ func packageInstallRunInstallChart(cmd *cobra.Command, h executor.Handler, clien
 			}
 
 			return io.EOF
-		}, 5*time.Minute, time.Second)
+		}, 5*time.Minute, time.Second); err != nil {
+			if errors.Is(err, io.EOF) {
+				return errors.Errorf("Chart %s is not ready", name)
+			}
+
+			return err
+		}
+
+		return nil
 	})
 }
 

pkg/util/k8sutil/helm/chart_manager_test.go

@@ -36,7 +36,7 @@ func limitArray[T any](in []T, max int) []T {
 }
 
 func Test_Manager(t *testing.T) {
-	mgr, err := NewChartManager(context.Background(), nil, "https://arangodb-platform-dev-chart-registry.s3.amazonaws.com/index.yaml")
+	mgr, err := NewChartManager(context.Background(), nil, "https://arangodb-platform-qa-chart-registry.s3.amazonaws.com/index.yaml")
 	require.NoError(t, err)
 
 	for _, repo := range limitArray(mgr.Repositories(), 5) {