Skip to content

[Bugfix] [Platform] Ensure Inventory uses the serving group for license generation #1988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 6, 2025
Merged

[Bugfix] [Platform] Ensure Inventory uses the serving group for license generation #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3069ab9
[Bugfix] [Platform] Ensure Inventory uses the serving group for licen…
ajanikow Nov 6, 2025
0fb3364
Iter
ajanikow Nov 6, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- (Feature) (Platform) Registry Secret
- (Bugfix) (Platform) Ensure Inventory picks active leader
- (Bugfix) (Platform) Reload Config on Inventory Change
- (Bugfix) (Platform) Ensure Inventory uses the serving group for license generation

## [1.3.1](https://github.com/arangodb/kube-arangodb/tree/1.3.1) (2025-10-07)
- (Documentation) Add ArangoPlatformStorage Docs & Examples
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/shared/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (

var (
resourceNameRE = regexp.MustCompile(`^([0-9\-\.a-z])+$`)
apiPathRE = regexp.MustCompile(`^(/[_A-Za-z0-9\-]+)*/?$`)
apiPathRE = regexp.MustCompile(`^(/[_\.A-Za-z0-9\-]+)*/?$`)
)

const (
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/shared/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// DISCLAIMER
//
// Copyright 2023-2024 ArangoDB GmbH, Cologne, Germany
// Copyright 2023-2025 ArangoDB GmbH, Cologne, Germany
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,6 +37,7 @@ func Test_ValidateAPIPath(t *testing.T) {
require.NoError(t, ValidateAPIPath("/"))
require.Error(t, ValidateAPIPath("//"))
require.NoError(t, ValidateAPIPath("/api/zz"))
require.NoError(t, ValidateAPIPath("/api/zz.22"))
require.NoError(t, ValidateAPIPath("/api/"))
require.NoError(t, ValidateAPIPath("/api/test/qw/"))
require.NoError(t, ValidateAPIPath("/api/test/2/"))
Expand Down
8 changes: 4 additions & 4 deletions pkg/deployment/reconcile/plan_builder_license.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ func (r *Reconciler) updateClusterLicenseDiscover(spec api.DeploymentSpec, conte
return "", errors.Errorf("Unable to discover License mode")
}

func (r *Reconciler) updateClusterLicenseMember(status api.DeploymentStatus) (api.DeploymentStatusMemberElement, bool) {
members := status.Members.AsListInGroups(arangod.GroupsWithLicenseV2()...).Filter(func(a api.DeploymentStatusMemberElement) bool {
func (r *Reconciler) updateClusterLicenseMember(status api.DeploymentStatus, groups ...api.ServerGroup) (api.DeploymentStatusMemberElement, bool) {
members := status.Members.AsListInGroups(groups...).Filter(func(a api.DeploymentStatusMemberElement) bool {
i := a.Member.Image
if i == nil {
return false
Expand Down Expand Up @@ -153,7 +153,7 @@ func (r *Reconciler) updateClusterLicenseKey(ctx context.Context, spec api.Deplo
return nil
}

member, ok := r.updateClusterLicenseMember(status)
member, ok := r.updateClusterLicenseMember(status, arangod.GroupsWithLicenseV2()...)

if !ok {
// No member found to take this action
Expand Down Expand Up @@ -202,7 +202,7 @@ func (r *Reconciler) updateClusterLicenseAPI(ctx context.Context, spec api.Deplo
return nil
}

member, ok := r.updateClusterLicenseMember(status)
member, ok := r.updateClusterLicenseMember(status, spec.Mode.ServingGroup())

if !ok {
// No member found to take this action
Expand Down
Loading