Skip to content

Commit 1be2e08

Browse files
ajanikowajanikow
authored
[Bugfix] Move helpers to V1Beta1 (#1949)
1 parent 7b96b1c commit 1be2e08

File tree

196 files changed

+1049
-1028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+1049
-1028
lines changed

‎.golangci.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@ linters-settings:
183183
pkg: github.com/envoyproxy/go-control-plane/envoy/config/route/v3
184184
- alias: monitoringApi
185185
pkg: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1
186+
- alias: inspectorConstants
187+
pkg: github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/constants
188+
- alias: utilConstants
189+
pkg: github.com/arangodb/kube-arangodb/pkg/util/constants
186190
- alias: apps
187191
pkg: k8s.io/api/apps/v1
188192
- alias: batch

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
- (Feature) Update GoDriver
2020
- (Feature) Use Version Consts
2121
- (Maintenace) 1.3.x Release Preparation
22+
- (Bugfix) Move Helpers to V1Beta1
2223

2324
## [1.2.50](https://github.com/arangodb/kube-arangodb/tree/1.2.50) (2025-07-04)
2425
- (Feature) (Platform) MetaV1 Integration Service

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ synchronize-v2alpha1-with-v1:
10171017
@echo ">> Please use only COMMUNITY mode! Current RELEASE_MODE=$(RELEASE_MODE)"
10181018
@rm -f pkg/apis/deployment/v1/zz_generated.deepcopy.go pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go
10191019
@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
1020-
@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
1020+
@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 = string(utilConstants.VersionV1)#ArangoDeploymentVersion = string(utilConstants.VersionV2Alpha1)#g' > "$(ROOT)/pkg/apis/deployment/v2alpha1/$${file}"; done
10211021
@make update-generated
10221022
@make set-deployment-api-version-v2alpha1 bin
10231023
@make set-deployment-api-version-v1 bin

‎cmd/admin.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import (
4444
shared "github.com/arangodb/kube-arangodb/pkg/apis/shared"
4545
"github.com/arangodb/kube-arangodb/pkg/util"
4646
"github.com/arangodb/kube-arangodb/pkg/util/cli"
47-
"github.com/arangodb/kube-arangodb/pkg/util/constants"
47+
utilConstants "github.com/arangodb/kube-arangodb/pkg/util/constants"
4848
"github.com/arangodb/kube-arangodb/pkg/util/errors"
4949
"github.com/arangodb/kube-arangodb/pkg/util/globals"
5050
"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
@@ -303,9 +303,9 @@ func getAgencyState(ctx context.Context, conn connection.Connection) (io.ReadClo
303303
func getDeploymentAndCredentials(ctx context.Context,
304304
deploymentName string) (d api.ArangoDeployment, certCA *x509.CertPool, auth connection.Authentication, err error) {
305305

306-
namespace := os.Getenv(constants.EnvOperatorPodNamespace)
306+
namespace := os.Getenv(utilConstants.EnvOperatorPodNamespace)
307307
if len(namespace) == 0 {
308-
err = errors.New(fmt.Sprintf("\"%s\" environment variable missing", constants.EnvOperatorPodNamespace))
308+
err = errors.New(fmt.Sprintf("\"%s\" environment variable missing", utilConstants.EnvOperatorPodNamespace))
309309
return
310310
}
311311

‎cmd/cmd.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import (
5858
"github.com/arangodb/kube-arangodb/pkg/server"
5959
"github.com/arangodb/kube-arangodb/pkg/util"
6060
"github.com/arangodb/kube-arangodb/pkg/util/cli"
61-
"github.com/arangodb/kube-arangodb/pkg/util/constants"
61+
utilConstants "github.com/arangodb/kube-arangodb/pkg/util/constants"
6262
"github.com/arangodb/kube-arangodb/pkg/util/errors"
6363
"github.com/arangodb/kube-arangodb/pkg/util/globals"
6464
operatorHTTP "github.com/arangodb/kube-arangodb/pkg/util/http"
@@ -297,9 +297,9 @@ func Execute() int {
297297
// Run the operator
298298
func executeMain(cmd *cobra.Command, args []string) {
299299
// Get environment
300-
namespace := os.Getenv(constants.EnvOperatorPodNamespace)
301-
name := os.Getenv(constants.EnvOperatorPodName)
302-
ip := os.Getenv(constants.EnvOperatorPodIP)
300+
namespace := os.Getenv(utilConstants.EnvOperatorPodNamespace)
301+
name := os.Getenv(utilConstants.EnvOperatorPodName)
302+
ip := os.Getenv(utilConstants.EnvOperatorPodIP)
303303

304304
go monitorMemoryLimit()
305305

@@ -383,13 +383,13 @@ func executeMain(cmd *cobra.Command, args []string) {
383383
// Check environment
384384
if !operatorOptions.versionOnly {
385385
if len(namespace) == 0 {
386-
logger.Fatal("%s environment variable missing", constants.EnvOperatorPodNamespace)
386+
logger.Fatal("%s environment variable missing", utilConstants.EnvOperatorPodNamespace)
387387
}
388388
if len(name) == 0 {
389-
logger.Fatal("%s environment variable missing", constants.EnvOperatorPodName)
389+
logger.Fatal("%s environment variable missing", utilConstants.EnvOperatorPodName)
390390
}
391391
if len(ip) == 0 {
392-
logger.Fatal("%s environment variable missing", constants.EnvOperatorPodIP)
392+
logger.Fatal("%s environment variable missing", utilConstants.EnvOperatorPodIP)
393393
}
394394

395395
// Get host name
@@ -672,9 +672,9 @@ func getMyPodInfoWrap(kubecli kubernetes.Interface, namespace, name string, imag
672672
func getMyImageInfoFunc(status bool) func(pod *core.Pod) (string, bool) {
673673
return func(pod *core.Pod) (string, bool) {
674674
if status {
675-
return k8sutil.GetArangoDBImageIDFromContainerStatuses(pod.Status.ContainerStatuses, shared.ServerContainerName, shared.OperatorContainerName, constants.MyContainerNameEnv.GetOrDefault(shared.OperatorContainerName))
675+
return k8sutil.GetArangoDBImageIDFromContainerStatuses(pod.Status.ContainerStatuses, shared.ServerContainerName, shared.OperatorContainerName, utilConstants.MyContainerNameEnv.GetOrDefault(shared.OperatorContainerName))
676676
}
677-
return k8sutil.GetArangoDBImageFromContainers(pod.Spec.Containers, shared.ServerContainerName, shared.OperatorContainerName, constants.MyContainerNameEnv.GetOrDefault(shared.OperatorContainerName))
677+
return k8sutil.GetArangoDBImageFromContainers(pod.Spec.Containers, shared.ServerContainerName, shared.OperatorContainerName, utilConstants.MyContainerNameEnv.GetOrDefault(shared.OperatorContainerName))
678678
}
679679
}
680680

‎cmd/lifecycle.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
shared "github.com/arangodb/kube-arangodb/pkg/apis/shared"
3636
"github.com/arangodb/kube-arangodb/pkg/handlers/utils"
3737
"github.com/arangodb/kube-arangodb/pkg/util/cli"
38-
"github.com/arangodb/kube-arangodb/pkg/util/constants"
38+
utilConstants "github.com/arangodb/kube-arangodb/pkg/util/constants"
3939
"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/kerrors"
4040
"github.com/arangodb/kube-arangodb/pkg/util/kclient"
4141
"github.com/arangodb/kube-arangodb/pkg/util/retry"
@@ -100,13 +100,13 @@ func cmdLifecyclePreStopRunFinalizer(cmd *cobra.Command, args []string) {
100100
logger.Info("Starting arangodb-operator (%s), lifecycle preStop, version %s build %s", version.GetVersionV1().Edition.Title(), version.GetVersionV1().Version, version.GetVersionV1().Build)
101101

102102
// Get environment
103-
namespace := os.Getenv(constants.EnvOperatorPodNamespace)
103+
namespace := os.Getenv(utilConstants.EnvOperatorPodNamespace)
104104
if len(namespace) == 0 {
105-
logger.Fatal("%s environment variable missing", constants.EnvOperatorPodNamespace)
105+
logger.Fatal("%s environment variable missing", utilConstants.EnvOperatorPodNamespace)
106106
}
107-
name := os.Getenv(constants.EnvOperatorPodName)
107+
name := os.Getenv(utilConstants.EnvOperatorPodName)
108108
if len(name) == 0 {
109-
logger.Fatal("%s environment variable missing", constants.EnvOperatorPodName)
109+
logger.Fatal("%s environment variable missing", utilConstants.EnvOperatorPodName)
110110
}
111111

112112
// Create kubernetes client
@@ -192,13 +192,13 @@ func (c *cmdLifecyclePreStopRunPort) run(cmd *cobra.Command, args []string) erro
192192
address := net.JoinHostPort("127.0.0.1", strconv.Itoa(shared.ArangoPort))
193193

194194
// Get environment
195-
namespace := os.Getenv(constants.EnvOperatorPodNamespace)
195+
namespace := os.Getenv(utilConstants.EnvOperatorPodNamespace)
196196
if len(namespace) == 0 {
197-
logger.Fatal("%s environment variable missing", constants.EnvOperatorPodNamespace)
197+
logger.Fatal("%s environment variable missing", utilConstants.EnvOperatorPodNamespace)
198198
}
199-
name := os.Getenv(constants.EnvOperatorPodName)
199+
name := os.Getenv(utilConstants.EnvOperatorPodName)
200200
if len(name) == 0 {
201-
logger.Fatal("%s environment variable missing", constants.EnvOperatorPodName)
201+
logger.Fatal("%s environment variable missing", utilConstants.EnvOperatorPodName)
202202
}
203203

204204
// Create kubernetes client
@@ -234,7 +234,7 @@ func (c *cmdLifecyclePreStopRunPort) run(cmd *cobra.Command, args []string) erro
234234
} else {
235235
// We got our pod
236236
finalizers := utils.StringList(p.GetFinalizers())
237-
if !finalizers.Has(constants.FinalizerPodGracefulShutdown) {
237+
if !finalizers.Has(utilConstants.FinalizerPodGracefulShutdown) {
238238
return retry.Interrput()
239239
}
240240
}

‎cmd/lifecycle_probes.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
"github.com/arangodb/kube-arangodb/pkg/deployment/pod"
4444
"github.com/arangodb/kube-arangodb/pkg/deployment/resources"
4545
"github.com/arangodb/kube-arangodb/pkg/util"
46-
"github.com/arangodb/kube-arangodb/pkg/util/constants"
46+
utilConstants "github.com/arangodb/kube-arangodb/pkg/util/constants"
4747
"github.com/arangodb/kube-arangodb/pkg/util/errors"
4848
)
4949

@@ -148,8 +148,8 @@ func readJWTFile(file string) ([]byte, error) {
148148

149149
func getJWTToken() ([]byte, error) {
150150
// Try read default one
151-
if token, err := readJWTFile(constants.SecretKeyToken); err == nil {
152-
log.Info().Str("token", constants.SecretKeyToken).Msgf("Using JWT Token")
151+
if token, err := readJWTFile(utilConstants.SecretKeyToken); err == nil {
152+
log.Info().Str("token", utilConstants.SecretKeyToken).Msgf("Using JWT Token")
153153
return token, nil
154154
}
155155

‎cmd/lifecycle_wait.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
3232
"github.com/arangodb/kube-arangodb/pkg/util"
33-
"github.com/arangodb/kube-arangodb/pkg/util/constants"
33+
utilConstants "github.com/arangodb/kube-arangodb/pkg/util/constants"
3434
)
3535

3636
const (
@@ -71,7 +71,7 @@ func cmdLifecycleWaitCheck(cmd *cobra.Command, _ []string) {
7171
}
7272

7373
for {
74-
d, err := getDeployment(ctx, os.Getenv(constants.EnvOperatorPodNamespace), deploymentName)
74+
d, err := getDeployment(ctx, os.Getenv(utilConstants.EnvOperatorPodNamespace), deploymentName)
7575
if err != nil {
7676
logger.Err(err).Fatal(fmt.Sprintf("error getting ArangoDeployment: %s", d.Name))
7777
}

‎cmd/storage.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/arangodb/kube-arangodb/pkg/storage/provisioner"
3232
"github.com/arangodb/kube-arangodb/pkg/storage/provisioner/service"
3333
"github.com/arangodb/kube-arangodb/pkg/util/cli"
34-
"github.com/arangodb/kube-arangodb/pkg/util/constants"
34+
utilConstants "github.com/arangodb/kube-arangodb/pkg/util/constants"
3535
"github.com/arangodb/kube-arangodb/pkg/version"
3636
)
3737

@@ -68,9 +68,9 @@ func cmdStorageProvisionerRun(cmd *cobra.Command, args []string) {
6868
logger.Info("Starting arangodb local storage provisioner (%s), version %s build %s", version.GetVersionV1().Edition.Title(), version.GetVersionV1().Version, version.GetVersionV1().Build)
6969

7070
// Get environment
71-
nodeName := os.Getenv(constants.EnvOperatorNodeName)
71+
nodeName := os.Getenv(utilConstants.EnvOperatorNodeName)
7272
if len(nodeName) == 0 {
73-
logger.Fatal("%s environment variable missing", constants.EnvOperatorNodeName)
73+
logger.Fatal("%s environment variable missing", utilConstants.EnvOperatorNodeName)
7474
}
7575

7676
config := newProvisionerConfigAndDeps(nodeName)

‎cmd/webhook.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// DISCLAIMER
33
//
4-
// Copyright 2024 ArangoDB GmbH, Cologne, Germany
4+
// Copyright 2024-2025 ArangoDB GmbH, Cologne, Germany
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import (
2929

3030
"github.com/arangodb/kube-arangodb/pkg/handlers/scheduler"
3131
"github.com/arangodb/kube-arangodb/pkg/util"
32-
"github.com/arangodb/kube-arangodb/pkg/util/constants"
32+
utilConstants "github.com/arangodb/kube-arangodb/pkg/util/constants"
3333
"github.com/arangodb/kube-arangodb/pkg/util/errors"
3434
"github.com/arangodb/kube-arangodb/pkg/util/http"
3535
"github.com/arangodb/kube-arangodb/pkg/util/kclient"
@@ -54,7 +54,7 @@ func init() {
5454

5555
f.StringVar(&webhookInput.listenAddress, "server.address", "0.0.0.0:8828", "Address the webhook will listen on (IP:port)")
5656
f.StringVar(&webhookInput.secretName, "ssl.secret.name", "", "Secret Name containing TLS certificate used for the metrics server")
57-
f.StringVar(&webhookInput.secretNamespace, "ssl.secret.namespace", os.Getenv(constants.EnvOperatorPodNamespace), "Secret Name containing TLS certificate used for the metrics server")
57+
f.StringVar(&webhookInput.secretNamespace, "ssl.secret.namespace", os.Getenv(utilConstants.EnvOperatorPodNamespace), "Secret Name containing TLS certificate used for the metrics server")
5858

5959
cmdMain.AddCommand(cmdWebhook)
6060
}

0 commit comments

Comments
 (0)