Skip to content

Commit 9175d4d

Browse files
committed
[Bugfix] Prevent Member Maintenance Error log (#1136)
1 parent effed19 commit 9175d4d

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- (Feature) Add action progress
55
- (Feature) Ensure consistency during replication cancellation
66
- (Feature) Add annotation to change architecture of a member
7+
- (Bugfix) Prevent Member Maintenance Error log
78

89
## [1.2.19](https://github.com/arangodb/kube-arangodb/tree/1.2.19) (2022-10-05)
910
- (Bugfix) Prevent changes when UID is wrong

pkg/deployment/features/features.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020

2121
package features
2222

23-
import "github.com/arangodb/go-driver"
23+
import (
24+
"github.com/arangodb/go-driver"
25+
26+
api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
27+
)
2428

2529
const (
2630
Enabled = "true"
@@ -40,6 +44,7 @@ type Feature interface {
4044
Deprecated() (bool, string)
4145
Hidden() bool
4246
Supported(v driver.Version, enterprise bool) bool
47+
ImageSupported(i *api.ImageInfo) bool
4348
}
4449

4550
type feature struct {
@@ -51,6 +56,14 @@ type feature struct {
5156
hidden bool
5257
}
5358

59+
func (f feature) ImageSupported(i *api.ImageInfo) bool {
60+
if i == nil {
61+
return false
62+
}
63+
64+
return f.Supported(i.ArangoDBVersion, i.Enterprise)
65+
}
66+
5467
func (f feature) Hidden() bool {
5568
return f.hidden
5669
}

pkg/deployment/reconcile/helper_wrap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func withMemberMaintenance(group api.ServerGroup, member api.MemberStatus, reaso
5151
return plan
5252
}
5353

54-
if !features.Version310().Enabled() {
54+
if !features.Version310().ImageSupported(member.Image) {
5555
return plan
5656
}
5757

pkg/deployment/resources/pod_creator_probes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,5 +513,5 @@ func getProbeRetries(group api.ServerGroup) (int32, int32) {
513513
// IsServerProgressAvailable returns true if server progress is available.
514514
func IsServerProgressAvailable(group api.ServerGroup, imageInfo api.ImageInfo) bool {
515515
return group == api.ServerGroupDBServers &&
516-
features.Version310().Supported(imageInfo.ArangoDBVersion, imageInfo.Enterprise)
516+
features.Version310().ImageSupported(&imageInfo)
517517
}

0 commit comments

Comments
 (0)