apache#1199: add cronjob conditions

nicolaferraro · Jan 28, 2020 · f167562 · f167562
1 parent 69e75dd
commit f167562
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 46 deletions.
diff --git a/assets/json-schema/Integration.json b/assets/json-schema/Integration.json
@@ -272,6 +272,12 @@
           "$schema": "http://json-schema.org/draft-04/schema#",
           "$ref": "#/definitions/Failure"
         },
+        "generatedResources": {
+          "items": {
+            "$ref": "#/definitions/ResourceSpec"
+          },
+          "type": "array"
+        },
         "generatedSources": {
           "items": {
             "$ref": "#/definitions/SourceSpec"

diff --git a/deploy/builder-role-kubernetes.yaml b/deploy/builder-role-kubernetes.yaml
@@ -44,10 +44,18 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - events
   - configmaps
   - secrets
   verbs:
   - get
   - list
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - get
+  - list
+  - watch
diff --git a/deploy/builder-role-openshift.yaml b/deploy/builder-role-openshift.yaml
@@ -44,13 +44,21 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - events
   - configmaps
   - secrets
   verbs:
   - get
   - list
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - get
+  - list
+  - watch
 - apiGroups:
   - ""
   - "build.openshift.io"

diff --git a/deploy/resources.go b/deploy/resources.go
diff --git a/pkg/apis/camel/v1/integration_types.go b/pkg/apis/camel/v1/integration_types.go
@@ -181,6 +181,8 @@ const (
 	IntegrationConditionServiceAvailable IntegrationConditionType = "ServiceAvailable"
 	// IntegrationConditionKnativeServiceAvailable --
 	IntegrationConditionKnativeServiceAvailable IntegrationConditionType = "KnativeServiceAvailable"
+	// IntegrationConditionCronJobAvailable --
+	IntegrationConditionCronJobAvailable IntegrationConditionType = "CronJobAvailable"
 	// IntegrationConditionExposureAvailable --
 	IntegrationConditionExposureAvailable IntegrationConditionType = "ExposureAvailable"
 	// IntegrationConditionPrometheusAvailable --
@@ -214,6 +216,10 @@ const (
 	IntegrationConditionKnativeServiceAvailableReason string = "KnativeServiceAvailable"
 	// IntegrationConditionKnativeServiceNotAvailableReason --
 	IntegrationConditionKnativeServiceNotAvailableReason string = "KnativeServiceNotAvailable"
+	// IntegrationConditionCronJobAvailableReason --
+	IntegrationConditionCronJobAvailableReason string = "CronJobAvailableReason"
+	// IntegrationConditionCronJobNotAvailableReason --
+	IntegrationConditionCronJobNotAvailableReason string = "CronJobNotAvailableReason"
 	// IntegrationConditionPrometheusAvailableReason --
 	IntegrationConditionPrometheusAvailableReason string = "PrometheusAvailable"
 	// IntegrationConditionJolokiaAvailableReason --

diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go
@@ -108,6 +108,13 @@ func newCronTrait() *cronTrait {
 
 func (t *cronTrait) Configure(e *Environment) (bool, error) {
 	if t.Enabled != nil && !*t.Enabled {
+		e.Integration.Status.SetCondition(
+			v1.IntegrationConditionCronJobAvailable,
+			corev1.ConditionFalse,
+			v1.IntegrationConditionCronJobNotAvailableReason,
+			"explicitly disabled",
+		)
+
 		return false, nil
 	}
 
@@ -118,6 +125,11 @@ func (t *cronTrait) Configure(e *Environment) (bool, error) {
 	if t.Auto == nil || *t.Auto {
 		globalCron, err := t.getGlobalCron(e)
 		if err != nil {
+			e.Integration.Status.SetErrorCondition(
+				v1.IntegrationConditionCronJobAvailable,
+				v1.IntegrationConditionCronJobNotAvailableReason,
+				err,
+			)
 			return false, err
 		}
 
@@ -166,6 +178,12 @@ func (t *cronTrait) Configure(e *Environment) (bool, error) {
 		return false, err
 	}
 	if strategy != ControllerStrategyCronJob {
+		e.Integration.Status.SetCondition(
+			v1.IntegrationConditionCronJobAvailable,
+			corev1.ConditionFalse,
+			v1.IntegrationConditionCronJobNotAvailableReason,
+			"controller strategy: "+string(strategy),
+		)
 		return false, nil
 	}
 
@@ -187,6 +205,13 @@ func (t *cronTrait) Apply(e *Environment) error {
 			e.Resources.AddAll(maps)
 			e.Resources.Add(cronJob)
 
+			e.Integration.Status.SetCondition(
+				v1.IntegrationConditionCronJobAvailable,
+				corev1.ConditionTrue,
+				v1.IntegrationConditionCronJobAvailableReason,
+				fmt.Sprintf("CronJob name is %s", cronJob.Name),
+			)
+
 			envvar.SetVal(&e.EnvVars, "CAMEL_K_CRON_OVERRIDE", t.Components)
 		}
 	}