(Feature) Add ACSDeploymentSynced condition type and fix comparison of SecretHashes method (arangodb#944)

jwierzbo · web-flow · commit 635ed17f7f55 · 2022-05-26T12:56:51.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - (Feature) Allow raw json value for license token-v2
 - (Update) Replace `beta.kubernetes.io/arch` to `kubernetes.io/arch` in Operator Chart
 - (Feature) Add operator shutdown handler for graceful termination
+- (Feature) Add `ACSDeploymentSynced` condition type and fix comparison of `SecretHashes` method
 
 ## [1.2.12](https://github.com/arangodb/kube-arangodb/tree/1.2.12) (2022-05-10)
 - (Feature) Add CoreV1 Endpoints Inspector
diff --git a/pkg/apis/deployment/v1/secret_hashes.go b/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 &&
diff --git a/pkg/apis/deployment/v2alpha1/secret_hashes.go b/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 &&
diff --git a/pkg/deployment/acs/sutil/conditions.go b/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"
 )

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,5 @@ const (`
`28`	`28`	`RemoteDeploymentReadyCondition api.ConditionType = "RemoteDeploymentReadyCondition"`
`29`	`29`	`RemoteCacheReadyCondition api.ConditionType = "RemoteCacheReady"`
`30`	`30`	`ConnectionReadyCondition api.ConditionType = "ConnectionReady"`
	`31`	`+ ACSDeploymentSyncedCondition api.ConditionType = "ACSDeploymentSynced"`
`31`	`32`	`)`