Merge pull request #495 from vshn/fix/proxysql-version

Make proxysql report the actual mariadb server version

Author: vshnbot

apis/vshn/v1/dbaas_vshn_mariadb.go

@@ -145,6 +145,10 @@ type VSHNMariaDBStatus struct {
 	// CurrentInstances tracks the current amount of instances.
 	// Mainly used to detect if there was a change in instances
 	CurrentInstances int `json:"currentInstances,omitempty"`
+	// MariaDBVersion contains the current MariaDB server version
+	MariaDBVersion string `json:"mariadbVersion,omitempty"`
+	// InitialMaintenanceRan tracks if the initial maintenance job has been triggered
+	InitialMaintenanceRan bool `json:"initialMaintenanceRan,omitempty"`
 	// ResourceStatus represents the observed state of a managed resource.
 	xpv1.ResourceStatus `json:",inline"`
 }

crds/vshn.appcat.vshn.io_vshnmariadbs.yaml

@@ -4895,6 +4895,9 @@ spec:
                     CurrentInstances tracks the current amount of instances.
                     Mainly used to detect if there was a change in instances
                   type: integer
+                initialMaintenanceRan:
+                  description: InitialMaintenanceRan tracks if the initial maintenance job has been triggered
+                  type: boolean
                 instanceNamespace:
                   description: InstanceNamespace contains the name of the namespace where the instance resides
                   type: string
@@ -4935,6 +4938,9 @@ spec:
                         type: string
                     type: object
                   type: array
+                mariadbVersion:
+                  description: MariaDBVersion contains the current MariaDB server version
+                  type: string
                 namespaceConditions:
                   items:
                     properties:

crds/vshn.appcat.vshn.io_xvshnmariadbs.yaml

@@ -5804,6 +5804,10 @@ spec:
                   CurrentInstances tracks the current amount of instances.
                   Mainly used to detect if there was a change in instances
                 type: integer
+              initialMaintenanceRan:
+                description: InitialMaintenanceRan tracks if the initial maintenance
+                  job has been triggered
+                type: boolean
               instanceNamespace:
                 description: InstanceNamespace contains the name of the namespace
                   where the instance resides
@@ -5848,6 +5852,9 @@ spec:
                       type: string
                   type: object
                 type: array
+              mariadbVersion:
+                description: MariaDBVersion contains the current MariaDB server version
+                type: string
               namespaceConditions:
                 items:
                   properties:

pkg/comp-functions/functions/vshnmariadb/files/proxysql.conf.tmpl

@@ -9,11 +9,12 @@ admin_variables=
     cluster_password="{{ .RootPassword }}"
 }
 
-{{ if eq .TLS 1 }}
 mysql_variables = {
+    {{ if eq .TLS 1 }}
     ssl_p2s_ca = "/var/lib/proxysql/proxysql-ca.pem"
+    {{ end }}
+    server_version = "{{ .MariaDBVersion }}"
 }
-{{ end }}
 
 mysql_servers =
 (

pkg/comp-functions/functions/vshnmariadb/maintenance.go

@@ -9,6 +9,9 @@ import (
 	"github.com/vshn/appcat/v4/pkg/comp-functions/functions/common"
 	"github.com/vshn/appcat/v4/pkg/comp-functions/functions/common/maintenance"
 	"github.com/vshn/appcat/v4/pkg/comp-functions/runtime"
+	batchv1 "k8s.io/api/batch/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
 )
 
 // AddMaintenanceJob will add a job to do the maintenance for the instance
@@ -27,7 +30,58 @@ func AddMaintenanceJob(ctx context.Context, comp *vshnv1.VSHNMariaDB, svc *runti
 	instanceNamespace := comp.GetInstanceNamespace()
 	schedule := comp.GetFullMaintenanceSchedule()
 
-	return maintenance.New(comp, svc, schedule, instanceNamespace, comp.GetServiceName()).
+	result := maintenance.New(comp, svc, schedule, instanceNamespace, comp.GetServiceName()).
 		WithHelmBasedService().
 		Run(ctx)
+
+	if result != nil {
+		return result
+	}
+
+	return AddInitialMaintenanceJob(ctx, comp, svc)
+}
+
+// AddInitialMaintenanceJob creates a one-time job from the CronJob template to run maintenance immediately after provisioning
+func AddInitialMaintenanceJob(ctx context.Context, comp *vshnv1.VSHNMariaDB, svc *runtime.ServiceRuntime) *xfnproto.Result {
+	// Check if initial maintenance has already been triggered
+	if comp.Status.InitialMaintenanceRan {
+		return nil
+	}
+
+	cronJobName := comp.GetName() + "-maintenancejob"
+	initialJobName := comp.GetName() + "-initial-maintenance"
+
+	observedCronJob := &batchv1.CronJob{}
+	err := svc.GetObservedKubeObject(observedCronJob, cronJobName)
+	if err != nil {
+		return nil
+	}
+
+	svc.Log.Info("Creating initial maintenance job from CronJob template")
+
+	job := &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      initialJobName,
+			Namespace: observedCronJob.Namespace,
+			Labels:    observedCronJob.Labels,
+		},
+		Spec: batchv1.JobSpec{
+			BackoffLimit:            ptr.To(int32(2)),
+			TTLSecondsAfterFinished: ptr.To(int32(3600)),
+			Template:                observedCronJob.Spec.JobTemplate.Spec.Template,
+		},
+	}
+
+	errSet := svc.SetDesiredKubeObject(job, initialJobName, runtime.KubeOptionAllowDeletion)
+	if errSet != nil {
+		return runtime.NewFatalResult(fmt.Errorf("failed to set desired kube object: %w", errSet))
+	}
+
+	// Mark that initial maintenance has been triggered
+	comp.Status.InitialMaintenanceRan = true
+	if err := svc.SetDesiredCompositeStatus(comp); err != nil {
+		return runtime.NewWarningResult(fmt.Sprintf("cannot update InitialMaintenanceRan status: %v", err))
+	}
+
+	return nil
 }

pkg/comp-functions/functions/vshnmariadb/mariadb_deploy.go

@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"regexp"
 	"strconv"
 
 	xfnproto "github.com/crossplane/function-sdk-go/proto/v1"
@@ -101,6 +102,7 @@ func DeployMariadb(ctx context.Context, comp *vshnv1.VSHNMariaDB, svc *runtime.S
 			return runtime.NewWarningResult(fmt.Errorf("cannot set custom MariaDB settings: %w", err).Error())
 		}
 	}
+
 	return nil
 }
 
@@ -117,11 +119,16 @@ func createObjectHelmRelease(ctx context.Context, comp *vshnv1.VSHNMariaDB, svc
 		return fmt.Errorf("cannot get observed release values: %w", err)
 	}
 
-	_, err = maintenance.SetReleaseVersion(ctx, comp.Spec.Parameters.Service.Version, values, observedValues, []string{"image", "tag"})
+	versionTag, err := maintenance.SetReleaseVersion(ctx, comp.Spec.Parameters.Service.Version, values, observedValues, []string{"image", "tag"})
 	if err != nil {
 		return fmt.Errorf("cannot set mariadb version for release: %w", err)
 	}
 
+	// Extract and update the MariaDB version in status
+	if err := updateMariaDBVersionFromTag(comp, svc, versionTag); err != nil {
+		svc.Log.Error(err, "cannot update MariaDB version in status")
+	}
+
 	r, err := newRelease(ctx, svc, values, comp)
 	if err != nil {
 		return err
@@ -528,3 +535,25 @@ func getMariaDBRootPassword(secretName string, svc *runtime.ServiceRuntime) ([]b
 	}
 	return secret.Data["mariadb-root-password"], nil
 }
+
+// updateMariaDBVersionFromTag extracts the semantic version from a tag and appends MariaDB-log suffix
+func updateMariaDBVersionFromTag(comp *vshnv1.VSHNMariaDB, svc *runtime.ServiceRuntime, tag string) error {
+	if tag == "" {
+		return nil
+	}
+
+	re := regexp.MustCompile(`^(\d+\.\d+\.\d+)`)
+	matches := re.FindStringSubmatch(tag)
+	if len(matches) <= 1 {
+		return nil
+	}
+
+	version := matches[1] + "-MariaDB-log"
+	if version != comp.Status.MariaDBVersion {
+		svc.Log.Info("Updating MariaDB version in status", "version", version)
+		comp.Status.MariaDBVersion = version
+		return svc.SetDesiredCompositeStatus(comp)
+	}
+
+	return nil
+}

pkg/comp-functions/functions/vshnmariadb/proxysql.go

@@ -33,11 +33,12 @@ var (
 )
 
 type proxySQLConfigParams struct {
-	CompName     string
-	RootPassword string
-	Namespace    string
-	TLS          int
-	Users        []proxySQLUsers
+	CompName       string
+	RootPassword   string
+	Namespace      string
+	TLS            int
+	Users          []proxySQLUsers
+	MariaDBVersion string
 }
 
 type proxySQLUsers struct {
@@ -119,11 +120,12 @@ func createProxySQLConfig(comp *vshnv1.VSHNMariaDB, svc *runtime.ServiceRuntime,
 	}
 
 	confParams := proxySQLConfigParams{
-		CompName:     comp.GetName(),
-		RootPassword: string(cd["MARIADB_PASSWORD"]),
-		Namespace:    comp.GetInstanceNamespace(),
-		Users:        userList,
-		TLS:          tls,
+		CompName:       comp.GetName(),
+		RootPassword:   string(cd["MARIADB_PASSWORD"]),
+		Namespace:      comp.GetInstanceNamespace(),
+		Users:          userList,
+		TLS:            tls,
+		MariaDBVersion: comp.Status.MariaDBVersion,
 	}
 
 	var buf bytes.Buffer

pkg/comp-functions/functions/vshnmariadb/proxysql_test.go

@@ -53,7 +53,7 @@ func Test_createProxySQLConfig(t *testing.T) {
 	svc := commontest.LoadRuntimeFromFile(t, "empty.yaml")
 	comp := getComp()
 
-	expectedHash := "56e11403faab20eb54184eccef557c85"
+	expectedHash := "1bf00f243388da2aa7ba6b8d14bf7ad3"
 
 	hash, err := createProxySQLConfig(comp, svc, false)
 	assert.NoError(t, err)