MLCronJob status update (#1526)

.circleci/continue_config.yml

@@ -16,7 +16,7 @@ parameters:
 executors:
   golang-executor:
     docker:
-      - image: gcr.io/gcr-for-testing/golang:1.20.11
+      - image: gcr.io/gcr-for-testing/golang:1.20.12
   machine-executor:
     machine:
       image: ubuntu-2204:current

CHANGELOG.md

@@ -29,6 +29,7 @@
 - (Feature) (ML) Extension Storage Condition
 - (Improvement) (ML) Switch to fsnotify for file watching for MacOS support
 - (Feature) (ML) Unify Images, Resources and Lifecycle
+- (Improvement) (ML) CronJob status update
 
 ## [1.2.35](https://github.com/arangodb/kube-arangodb/tree/1.2.35) (2023-11-06)
 - (Maintenance) Update go-driver to v1.6.0, update IsNotFound() checks

Makefile

@@ -48,7 +48,7 @@ endif
 
 TEST_BUILD ?= 0
 GOBUILDARGS ?=
-GOBASEVERSION := 1.20.11
+GOBASEVERSION := 1.20.12
 GOVERSION := $(GOBASEVERSION)-alpine3.17
 DISTRIBUTION := alpine:3.15
 GOBUILDTAGS := $(RELEASE_MODE)
@@ -779,6 +779,7 @@ set-api-version/%:
 synchronize: synchronize-v2alpha1-with-v1
 
 synchronize-v2alpha1-with-v1:
+	@echo ">> Please use only COMMUNITY mode! Current RELEASE_MODE=$(RELEASE_MODE)"
 	@rm -f pkg/apis/deployment/v1/zz_generated.deepcopy.go pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go
 	@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
 	@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 = "v1"#ArangoDeploymentVersion = "v2alpha1"#g' > "$(ROOT)/pkg/apis/deployment/v2alpha1/$${file}"; done

docs/api/ArangoMLCronJob.V1Alpha1.md

@@ -4,7 +4,7 @@
 
 ### .spec
 
-Type: `batch.CronJobSpec` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/cronjob_spec.go#L32)</sup>
+Type: `batch.CronJobSpec` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/cronjob_spec.go#L33)</sup>
 
 Links:
 * [Kubernetes Documentation](https://godoc.org/k8s.io/api/batch/v1beta1#CronJobSpec)
@@ -13,7 +13,7 @@ Links:
 
 ### .status
 
-Type: `batch.CronJobStatus` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/cronjob_status.go#L36)</sup>
+Type: `batch.CronJobStatus` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/cronjob_status.go#L38)</sup>
 
 Links:
 * [Kubernetes Documentation](https://godoc.org/k8s.io/api/batch/v1beta1#CronJobStatus)
@@ -22,7 +22,31 @@ Links:
 
 ### .status.conditions
 
-Type: `api.Conditions` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/cronjob_status.go#L32)</sup>
+Type: `api.Conditions` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/cronjob_status.go#L34)</sup>
 
 Conditions specific to the entire cron job
 
+***
+
+### .status.ref.name
+
+Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/shared/v1/object.go#L46)</sup>
+
+Name of the object
+
+***
+
+### .status.ref.namespace
+
+Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/shared/v1/object.go#L49)</sup>
+
+Namespace of the object. Should default to the namespace of the parent object
+
+***
+
+### .status.ref.uid
+
+Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/shared/v1/object.go#L52)</sup>
+
+UID keeps the information about object UID
+

pkg/apis/ml/v1alpha1/cronjob_spec.go

@@ -21,17 +21,27 @@
 package v1alpha1
 
 import (
-	batchApi "k8s.io/api/batch/v1beta1"
+	batch "k8s.io/api/batch/v1"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/shared"
+	"github.com/arangodb/kube-arangodb/pkg/util/errors"
 )
 
 type ArangoMLCronJobSpec struct {
 	// +doc/type: batch.CronJobSpec
 	// +doc/link: Kubernetes Documentation|https://godoc.org/k8s.io/api/batch/v1beta1#CronJobSpec
-	*batchApi.CronJobSpec `json:",inline"`
+	*batch.CronJobSpec `json:",inline"`
 }
 
 func (a *ArangoMLCronJobSpec) Validate() error {
-	return shared.WithErrors(shared.PrefixResourceErrors("spec"))
+	if a == nil {
+		return errors.Newf("Spec is not defined")
+	}
+
+	var err []error
+	if a.CronJobSpec == nil {
+		err = append(err, shared.PrefixResourceErrors("spec", errors.Newf("CronJobSpec is not defined")))
+	}
+
+	return shared.WithErrors(err...)
 }

pkg/apis/ml/v1alpha1/cronjob_status.go

@@ -21,9 +21,11 @@
 package v1alpha1
 
 import (
-	batchApi "k8s.io/api/batch/v1beta1"
+	batch "k8s.io/api/batch/v1"
 
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
+	"github.com/arangodb/kube-arangodb/pkg/apis/shared"
+	sharedApi "github.com/arangodb/kube-arangodb/pkg/apis/shared/v1"
 )
 
 type ArangoMLCronJobStatus struct {
@@ -33,5 +35,12 @@ type ArangoMLCronJobStatus struct {
 
 	// +doc/type: batch.CronJobStatus
 	// +doc/link: Kubernetes Documentation|https://godoc.org/k8s.io/api/batch/v1beta1#CronJobStatus
-	batchApi.CronJobStatus `json:",inline"`
+	*batch.CronJobStatus `json:",inline"`
+
+	// Ref keeps the reference to the CronJob
+	Ref *sharedApi.Object `json:"ref,omitempty"`
+}
+
+func (a *ArangoMLCronJobStatus) Validate() error {
+	return shared.WithErrors(shared.PrefixResourceErrors("spec"))
 }

pkg/apis/ml/v1alpha1/extension_conditions.go

@@ -29,4 +29,5 @@ const (
 	ExtensionMetadataServiceValidCondition api.ConditionType = "MetadataServiceValid"
 	ExtensionServiceAccountReadyCondition  api.ConditionType = "ServiceAccountReady"
 	LicenseValidCondition                  api.ConditionType = "LicenseValid"
+	CronJobSyncedCondition                 api.ConditionType = "CronJobSynced"
 )

pkg/operatorV2/operator_worker.go

@@ -22,6 +22,7 @@ package operator
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/arangodb/kube-arangodb/pkg/operatorV2/operation"
 	"github.com/arangodb/kube-arangodb/pkg/util/errors"
@@ -109,7 +110,9 @@ func (o *operator) processObject(obj interface{}) error {
 		o.workqueue.AddRateLimited(key)
 
 		if !IsReconcile(err) {
-			return errors.Newf("error syncing '%s': %s, re-queuing", key, err.Error())
+			message := fmt.Sprintf("error syncing '%s': %s, re-queuing", key, err.Error())
+			loggerWorker.Debug(message)
+			return errors.Newf(message)
 		}
 
 		return nil