Merge branch 'master' into bugfix/fix_secret_discovery

ajanikow · web-flow · commit 7776ae3f7813 · 2025-06-02T15:22:28.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - (Feature) Previous Pod Logs in DebugPackage
 - (Feature) (Platform) Login & Logout Endpoints
 - (Feature) (Platform) OpenID Integration
+- (Maintenance) Operator Labeling Skip
 - (Bugfix) Align JWT Discovery
 
 ## [1.2.48](https://github.com/arangodb/kube-arangodb/tree/1.2.48) (2025-05-08)
diff --git a/README.md b/README.md
@@ -200,6 +200,7 @@ Flags:
       --kubernetes.burst int                                   Burst for the k8s API (default 64)
       --kubernetes.max-batch-size int                          Size of batch during objects read (default 256)
       --kubernetes.qps float32                                 Number of queries per second for k8s API (default 32)
+      --leader.label.skip                                      Skips Leader Label for the Pod
       --log.format string                                      Set log format. Allowed values: 'pretty', 'JSON'. If empty, default format is used (default "pretty")
       --log.level stringArray                                  Set log levels in format <level> or <logger>=<level>. Possible loggers: action, agency, api-server, assertion, backup-operator, chaos-monkey, crd, deployment, deployment-ci, deployment-reconcile, deployment-replication, deployment-resilience, deployment-resources, deployment-storage, deployment-storage-pc, deployment-storage-service, generic-parent-operator, helm, http, inspector, integration-authn-v1, integration-config-v1, integration-envoy-auth-v3, integration-envoy-auth-v3-impl-auth-bearer, integration-envoy-auth-v3-impl-auth-cookie, integration-envoy-auth-v3-impl-custom-openid, integration-envoy-auth-v3-impl-pass-mode, integration-scheduler-v2, integration-storage-v1-s3, integration-storage-v2, integrations, k8s-client, kubernetes, kubernetes-access, kubernetes-client, kubernetes-informer, monitor, networking-route-operator, operator, operator-arangojob-handler, operator-v2, operator-v2-event, operator-v2-worker, panics, platform-chart-operator, platform-pod-shutdown, platform-storage-operator, pod_compare, root, root-event-recorder, scheduler-batchjob-operator, scheduler-cronjob-operator, scheduler-deployment-operator, scheduler-pod-operator, scheduler-profile-operator, server, server-authentication, webhook (default [info])
       --log.sampling                                           If true, operator will try to minimize duplication of logging events (default true)
diff --git a/chart/kube-arangodb-arm64/templates/deployment.yaml b/chart/kube-arangodb-arm64/templates/deployment.yaml
@@ -111,6 +111,9 @@ spec:
 {{- if or .Values.operator.debug (eq ( int .Values.operator.replicaCount)  1)  }}
                     - --mode.single
 {{- end }}
+{{- if .Values.operator.skipLeaderLabels  }}
+                    - --leader.label.skip
+{{- end }}
 {{ if .Values.operator.features.apps }}
                     - --operator.apps
 {{- end }}
diff --git a/chart/kube-arangodb-arm64/templates/service.yaml b/chart/kube-arangodb-arm64/templates/service.yaml
@@ -32,5 +32,7 @@ spec:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     release: {{ .Release.Name }}
+{{- if .Values.operator.skipLeaderLabels  }}
     role: leader
+{{- end }}
   type: {{ .Values.operator.service.type }}
diff --git a/chart/kube-arangodb-enterprise-arm64/templates/deployment.yaml b/chart/kube-arangodb-enterprise-arm64/templates/deployment.yaml
@@ -111,6 +111,9 @@ spec:
 {{- if or .Values.operator.debug (eq ( int .Values.operator.replicaCount)  1)  }}
                     - --mode.single
 {{- end }}
+{{- if .Values.operator.skipLeaderLabels  }}
+                    - --leader.label.skip
+{{- end }}
 {{ if .Values.operator.features.apps }}
                     - --operator.apps
 {{- end }}
diff --git a/chart/kube-arangodb-enterprise-arm64/templates/service.yaml b/chart/kube-arangodb-enterprise-arm64/templates/service.yaml
@@ -32,5 +32,7 @@ spec:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     release: {{ .Release.Name }}
+{{- if .Values.operator.skipLeaderLabels  }}
     role: leader
+{{- end }}
   type: {{ .Values.operator.service.type }}
diff --git a/chart/kube-arangodb-enterprise/templates/deployment.yaml b/chart/kube-arangodb-enterprise/templates/deployment.yaml
@@ -111,6 +111,9 @@ spec:
 {{- if or .Values.operator.debug (eq ( int .Values.operator.replicaCount)  1)  }}
                     - --mode.single
 {{- end }}
+{{- if .Values.operator.skipLeaderLabels  }}
+                    - --leader.label.skip
+{{- end }}
 {{ if .Values.operator.features.apps }}
                     - --operator.apps
 {{- end }}
diff --git a/chart/kube-arangodb-enterprise/templates/service.yaml b/chart/kube-arangodb-enterprise/templates/service.yaml
@@ -32,5 +32,7 @@ spec:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     release: {{ .Release.Name }}
+{{- if .Values.operator.skipLeaderLabels  }}
     role: leader
+{{- end }}
   type: {{ .Values.operator.service.type }}
diff --git a/chart/kube-arangodb/templates/deployment.yaml b/chart/kube-arangodb/templates/deployment.yaml
@@ -111,6 +111,9 @@ spec:
 {{- if or .Values.operator.debug (eq ( int .Values.operator.replicaCount)  1)  }}
                     - --mode.single
 {{- end }}
+{{- if .Values.operator.skipLeaderLabels  }}
+                    - --leader.label.skip
+{{- end }}
 {{ if .Values.operator.features.apps }}
                     - --operator.apps
 {{- end }}
diff --git a/chart/kube-arangodb/templates/service.yaml b/chart/kube-arangodb/templates/service.yaml
@@ -32,5 +32,7 @@ spec:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     release: {{ .Release.Name }}
+{{- if .Values.operator.skipLeaderLabels  }}
     role: leader
+{{- end }}
   type: {{ .Values.operator.service.type }}
diff --git a/chart/kube-arangodb/values.yaml b/chart/kube-arangodb/values.yaml
@@ -3,6 +3,7 @@ operator:
   imagePullPolicy: IfNotPresent
   imagePullSecrets: []
   scope: legacy
+  skipLeaderLabels: false
   architectures:
     - amd64
   debug: false
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -128,7 +128,7 @@ var (
 
 		reconciliationDelay time.Duration
 
-		singleMode bool
+		singleMode, skipLeaderLabel bool
 	}
 	shutdownOptions struct {
 		delay   time.Duration
@@ -225,6 +225,7 @@ func init() {
 	f.StringVar(&deprecatedStr, "operator.arango-image", "arangodb/arangodb:latest", "Docker image used for arango by default")
 	f.MarkDeprecated("operator.arango-image", "Value is not used anymore")
 	f.BoolVar(&chaosOptions.allowed, "chaos.allowed", false, "Set to allow chaos in deployments. Only activated when allowed and enabled in deployment")
+	f.BoolVar(&operatorOptions.skipLeaderLabel, "leader.label.skip", false, "Skips Leader Label for the Pod")
 	f.BoolVar(&operatorOptions.singleMode, "mode.single", false, "Enable single mode in Operator. WARNING: There should be only one replica of Operator, otherwise Operator can take unexpected actions")
 	f.String("scope", "", "Define scope on which Operator works. Legacy - pre 1.1.0 scope with limited cluster access")
 	f.MarkDeprecated("scope", "Value is not used anymore")
@@ -588,6 +589,7 @@ func newOperatorConfigAndDeps(id, namespace, name string) (operator.Config, oper
 		PodName:                     name,
 		ServiceAccount:              serviceAccount,
 		OperatorImage:               image,
+		SkipLeaderLabel:             operatorOptions.skipLeaderLabel,
 		EnableDeployment:            operatorOptions.enableDeployment,
 		EnableDeploymentReplication: operatorOptions.enableDeploymentReplication,
 		EnableStorage:               operatorOptions.enableStorage,
diff --git a/docs/cli/arangodb_operator.md b/docs/cli/arangodb_operator.md
@@ -84,6 +84,7 @@ Flags:
       --kubernetes.burst int                                   Burst for the k8s API (default 64)
       --kubernetes.max-batch-size int                          Size of batch during objects read (default 256)
       --kubernetes.qps float32                                 Number of queries per second for k8s API (default 32)
+      --leader.label.skip                                      Skips Leader Label for the Pod
       --log.format string                                      Set log format. Allowed values: 'pretty', 'JSON'. If empty, default format is used (default "pretty")
       --log.level stringArray                                  Set log levels in format <level> or <logger>=<level>. Possible loggers: action, agency, api-server, assertion, backup-operator, chaos-monkey, crd, deployment, deployment-ci, deployment-reconcile, deployment-replication, deployment-resilience, deployment-resources, deployment-storage, deployment-storage-pc, deployment-storage-service, generic-parent-operator, helm, http, inspector, integration-authn-v1, integration-config-v1, integration-envoy-auth-v3, integration-envoy-auth-v3-impl-auth-bearer, integration-envoy-auth-v3-impl-auth-cookie, integration-envoy-auth-v3-impl-custom-openid, integration-envoy-auth-v3-impl-pass-mode, integration-scheduler-v2, integration-storage-v1-s3, integration-storage-v2, integrations, k8s-client, kubernetes, kubernetes-access, kubernetes-client, kubernetes-informer, monitor, networking-route-operator, operator, operator-arangojob-handler, operator-v2, operator-v2-event, operator-v2-worker, panics, platform-chart-operator, platform-pod-shutdown, platform-storage-operator, pod_compare, root, root-event-recorder, scheduler-batchjob-operator, scheduler-cronjob-operator, scheduler-deployment-operator, scheduler-pod-operator, scheduler-profile-operator, server, server-authentication, webhook (default [info])
       --log.sampling                                           If true, operator will try to minimize duplication of logging events (default true)
diff --git a/docs/how-to/debugging.md b/docs/how-to/debugging.md
@@ -32,5 +32,5 @@ helm upgrade --install kube-arangodb \
     
 Then run:
 ```shell
-kubectl exec {POD_kube-arangodb-operator} -- /usr/bin/arangodb_operator debug-package --namespace {namespace} -o - > db.tar.gz
+kubectl exec {POD_kube-arangodb-operator}  --namespace {namespace} -- /usr/bin/arangodb_operator debug-package --namespace {namespace} -o - > db.tar.gz
 ```
diff --git a/integrations/envoy/auth/v3/impl.go b/integrations/envoy/auth/v3/impl.go
@@ -98,7 +98,7 @@ func (i *impl) Check(ctx context.Context, request *pbEnvoyAuthV3.CheckRequest) (
 			q = q.Err(err)
 			q.Dur("duration", time.Since(start)).Warn("Request Completed with error")
 		} else {
-			q.Dur("duration", time.Since(start)).Info("Request Completed")
+			q.Dur("duration", time.Since(start)).Debug("Request Completed")
 		}
 	}()
 
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -111,6 +111,7 @@ type Config struct {
 	PodName                     string
 	ServiceAccount              string
 	OperatorImage               string
+	SkipLeaderLabel             bool
 	EnableDeployment            bool
 	EnableDeploymentReplication bool
 	EnableStorage               bool
diff --git a/pkg/operator/operator_leader.go b/pkg/operator/operator_leader.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2023 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.
@@ -154,6 +154,11 @@ func (o *Operator) getLeaderElectionEventTarget(log logging.Logger) runtime.Obje
 
 // setRoleLabel sets a label with key `role` and given value in the pod metadata.
 func (o *Operator) setRoleLabel(log logging.Logger, label, role string) error {
+	if o.Config.SkipLeaderLabel {
+		log.Str("label", label).Str("role", role).Info("Skipping Leader Node Labeling")
+		return nil
+	}
+
 	ns := o.Config.Namespace
 	kubecli := o.Dependencies.Client.Kubernetes()
 	pods := kubecli.CoreV1().Pods(ns)
