Add new annotations, add old annotations support for Database obj. (#113)

* add new annotations, make old annotations work with Database obj

* add AnnotationValueTrue constant

Author: artgromov

api/v1alpha1/const.go

@@ -31,7 +31,12 @@ const (
 	BinariesDir      = "/opt/ydb/bin"
 	DaemonBinaryName = "ydbd"
 
-	AnnotationSkipInitialization = "ydb.tech/skip-initialization"
+	AnnotationUpdateStrategyOnDelete = "ydb.tech/update-strategy-on-delete"
+	AnnotationSkipInitialization     = "ydb.tech/skip-initialization"
+	AnnotationDisableLivenessProbe   = "ydb.tech/disable-liveness-probe"
+	AnnotationDataCenter             = "ydb.tech/data-center"
+
+	AnnotationValueTrue = "true"
 
 	legacyTenantNameFormat = "/%s/%s"
 )

deploy/ydb-operator/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.25
+version: 0.4.26
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.4.25"
+appVersion: "0.4.26"

internal/controllers/database/sync.go

@@ -299,7 +299,7 @@ func (r *Reconciler) setInitialStatus(
 ) (bool, ctrl.Result, error) {
 	r.Log.Info("running step setInitialStatus")
 
-	if value, ok := database.Annotations[v1alpha1.AnnotationSkipInitialization]; ok && value == "true" {
+	if value, ok := database.Annotations[v1alpha1.AnnotationSkipInitialization]; ok && value == v1alpha1.AnnotationValueTrue {
 		if meta.FindStatusCondition(database.Status.Conditions, TenantInitializedCondition) == nil ||
 			meta.IsStatusConditionFalse(database.Status.Conditions, TenantInitializedCondition) {
 			return r.processSkipInitPipeline(ctx, database)

internal/controllers/storage/init.go

@@ -49,7 +49,7 @@ func (r *Reconciler) setInitialStatus(
 	// It is needed when large clusters are migrated where `waitForStatefulSetToScale`
 	// does not make sense, since some nodes can be down for a long time (and it is okay, since
 	// database is healthy even with partial outage).
-	if value, ok := storage.Annotations[v1alpha1.AnnotationSkipInitialization]; ok && value == "true" {
+	if value, ok := storage.Annotations[v1alpha1.AnnotationSkipInitialization]; ok && value == v1alpha1.AnnotationValueTrue {
 		if meta.FindStatusCondition(storage.Status.Conditions, StorageInitializedCondition) == nil ||
 			meta.IsStatusConditionFalse(storage.Status.Conditions, StorageInitializedCondition) {
 			return r.processSkipInitPipeline(ctx, storage)

internal/resources/database_statefulset.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"regexp"
 	"strconv"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -26,6 +27,8 @@ type DatabaseStatefulSetBuilder struct {
 	Storage *v1alpha1.Storage
 }
 
+var annotationDataCenterPattern = regexp.MustCompile("^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$")
+
 func (b *DatabaseStatefulSetBuilder) Build(obj client.Object) error {
 	sts, ok := obj.(*appsv1.StatefulSet)
 	if !ok {
@@ -49,6 +52,12 @@ func (b *DatabaseStatefulSetBuilder) Build(obj client.Object) error {
 		Template:             b.buildPodTemplateSpec(),
 	}
 
+	if value, ok := b.ObjectMeta.Annotations[v1alpha1.AnnotationUpdateStrategyOnDelete]; ok && value == v1alpha1.AnnotationValueTrue {
+		sts.Spec.UpdateStrategy = appsv1.StatefulSetUpdateStrategy{
+			Type: "OnDelete",
+		}
+	}
+
 	return nil
 }
 
@@ -342,13 +351,7 @@ func (b *DatabaseStatefulSetBuilder) buildContainer() corev1.Container {
 		Command:         command,
 		Args:            args,
 		Env:             b.buildEnv(),
-		LivenessProbe: &corev1.Probe{
-			ProbeHandler: corev1.ProbeHandler{
-				TCPSocket: &corev1.TCPSocketAction{
-					Port: intstr.FromInt(v1alpha1.GRPCPort),
-				},
-			},
-		},
+
 		VolumeMounts: b.buildVolumeMounts(),
 		SecurityContext: &corev1.SecurityContext{
 			Privileged: ptr.Bool(false),
@@ -358,6 +361,16 @@ func (b *DatabaseStatefulSetBuilder) buildContainer() corev1.Container {
 		},
 	}
 
+	if value, ok := b.ObjectMeta.Annotations[v1alpha1.AnnotationDisableLivenessProbe]; !ok || value != v1alpha1.AnnotationValueTrue {
+		container.LivenessProbe = &corev1.Probe{
+			ProbeHandler: corev1.ProbeHandler{
+				TCPSocket: &corev1.TCPSocketAction{
+					Port: intstr.FromInt(v1alpha1.GRPCPort),
+				},
+			},
+		}
+	}
+
 	ports := []corev1.ContainerPort{{
 		Name: "grpc", ContainerPort: v1alpha1.GRPCPort,
 	}, {
@@ -553,6 +566,15 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 		strconv.Itoa(v1alpha1.GRPCPort),
 	)
 
+	if value, ok := b.ObjectMeta.Annotations[v1alpha1.AnnotationDataCenter]; ok {
+		if annotationDataCenterPattern.MatchString(value) {
+			args = append(args,
+				"--data-center",
+				value,
+			)
+		}
+	}
+
 	return command, args
 }
 

internal/resources/storage_statefulset.go

@@ -18,8 +18,7 @@ import (
 )
 
 const (
-	configVolumeName                 = "ydb-config"
-	annotationUpdateStrategyOnDelete = "ydb.tech/update-strategy-on-delete"
+	configVolumeName = "ydb-config"
 )
 
 type StorageStatefulSetBuilder struct {
@@ -69,7 +68,7 @@ func (b *StorageStatefulSetBuilder) Build(obj client.Object) error {
 		Template:             b.buildPodTemplateSpec(),
 	}
 
-	if value, ok := b.ObjectMeta.Annotations[annotationUpdateStrategyOnDelete]; ok && value == "true" {
+	if value, ok := b.ObjectMeta.Annotations[v1alpha1.AnnotationUpdateStrategyOnDelete]; ok && value == v1alpha1.AnnotationValueTrue {
 		sts.Spec.UpdateStrategy = appsv1.StatefulSetUpdateStrategy{
 			Type: "OnDelete",
 		}
@@ -299,13 +298,6 @@ func (b *StorageStatefulSetBuilder) buildContainer() corev1.Container { // todo
 		ImagePullPolicy: *b.Spec.Image.PullPolicyName,
 		Command:         command,
 		Args:            args,
-		LivenessProbe: &corev1.Probe{
-			ProbeHandler: corev1.ProbeHandler{
-				TCPSocket: &corev1.TCPSocketAction{
-					Port: intstr.FromInt(v1alpha1.GRPCPort),
-				},
-			},
-		},
 
 		SecurityContext: &corev1.SecurityContext{
 			Privileged: ptr.Bool(false),
@@ -326,6 +318,16 @@ func (b *StorageStatefulSetBuilder) buildContainer() corev1.Container { // todo
 		Resources:    b.Spec.Resources,
 	}
 
+	if value, ok := b.ObjectMeta.Annotations[v1alpha1.AnnotationDisableLivenessProbe]; !ok || value != v1alpha1.AnnotationValueTrue {
+		container.LivenessProbe = &corev1.Probe{
+			ProbeHandler: corev1.ProbeHandler{
+				TCPSocket: &corev1.TCPSocketAction{
+					Port: intstr.FromInt(v1alpha1.GRPCPort),
+				},
+			},
+		}
+	}
+
 	var volumeDeviceList []corev1.VolumeDevice // todo decide on PVC volumeMode?
 	var volumeMountList []corev1.VolumeMount
 	for i, spec := range b.Spec.DataStore {