Iteration

Author: jwierzbo

pkg/apis/deployment/v1/secret_hashes.go

@@ -38,10 +38,10 @@ type SecretHashes struct {
 
 // Equal compares two SecretHashes
 func (sh *SecretHashes) Equal(other *SecretHashes) bool {
-	if sh == nil || other == nil {
-		return false
-	} else if sh == other {
+	if sh == nil && other == nil {
 		return true
+	} else if sh == nil || other == nil {
+		return false
 	}
 
 	return sh.AuthJWT == other.AuthJWT &&

pkg/apis/deployment/v2alpha1/secret_hashes.go

@@ -38,10 +38,10 @@ type SecretHashes struct {
 
 // Equal compares two SecretHashes
 func (sh *SecretHashes) Equal(other *SecretHashes) bool {
-	if sh == nil || other == nil {
-		return false
-	} else if sh == other {
+	if sh == nil && other == nil {
 		return true
+	} else if sh == nil || other == nil {
+		return false
 	}
 
 	return sh.AuthJWT == other.AuthJWT &&

pkg/deployment/acs/sutil/conditions.go

@@ -28,4 +28,5 @@ const (
 	RemoteDeploymentReadyCondition api.ConditionType = "RemoteDeploymentReadyCondition"
 	RemoteCacheReadyCondition      api.ConditionType = "RemoteCacheReady"
 	ConnectionReadyCondition       api.ConditionType = "ConnectionReady"
+	ACSDeploymentSyncedCondition   api.ConditionType = "ACSDeploymentSynced"
 )