[🍒]Skip pre-upgrade jobs for patch revisions and improve version comparison

api/v1alpha1/cdapmaster_types.go

@@ -70,7 +70,9 @@ type CDAPMasterSpec struct {
 	// Logs is specification for the CDAP logging service.
 	Logs LogsSpec `json:"logs,omitempty"`
 	// Messaging is specification for the CDAP messaging service.
-	Messaging MessagingSpec `json:"messaging,omitempty"`
+	// To disable this service: either omit or set the field to nil
+	// To enable this service: set it to a pointer to a MessagingSpec struct (can be an empty struct)
+	Messaging *MessagingSpec `json:"messaging,omitempty"`
 	// Metadata is specification for the CDAP metadata service.
 	Metadata MetadataSpec `json:"metadata,omitempty"`
 	// Metrics is specification for the CDAP metrics service.
@@ -174,6 +176,10 @@ type CDAPServiceSpec struct {
 	Lifecycle *corev1.Lifecycle `json:"lifecycle,omitempty"`
 	// Affinity describes node affinity scheduling rules for the service.
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`
+	// StartupProbe is an optional field to configure startup probe for the main container in the service pods.
+	// To disable startup probe: either omit or set the field to nil.
+	// To enable startup probe: set it to a pointer to a StartupProbe struct.
+	StartupProbe *StartupProbe `json:"startupProbe,omitempty"`
 }
 
 // CDAPScalableServiceSpec defines the base specification for master services that can have more than one instance.
@@ -221,6 +227,14 @@ type CDAPScalableStatefulServiceSpec struct {
 // AppFabricSpec defines the specification for the AppFabric service.
 type AppFabricSpec struct {
 	CDAPScalableServiceSpec `json:",inline"`
+	// StorageSize is specification for the persistent volume size used by the service.
+	// Note: This is added for backward compatibility where Appfabric runs as CDAP stateful service.
+	// This field can be set to nil if appfabric is run as CDAP scalable service.
+	StorageSize *string `json:"storageSize,omitempty"`
+	// StorageClassName is the name of the StorageClass for the persistent volume used by the service.
+	// Note: This is added for backward compatibility where Appfabric runs as CDAP stateful service.
+	// This field can be set to nil if appfabric is run as CDAP scalable service.
+	StorageClassName *string `json:"storageClassName,omitempty"`
 }
 
 // AppFabricProcessorSpec defines the specification for the AppFabric Processor service.
@@ -293,6 +307,26 @@ type SystemMetricExporterSpec struct {
 	CDAPServiceSpec `json:",inline"`
 }
 
+// StartupProbe defines the fields for setting corev1.Probe for the main containers in the service pods.
+// For Probe config see:
+// https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes.
+type StartupProbe struct {
+	// Port is the port on which the CDAP service is running in the container.
+	Port int32 `json:"port,omitempty"`
+	// Number of seconds after the container has started before probes are initiated.
+	// Defaults to 0 seconds. Minimum value is 0.
+	InitialDelaySeconds *int32 `json:"initialDelaySeconds,omitempty"`
+	// How often (in seconds) to perform the probe.
+	// Default to 10 seconds. The minimum value is 1.
+	PeriodSeconds *int32 `json:"periodSeconds,omitempty"`
+	// Number of seconds after which the probe times out.
+	// Defaults to 1 second. Minimum value is 1.
+	TimeoutSeconds *int32 `json:"timeoutSeconds,omitempty"`
+	// Number of consecutive failures before considering the service not ready.
+	// Defaults to 3. Minimum value is 1.
+	FailureThreshold *int32 `json:"failureThreshold,omitempty"`
+}
+
 // CDAPMasterStatus defines the observed state of CDAPMaster
 type CDAPMasterStatus struct {
 	status.Meta          `json:",inline"`