Merge pull request #57 from BuddhiWathsala/master

Enable version controlling for SiddhiProcess CR objects

pkg/apis/siddhi/v1alpha2/siddhiprocess_functions.go

@@ -20,6 +20,9 @@ package v1alpha2
 
 import (
 	"sort"
+	"reflect"
+
+	corev1 "k8s.io/api/core/v1"
 )
 
 // Equals function of PV check the equality of two PV structs
@@ -57,6 +60,69 @@ func (p *MessagingSystem) Equals(q *MessagingSystem) bool {
 	return (typeEq && cidEq)
 }
 
+// Equals 
+func (p *SiddhiProcessSpec) Equals(q *SiddhiProcessSpec) bool {
+	if !EqualApps(p.Apps, q.Apps) {
+		return false
+	}
+	if p.SiddhiConfig != q.SiddhiConfig {
+		return false
+	}
+	if !EqualContainers(&p.Container, &q.Container){
+		return false
+	}
+	if !p.MessagingSystem.Equals(&q.MessagingSystem) {
+		return false
+	}
+	if !p.PV.Equals(&q.PV) {
+		return false
+	}
+	if p.ImagePullSecret != q.ImagePullSecret {
+		return false
+	}
+	return true
+}
+
+// EqualApps 
+func EqualApps(p []Apps, q []Apps) bool {
+	if len(p) != len(q) {
+		return false
+	}
+	for _, pApp := range p {
+		contained := false
+		for _, qApp := range q {
+			if reflect.DeepEqual(pApp, qApp) {
+				contained = true
+				break
+			}
+		}
+		if !contained {
+			return false
+		}
+	}
+	return true
+}
+
+// EqualContainers 
+func EqualContainers(p *corev1.Container, q *corev1.Container) bool {
+	if p.Image != q.Image {
+		return false
+	}
+	for _, pEnv := range p.Env {
+		contained := false
+		for _, qEnv := range q.Env {
+			if reflect.DeepEqual(pEnv, qEnv) {
+				contained = true
+				break
+			}
+		}
+		if !contained {
+			return false
+		}
+	}
+	return true
+}
+
 // EmptyConfig function of MessagingSystem check the equality of two MessagingSystem structs
 func (p *MessagingSystem) EmptyConfig() bool {
 	if p.Config.ClusterID != "" {

pkg/apis/siddhi/v1alpha2/siddhiprocess_types.go

@@ -85,9 +85,9 @@ type SiddhiProcessSpec struct {
 // SiddhiProcessStatus defines the observed state of SiddhiProcess
 // +k8s:openapi-gen=true
 type SiddhiProcessStatus struct {
-	Nodes  []string `json:"nodes"`
 	Status string   `json:"status"`
 	Ready  string   `json:"ready"`
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object