Merge branch 'master' into GT-16/agency-leader-discovery

Author: ajanikow

CHANGELOG.md

@@ -3,6 +3,11 @@
 ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
 - (Bugfix) Fix arangosync members state inspection
 - (Feature) (ACS) Improve Reconciliation Loop
+- (Bugfix) Allow missing Monitoring CRD
+- (Feature) (ACS) Add Resource plan
+- (Feature) Allow raw json value for license token-v2
+- (Update) Replace `beta.kubernetes.io/arch` to `kubernetes.io/arch` in Operator Chart
+- (Feature) Add operator shutdown handler for graceful termination
 - (Feature) Add agency leader discovery.
 
 ## [1.2.12](https://github.com/arangodb/kube-arangodb/tree/1.2.12) (2022-05-10)

chart/arangodb-ingress-proxy/templates/deployment.yaml

@@ -31,7 +31,7 @@ spec:
                     requiredDuringSchedulingIgnoredDuringExecution:
                         nodeSelectorTerms:
                             - matchExpressions:
-                                  - key: beta.kubernetes.io/arch
+                                  - key: kubernetes.io/arch
                                     operator: In
                                     values:
                                         - amd64

chart/kube-arangodb/templates/deployment.yaml

@@ -60,7 +60,7 @@ spec:
                 requiredDuringSchedulingIgnoredDuringExecution:
                   nodeSelectorTerms:
                     - matchExpressions:
-                        - key: beta.kubernetes.io/arch
+                        - key: kubernetes.io/arch
                           operator: In
                           values:
 {{- range .Values.operator.architectures }}

cmd/main.go

@@ -33,9 +33,10 @@ import (
 
 	"github.com/arangodb/kube-arangodb/pkg/util/globals"
 
-	operatorHTTP "github.com/arangodb/kube-arangodb/pkg/util/http"
 	"github.com/gin-gonic/gin"
 
+	operatorHTTP "github.com/arangodb/kube-arangodb/pkg/util/http"
+
 	"github.com/arangodb/kube-arangodb/pkg/version"
 
 	"github.com/arangodb/kube-arangodb/pkg/operator/scope"
@@ -61,6 +62,9 @@ import (
 	v1core "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/tools/record"
 
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/klog"
+
 	"github.com/arangodb/kube-arangodb/pkg/crd"
 	"github.com/arangodb/kube-arangodb/pkg/generated/clientset/versioned/scheme"
 	"github.com/arangodb/kube-arangodb/pkg/logging"
@@ -71,8 +75,6 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/util/kclient"
 	"github.com/arangodb/kube-arangodb/pkg/util/probe"
 	"github.com/arangodb/kube-arangodb/pkg/util/retry"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/klog"
 )
 
 const (
@@ -83,6 +85,8 @@ const (
 	defaultAlpineImage          = "alpine:3.7"
 	defaultMetricsExporterImage = "arangodb/arangodb-exporter:0.1.6"
 	defaultArangoImage          = "arangodb/arangodb:latest"
+	defaultShutdownDelay        = 2 * time.Second
+	defaultShutdownTimeout      = 30 * time.Second
 
 	UBIImageEnv             util.EnvironmentVariable = "RELATED_IMAGE_UBI"
 	ArangoImageEnv          util.EnvironmentVariable = "RELATED_IMAGE_DATABASE"
@@ -121,6 +125,10 @@ var (
 		singleMode bool
 		scope      string
 	}
+	shutdownOptions struct {
+		delay   time.Duration
+		timeout time.Duration
+	}
 	crdOptions struct {
 		install bool
 	}
@@ -180,6 +188,8 @@ func init() {
 	f.DurationVar(&operatorTimeouts.arangoDCheck, "timeout.arangod-check", globals.DefaultArangoDCheckTimeout, "The version check request timeout to the ArangoDB")
 	f.DurationVar(&operatorTimeouts.agency, "timeout.agency", globals.DefaultArangoDAgencyTimeout, "The Agency read timeout")
 	f.DurationVar(&operatorTimeouts.reconciliation, "timeout.reconciliation", globals.DefaultReconciliationTimeout, "The reconciliation timeout to the ArangoDB CR")
+	f.DurationVar(&shutdownOptions.delay, "shutdown.delay", defaultShutdownDelay, "The delay before running shutdown handlers")
+	f.DurationVar(&shutdownOptions.timeout, "shutdown.timeout", defaultShutdownTimeout, "Timeout for shutdown handlers")
 	f.BoolVar(&operatorOptions.scalingIntegrationEnabled, "internal.scaling-integration", true, "Enable Scaling Integration")
 	f.Int64Var(&operatorKubernetesOptions.maxBatchSize, "kubernetes.max-batch-size", globals.DefaultKubernetesRequestBatchSize, "Size of batch during objects read")
 	f.Float32Var(&operatorKubernetesOptions.qps, "kubernetes.qps", kclient.DefaultQPS, "Number of queries per second for k8s API")
@@ -421,6 +431,8 @@ func newOperatorConfigAndDeps(id, namespace, name string) (operator.Config, oper
 		ArangoImage:                 operatorOptions.arangoImage,
 		SingleMode:                  operatorOptions.singleMode,
 		Scope:                       scope,
+		ShutdownDelay:               shutdownOptions.delay,
+		ShutdownTimeout:             shutdownOptions.timeout,
 	}
 	deps := operator.Dependencies{
 		LogService:                 logService,

docs/design/README.md

@@ -9,4 +9,5 @@
 - [Status](./status.md)
 - [Upgrading](./upgrading.md)
 - [Rotating Pods](./rotating.md)
-- [Maintenance](./maintenance.md)
+- [Maintenance](./maintenance.md)
+- [Additional configuration](./additional_configuration.md)

docs/design/additional_configuration.md

@@ -0,0 +1,17 @@
+# Additional configuration
+
+It is possible to additionally fine-tune operator behavior by
+providing arguments via `operator.args` chart template value.
+
+For example, you can specify burst size for k8s API requests or how long the operator
+should wait for ArangoDeployment termination after receiving interruption signal:
+```
+operator:
+  args: ["--kubernetes.burst=40", --shutdown.timeout=2m"]
+```
+
+The full list of available arguments can be retrieved using 
+```
+export OPERATOR_IMAGE=arangodb/kube-arangodb:1.2.9
+kubectl run arango-operator-help --image=$OPERATOR_IMAGE -i --rm --restart=Never -- --help
+```

pkg/apis/deployment/v1/deployment_status.go

@@ -64,6 +64,9 @@ type DeploymentStatus struct {
 	// HighPriorityPlan to update this deployment. Executed before plan
 	HighPriorityPlan Plan `json:"highPriorityPlan,omitempty"`
 
+	// ResourcesPlan to update this deployment. Executed before plan, after highPlan
+	ResourcesPlan Plan `json:"resourcesPlan,omitempty"`
+
 	// AcceptedSpec contains the last specification that was accepted by the operator.
 	AcceptedSpec *DeploymentSpec `json:"accepted-spec,omitempty"`
 
@@ -103,6 +106,8 @@ func (ds *DeploymentStatus) Equal(other DeploymentStatus) bool {
 		ds.Members.Equal(other.Members) &&
 		ds.Conditions.Equal(other.Conditions) &&
 		ds.Plan.Equal(other.Plan) &&
+		ds.HighPriorityPlan.Equal(other.HighPriorityPlan) &&
+		ds.ResourcesPlan.Equal(other.ResourcesPlan) &&
 		ds.AcceptedSpec.Equal(other.AcceptedSpec) &&
 		ds.SecretHashes.Equal(other.SecretHashes) &&
 		ds.Agency.Equal(other.Agency) &&

pkg/apis/deployment/v1/plan.go

@@ -192,6 +192,9 @@ const (
 	// Rebalancer
 	ActionTypeRebalancerGenerate ActionType = "RebalancerGenerate"
 	ActionTypeRebalancerCheck    ActionType = "RebalancerCheck"
+
+	// Resources
+	ActionTypeResourceSync ActionType = "ResourceSync"
 )
 
 const (

pkg/apis/deployment/v1/zz_generated.deepcopy.go

@@ -20,6 +20,11 @@
 
 package v2alpha1
 
+import (
+	"github.com/arangodb/kube-arangodb/pkg/apis/shared"
+	"github.com/pkg/errors"
+)
+
 type ArangoClusterSynchronizationSpec struct {
 	DeploymentName string                                      `json:"deploymentName,omitempty"`
 	KubeConfig     *ArangoClusterSynchronizationKubeConfigSpec `json:"kubeconfig,omitempty"`
@@ -30,3 +35,15 @@ type ArangoClusterSynchronizationKubeConfigSpec struct {
 	SecretKey  string `json:"secretKey"`
 	Namespace  string `json:"namespace"`
 }
+
+func (a *ArangoClusterSynchronizationKubeConfigSpec) Validate() error {
+	if a == nil {
+		return errors.Errorf("KubeConfig Spec cannot be nil")
+	}
+
+	return shared.WithErrors(
+		shared.PrefixResourceError("secretName", shared.ValidateResourceName(a.SecretName)),
+		shared.PrefixResourceError("secretKey", shared.ValidateResourceName(a.SecretKey)),
+		shared.PrefixResourceError("namespace", shared.ValidateResourceName(a.Namespace)),
+	)
+}