Skip to content

Commit

Permalink
feat(agent): versions is not correctly mapped (#1160)
Browse files Browse the repository at this point in the history
Co-authored-by: David Ragot <[email protected]>
  • Loading branch information
Dav-14 and David Ragot authored Jan 30, 2024
1 parent 55616d9 commit 6cd67f8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions ee/agent/internal/grpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,12 @@ func (client *client) createStack(stack *generated.Stack) *v1beta3.Stack {
}
}(),
Disabled: stack.Disabled,
Versions: stack.Versions,
},
}
}

func (client *client) mergeStack(currentStack *v1beta3.Stack, into *v1beta3.Stack) *v1beta3.Stack {
func mergeStack(currentStack *v1beta3.Stack, into *v1beta3.Stack) *v1beta3.Stack {
into.SetResourceVersion(currentStack.GetResourceVersion())
into.Spec.Services = currentStack.Spec.Services
into.Spec.Seed = currentStack.Spec.Seed
Expand Down Expand Up @@ -355,7 +356,7 @@ func (client *client) Start(ctx context.Context) error {
continue
}

newStack := client.mergeStack(existingStack, createStack)
newStack := mergeStack(existingStack, createStack)
if _, err := client.k8sClient.Stacks().Update(ctx, newStack); err != nil {
sharedlogging.FromContext(ctx).Errorf("Updating stack cluster side: %s", err)
continue
Expand Down

0 comments on commit 6cd67f8

Please sign in to comment.