Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/deployment/v1/secret_hashes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/deployment/v2alpha1/secret_hashes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
1 change: 1 addition & 0 deletions pkg/deployment/acs/sutil/conditions.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ const (
RemoteDeploymentReadyCondition api.ConditionType = "RemoteDeploymentReadyCondition"
RemoteCacheReadyCondition api.ConditionType = "RemoteCacheReady"
ConnectionReadyCondition api.ConditionType = "ConnectionReady"
ACSDeploymentSyncedCondition api.ConditionType = "ACSDeploymentSynced"
)