Skip to content

Commit 5693d82

Browse files
authored
[Bugfix] Fix VersionCheck propagation (#1438)
1 parent e9c68e1 commit 5693d82

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- (Maintenance) Bump Go to 1.20.10
1010
- (Bugfix) Fix ArangoBackup Create Backoff & ArangoBackupPolicy propagation
1111
- (Maintenance) Add IndexMethod Documentation
12+
- (Bugfix) Fix VersionCheck args propagation
1213

1314
## [1.2.33](https://github.com/arangodb/kube-arangodb/tree/1.2.33) (2023-09-27)
1415
- (Maintenance) Bump golang.org/x/net to v0.13.0

pkg/deployment/resources/pod_creator_arangod.go

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,16 @@ func CreateArangoDVolumes(status api.MemberStatus, input pod.Input, spec api.Dep
655655
return volumes
656656
}
657657

658-
// GetArgs returns list of arguments for the ArangoD upgrade container.
659-
func (a *ArangoUpgradeContainer) GetArgs() ([]string, error) {
660-
return createArangodArgsWithUpgrade(a.cachedStatus, a.input)
658+
// GetCommand returns list of arguments for the ArangoD upgrade container.
659+
func (a *ArangoUpgradeContainer) GetCommand() ([]string, error) {
660+
args, err := a.ContainerCreator.GetCommand()
661+
if err != nil {
662+
return nil, err
663+
}
664+
665+
upgradeArgs := pod.AutoUpgrade().Args(a.input).Sort().AsArgs()
666+
667+
return append(args, upgradeArgs...), nil
661668
}
662669

663670
// GetLifecycle returns no lifecycle for the ArangoD upgrade container.
@@ -675,9 +682,14 @@ func (a *ArangoUpgradeContainer) GetProbes() (*core.Probe, *core.Probe, *core.Pr
675682
return nil, nil, nil, nil
676683
}
677684

678-
// GetArgs returns list of arguments for the ArangoD version check container.
679-
func (a *ArangoVersionCheckContainer) GetArgs() ([]string, error) {
680-
return createArangodArgs(a.cachedStatus, a.input, a.versionArgs...)
685+
// GetCommand returns list of arguments for the ArangoD version check container.
686+
func (a *ArangoVersionCheckContainer) GetCommand() ([]string, error) {
687+
args, err := a.ContainerCreator.GetCommand()
688+
if err != nil {
689+
return nil, err
690+
}
691+
692+
return append(args, a.versionArgs.Sort().AsArgs()...), nil
681693
}
682694

683695
// GetLifecycle returns no lifecycle for the ArangoD version check container.

0 commit comments

Comments
 (0)