Skip to content

fix controller after bump gqlgenc to v0.33.0 #3130

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
zreigz merged 1 commit into from
Jan 29, 2026
Merged

fix controller after bump gqlgenc to v0.33.0 #3130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified charts/console-rapid/charts/controller-0.0.166.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified charts/console-rapid/charts/kas-0.3.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified charts/console/charts/controller-0.0.166.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified charts/console/charts/kas-0.3.1.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion go/controller/internal/client/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (c *client) IsServiceDeleting(id string) bool {
return false
}

return service != nil && service.DeletedAt != nil
return service != nil && service.ServiceDeploymentFragment.DeletedAt != nil
}

func (c *client) CreateService(clusterId *string, attributes console.ServiceDeploymentAttributes) (*console.ServiceDeploymentExtended, error) {
Expand Down
6 changes: 3 additions & 3 deletions go/controller/internal/controller/servicedeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func (r *ServiceDeploymentReconciler) Process(ctx context.Context, req ctrl.Requ
}

if service.Status.HasSHA() && !service.Status.IsSHAEqual(sha) {
if err := r.ConsoleClient.UpdateService(existingService.ID, updater); err != nil {
if err := r.ConsoleClient.UpdateService(existingService.ServiceDeploymentFragment.ServiceDeploymentBaseFragment.ID, updater); err != nil {
utils.MarkCondition(service.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReason, err.Error())
return ctrl.Result{}, err
}
Expand Down Expand Up @@ -241,7 +241,7 @@ func (r *ServiceDeploymentReconciler) getClusterID(ctx context.Context, service
}

func updateStatus(r *v1alpha1.ServiceDeployment, existingService *console.ServiceDeploymentExtended, sha string) {
r.Status.ID = &existingService.ID
r.Status.ID = &existingService.ServiceDeploymentFragment.ServiceDeploymentBaseFragment.ID
r.Status.SHA = &sha
if existingService.Errors != nil {
r.Status.Errors = algorithms.Map(existingService.Errors,
Expand All @@ -253,7 +253,7 @@ func updateStatus(r *v1alpha1.ServiceDeployment, existingService *console.Servic
})
}
r.Status.Components = make([]v1alpha1.ServiceComponent, 0)
for _, c := range existingService.Components {
for _, c := range existingService.ServiceDeploymentFragment.Components {
sc := v1alpha1.ServiceComponent{
ID: c.ID,
Name: c.Name,
Expand Down
30 changes: 25 additions & 5 deletions go/controller/internal/controller/servicedeployment_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,11 @@ var _ = Describe("Service Controller", Ordered, func() {
},
},
returnGetService: &gqlclient.ServiceDeploymentExtended{
ID: "123",
ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
ID: "123",
},
},
},
}

Expand Down Expand Up @@ -210,7 +214,11 @@ var _ = Describe("Service Controller", Ordered, func() {
},
},
returnGetService: &gqlclient.ServiceDeploymentExtended{
ID: "123",
ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
ID: "123",
},
},
},
}

Expand Down Expand Up @@ -276,7 +284,11 @@ var _ = Describe("Service Controller", Ordered, func() {
},
},
returnGetService: &gqlclient.ServiceDeploymentExtended{
ID: "123",
ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
ID: "123",
},
},
},
}
dep1 := "dep-1"
Expand Down Expand Up @@ -463,7 +475,11 @@ var _ = Describe("wait for resources", Ordered, func() {
},
},
returnGetService: &gqlclient.ServiceDeploymentExtended{
ID: "123",
ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
ID: "123",
},
},
},
}

Expand Down Expand Up @@ -809,7 +825,11 @@ var _ = Describe("Get DiffNormalizerAttributes", Ordered, func() {
},
},
returnGetService: &gqlclient.ServiceDeploymentExtended{
ID: "123",
ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
ID: "123",
},
},
},
}

Expand Down
Loading