[Feature] Use Version Consts (#1946)

ajanikow · web-flow · commit ad5452dfb7c3 · 2025-07-25T16:59:52.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - (Feature) Define OptionalReplace Upgrade Mode option
 - (Feature) OptionalReplace Upgrade Mode
 - (Feature) Update GoDriver
+- (Feature) Use Version Consts
 
 ## [1.2.50](https://github.com/arangodb/kube-arangodb/tree/1.2.50) (2025-07-04)
 - (Feature) (Platform) MetaV1 Integration Service
diff --git a/Makefile b/Makefile
@@ -1017,7 +1017,7 @@ synchronize-v2alpha1-with-v1:
 	@echo ">> Please use only COMMUNITY mode! Current RELEASE_MODE=$(RELEASE_MODE)"
 	@rm -f pkg/apis/deployment/v1/zz_generated.deepcopy.go pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go
 	@for file in $$(find "$(ROOT)/pkg/apis/deployment/v1/" -type f -exec $(REALPATH) --relative-to "$(ROOT)/pkg/apis/deployment/v1/" {} \;); do if [ ! -d "$(ROOT)/pkg/apis/deployment/v2alpha1/$$(dirname $${file})" ]; then mkdir -p "$(ROOT)/pkg/apis/deployment/v2alpha1/$$(dirname $${file})"; fi; done
-	@for file in $$(find "$(ROOT)/pkg/apis/deployment/v1/" -type f -exec $(REALPATH) --relative-to "$(ROOT)/pkg/apis/deployment/v1/" {} \;); do cat "$(ROOT)/pkg/apis/deployment/v1/$${file}" | $(SED) "s#package v1#package v2alpha1#g" | $(SED) 's#ArangoDeploymentVersion = "v1"#ArangoDeploymentVersion = "v2alpha1"#g' > "$(ROOT)/pkg/apis/deployment/v2alpha1/$${file}"; done
+	@for file in $$(find "$(ROOT)/pkg/apis/deployment/v1/" -type f -exec $(REALPATH) --relative-to "$(ROOT)/pkg/apis/deployment/v1/" {} \;); do cat "$(ROOT)/pkg/apis/deployment/v1/$${file}" | $(SED) "s#package v1#package v2alpha1#g" | $(SED) 's#ArangoDeploymentVersion = constants.VersionV1#ArangoDeploymentVersion = constants.VersionV2Alpha1#g' > "$(ROOT)/pkg/apis/deployment/v2alpha1/$${file}"; done
 	@make update-generated
 	@make set-deployment-api-version-v2alpha1 bin
 	@make set-deployment-api-version-v1 bin
diff --git a/pkg/apis/analytics/v1alpha1/register.go b/pkg/apis/analytics/v1alpha1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2024-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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/analytics"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoAnalyticsVersion = "v1alpha1"
+	ArangoAnalyticsVersion = constants.VersionV1Alpha1
 )
 
 var (
diff --git a/pkg/apis/apps/v1/register.go b/pkg/apis/apps/v1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/apps"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoAppsVersion = "v1"
+	ArangoAppsVersion = constants.VersionV1
 )
 
 var (
diff --git a/pkg/apis/backup/v1/register.go b/pkg/apis/backup/v1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/backup"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoBackupVersion = "v1"
+	ArangoBackupVersion = constants.VersionV1
 )
 
 var (
diff --git a/pkg/apis/deployment/v1/register.go b/pkg/apis/deployment/v1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/deployment"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoDeploymentVersion = "v1"
+	ArangoDeploymentVersion = constants.VersionV1
 )
 
 var (
diff --git a/pkg/apis/deployment/v2alpha1/register.go b/pkg/apis/deployment/v2alpha1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/deployment"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoDeploymentVersion = "v2alpha1"
+	ArangoDeploymentVersion = constants.VersionV2Alpha1
 )
 
 var (
diff --git a/pkg/apis/ml/v1alpha1/register.go b/pkg/apis/ml/v1alpha1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2023 ArangoDB GmbH, Cologne, Germany
+// Copyright 2023-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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/ml"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoMLVersion = "v1alpha1"
+	ArangoMLVersion = constants.VersionV1Alpha1
 )
 
 var (
diff --git a/pkg/apis/ml/v1beta1/register.go b/pkg/apis/ml/v1beta1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2024-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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/ml"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoMLVersion = "v1beta1"
+	ArangoMLVersion = constants.VersionV1Beta1
 )
 
 var (
diff --git a/pkg/apis/networking/v1alpha1/register.go b/pkg/apis/networking/v1alpha1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2023-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2023-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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/networking"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoNetworkingVersion = "v1alpha1"
+	ArangoNetworkingVersion = constants.VersionV1Alpha1
 )
 
 var (
diff --git a/pkg/apis/platform/v1alpha1/register.go b/pkg/apis/platform/v1alpha1/register.go
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/platform"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoPlatformVersion = "v1alpha1"
+	ArangoPlatformVersion = constants.VersionV1Alpha1
 )
 
 var (
diff --git a/pkg/apis/replication/v1/register.go b/pkg/apis/replication/v1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/replication"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoDeploymentReplicationVersion = "v1"
+	ArangoDeploymentReplicationVersion = constants.VersionV1
 )
 
 var (
diff --git a/pkg/apis/replication/v2alpha1/register.go b/pkg/apis/replication/v2alpha1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/replication"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoDeploymentReplicationVersion = "v2alpha1"
+	ArangoDeploymentReplicationVersion = constants.VersionV2Alpha1
 )
 
 var (
diff --git a/pkg/apis/scheduler/v1alpha1/register.go b/pkg/apis/scheduler/v1alpha1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2024-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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/scheduler"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoSchedulerVersion = "v1alpha1"
+	ArangoSchedulerVersion = constants.VersionV1Alpha1
 )
 
 var (
diff --git a/pkg/apis/scheduler/v1beta1/register.go b/pkg/apis/scheduler/v1beta1/register.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2024-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.
@@ -26,10 +26,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/scheduler"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 const (
-	ArangoSchedulerVersion = "v1beta1"
+	ArangoSchedulerVersion = constants.VersionV1Beta1
 )
 
 var (
diff --git a/pkg/handlers/networking/route/handler.go b/pkg/handlers/networking/route/handler.go
@@ -33,6 +33,7 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/operatorV2/event"
 	"github.com/arangodb/kube-arangodb/pkg/operatorV2/operation"
 	"github.com/arangodb/kube-arangodb/pkg/util"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/kerrors"
 )
 
@@ -116,8 +117,6 @@ func (h *handler) HandleSpecValidity(ctx context.Context, item operation.Item, e
 
 func (h *handler) CanBeHandled(item operation.Item) bool {
 	return item.Group == Group() &&
-		item.Version == Version() &&
+		constants.IsCompatible(Version(), item.Version) &&
 		item.Kind == Kind()
 }
-
-func (h *handler) init() {}
diff --git a/pkg/handlers/networking/route/register.go b/pkg/handlers/networking/route/register.go
@@ -48,8 +48,6 @@ func RegisterInformer(operator operator.Operator, recorder event.Recorder, clien
 		operator: operator,
 	}
 
-	h.init()
-
 	if err := operator.RegisterHandler(h); err != nil {
 		return err
 	}
diff --git a/pkg/handlers/networking/route/suite_test.go b/pkg/handlers/networking/route/suite_test.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2024-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.
@@ -42,8 +42,6 @@ func newFakeHandler() *handler {
 		operator:      operator.NewOperator("mock", "mock", "mock"),
 	}
 
-	h.init()
-
 	return h
 }
 
diff --git a/pkg/handlers/platform/chart/handler.go b/pkg/handlers/platform/chart/handler.go
@@ -35,6 +35,7 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/operatorV2/event"
 	"github.com/arangodb/kube-arangodb/pkg/operatorV2/operation"
 	"github.com/arangodb/kube-arangodb/pkg/util"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/helm"
 )
 
@@ -183,7 +184,7 @@ func (h *handler) HandleSpecData(ctx context.Context, item operation.Item, exten
 
 func (h *handler) CanBeHandled(item operation.Item) bool {
 	return item.Group == Group() &&
-		item.Version == Version() &&
+		constants.IsCompatible(Version(), item.Version) &&
 		item.Kind == Kind()
 }
 
diff --git a/pkg/handlers/platform/service/handler.go b/pkg/handlers/platform/service/handler.go
@@ -40,6 +40,7 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/operatorV2/operation"
 	"github.com/arangodb/kube-arangodb/pkg/platform/labels"
 	"github.com/arangodb/kube-arangodb/pkg/util"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/helm"
 	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/patcher"
 )
@@ -436,6 +437,6 @@ func extractReleaseStatusInfo(in helm.ReleaseInfo) platformApi.ArangoPlatformSer
 
 func (h *handler) CanBeHandled(item operation.Item) bool {
 	return item.Group == Group() &&
-		item.Version == Version() &&
+		constants.IsCompatible(Version(), item.Version) &&
 		item.Kind == Kind()
 }
diff --git a/pkg/handlers/platform/storage/handler.go b/pkg/handlers/platform/storage/handler.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2024-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.
@@ -34,6 +34,7 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/operatorV2/event"
 	"github.com/arangodb/kube-arangodb/pkg/operatorV2/operation"
 	"github.com/arangodb/kube-arangodb/pkg/util"
+	"github.com/arangodb/kube-arangodb/pkg/util/constants"
 )
 
 var logger = logging.Global().RegisterAndGetLogger("platform-storage-operator", logging.Info)
@@ -115,6 +116,6 @@ func (h *handler) HandleSpecValidity(ctx context.Context, item operation.Item, e
 
 func (h *handler) CanBeHandled(item operation.Item) bool {
 	return item.Group == Group() &&
-		item.Version == Version() &&
+		constants.IsCompatible(Version(), item.Version) &&
 		item.Kind == Kind()
 }
diff --git a/pkg/util/constants/versions.go b/pkg/util/constants/versions.go
