Skip to content

fix: respect Controller service clusterIP configuration for headless services #63

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: respect Controller service clusterIP configuration for headless services #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a03fb14
fix(controller): respect clusterIP setting for headless services
jskswamy Oct 3, 2025
4367184
test(builder): enhance service controller tests to fix fragile tests
jskswamy Oct 17, 2025
cd740b3
feat(builder): add headless service support for accounting, login, an…
jskswamy Oct 17, 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 internal/builder/accounting_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func (b *Builder) BuildAccountingService(accounting *slinkyv1alpha1.Accounting)
Selector: labels.NewBuilder().
WithAccountingSelectorLabels(accounting).
Build(),
Headless: accounting.Spec.Service.ServiceSpecWrapper.ServiceSpec.ClusterIP == corev1.ClusterIPNone,
}

opts.Metadata.Labels = structutils.MergeMaps(opts.Metadata.Labels, labels.NewBuilder().WithAccountingLabels(accounting).Build())
Expand Down
64 changes: 60 additions & 4 deletions internal/builder/accounting_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ func TestBuilder_BuildAccountingService(t *testing.T) {
accounting *slinkyv1alpha1.Accounting
}
tests := []struct {
name string
fields fields
args args
wantErr bool
name string
fields fields
args args
wantErr bool
wantClusterIP string
wantPublishNotReadyAddresses bool
}{
{
name: "default",
Expand Down Expand Up @@ -58,6 +60,49 @@ func TestBuilder_BuildAccountingService(t *testing.T) {
},
},
},
wantClusterIP: "",
wantPublishNotReadyAddresses: false,
},
{
name: "headless service",
fields: fields{
client: fake.NewClientBuilder().
WithObjects(&corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "mariadb",
},
Data: map[string][]byte{
"password": []byte("mariadb-password"),
},
}).
Build(),
},
args: args{
accounting: &slinkyv1alpha1.Accounting{
ObjectMeta: metav1.ObjectMeta{
Name: "slurm",
},
Spec: slinkyv1alpha1.AccountingSpec{
Service: slinkyv1alpha1.ServiceSpec{
ServiceSpecWrapper: slinkyv1alpha1.ServiceSpecWrapper{
ServiceSpec: corev1.ServiceSpec{
ClusterIP: corev1.ClusterIPNone,
},
},
},
StorageConfig: slinkyv1alpha1.StorageConfig{
PasswordKeyRef: corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: "mariadb",
},
Key: "password",
},
},
},
},
},
wantClusterIP: corev1.ClusterIPNone,
wantPublishNotReadyAddresses: true,
},
}
for _, tt := range tests {
Expand Down Expand Up @@ -87,6 +132,17 @@ func TestBuilder_BuildAccountingService(t *testing.T) {
got2.Spec.Template.Spec.Containers[0].Ports[0].Name,
got2.Spec.Template.Spec.Containers[0].Ports[0].ContainerPort)
}

// Validate ClusterIP
if got.Spec.ClusterIP != tt.wantClusterIP {
t.Errorf("ClusterIP = %v, want %v", got.Spec.ClusterIP, tt.wantClusterIP)
}

// Validate PublishNotReadyAddresses
if got.Spec.PublishNotReadyAddresses != tt.wantPublishNotReadyAddresses {
t.Errorf("PublishNotReadyAddresses = %v, want %v",
got.Spec.PublishNotReadyAddresses, tt.wantPublishNotReadyAddresses)
}
})
}
}
1 change: 1 addition & 0 deletions internal/builder/controller_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func (b *Builder) BuildControllerService(controller *slinkyv1alpha1.Controller)
Selector: labels.NewBuilder().
WithControllerSelectorLabels(controller).
Build(),
Headless: controller.Spec.Service.ServiceSpecWrapper.ServiceSpec.ClusterIP == corev1.ClusterIPNone,
}

opts.Metadata.Labels = structutils.MergeMaps(opts.Metadata.Labels, labels.NewBuilder().WithControllerLabels(controller).Build())
Expand Down
49 changes: 44 additions & 5 deletions internal/builder/controller_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ func TestBuilder_BuildControllerService(t *testing.T) {
controller *slinkyv1alpha1.Controller
}
tests := []struct {
name string
fields fields
args args
want *corev1.Service
wantErr bool
name string
fields fields
args args
want *corev1.Service
wantErr bool
wantClusterIP string
wantPublishNotReadyAddresses bool
}{
{
name: "default",
Expand All @@ -40,6 +42,32 @@ func TestBuilder_BuildControllerService(t *testing.T) {
},
},
},
wantClusterIP: "",
wantPublishNotReadyAddresses: false,
},
{
name: "headless service",
fields: fields{
client: fake.NewFakeClient(),
},
args: args{
controller: &slinkyv1alpha1.Controller{
ObjectMeta: metav1.ObjectMeta{
Name: "slurm",
},
Spec: slinkyv1alpha1.ControllerSpec{
Service: slinkyv1alpha1.ServiceSpec{
ServiceSpecWrapper: slinkyv1alpha1.ServiceSpecWrapper{
ServiceSpec: corev1.ServiceSpec{
ClusterIP: corev1.ClusterIPNone,
},
},
},
},
},
},
wantClusterIP: corev1.ClusterIPNone,
wantPublishNotReadyAddresses: true,
},
}
for _, tt := range tests {
Expand Down Expand Up @@ -69,6 +97,17 @@ func TestBuilder_BuildControllerService(t *testing.T) {
got2.Spec.Template.Spec.Containers[0].Ports[0].Name,
got2.Spec.Template.Spec.Containers[0].Ports[0].ContainerPort)
}

// Validate ClusterIP
if got.Spec.ClusterIP != tt.wantClusterIP {
t.Errorf("ClusterIP = %v, want %v", got.Spec.ClusterIP, tt.wantClusterIP)
}

// Validate PublishNotReadyAddresses
if got.Spec.PublishNotReadyAddresses != tt.wantPublishNotReadyAddresses {
t.Errorf("PublishNotReadyAddresses = %v, want %v",
got.Spec.PublishNotReadyAddresses, tt.wantPublishNotReadyAddresses)
}
})
}
}
1 change: 1 addition & 0 deletions internal/builder/login_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func (b *Builder) BuildLoginService(loginset *slinkyv1alpha1.LoginSet) (*corev1.
Selector: labels.NewBuilder().
WithLoginSelectorLabels(loginset).
Build(),
Headless: loginset.Spec.Service.ServiceSpecWrapper.ServiceSpec.ClusterIP == corev1.ClusterIPNone,
}

opts.Metadata.Labels = structutils.MergeMaps(opts.Metadata.Labels, labels.NewBuilder().WithLoginLabels(loginset).Build())
Expand Down
58 changes: 53 additions & 5 deletions internal/builder/login_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ func TestBuilder_BuildLoginService(t *testing.T) {
loginset *slinkyv1alpha1.LoginSet
}
tests := []struct {
name string
fields fields
args args
want *corev1.Service
wantErr bool
name string
fields fields
args args
want *corev1.Service
wantErr bool
wantClusterIP string
wantPublishNotReadyAddresses bool
}{
{
name: "default",
Expand All @@ -51,6 +53,41 @@ func TestBuilder_BuildLoginService(t *testing.T) {
},
},
},
wantClusterIP: "",
wantPublishNotReadyAddresses: false,
},
{
name: "headless service",
fields: fields{
client: fake.NewClientBuilder().
WithObjects(&slinkyv1alpha1.Controller{
ObjectMeta: metav1.ObjectMeta{
Name: "slurm",
},
}).
Build(),
},
args: args{
loginset: &slinkyv1alpha1.LoginSet{
ObjectMeta: metav1.ObjectMeta{
Name: "slurm-foo",
},
Spec: slinkyv1alpha1.LoginSetSpec{
Service: slinkyv1alpha1.ServiceSpec{
ServiceSpecWrapper: slinkyv1alpha1.ServiceSpecWrapper{
ServiceSpec: corev1.ServiceSpec{
ClusterIP: corev1.ClusterIPNone,
},
},
},
ControllerRef: slinkyv1alpha1.ObjectReference{
Name: "slurm",
},
},
},
},
wantClusterIP: corev1.ClusterIPNone,
wantPublishNotReadyAddresses: true,
},
}
for _, tt := range tests {
Expand Down Expand Up @@ -80,6 +117,17 @@ func TestBuilder_BuildLoginService(t *testing.T) {
got2.Spec.Template.Spec.Containers[0].Ports[0].Name,
got2.Spec.Template.Spec.Containers[0].Ports[0].ContainerPort)
}

// Validate ClusterIP
if got.Spec.ClusterIP != tt.wantClusterIP {
t.Errorf("ClusterIP = %v, want %v", got.Spec.ClusterIP, tt.wantClusterIP)
}

// Validate PublishNotReadyAddresses
if got.Spec.PublishNotReadyAddresses != tt.wantPublishNotReadyAddresses {
t.Errorf("PublishNotReadyAddresses = %v, want %v",
got.Spec.PublishNotReadyAddresses, tt.wantPublishNotReadyAddresses)
}
})
}
}
1 change: 1 addition & 0 deletions internal/builder/restapi_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func (b *Builder) BuildRestapiService(restapi *slinkyv1alpha1.RestApi) (*corev1.
Selector: labels.NewBuilder().
WithRestapiSelectorLabels(restapi).
Build(),
Headless: restapi.Spec.Service.ServiceSpecWrapper.ServiceSpec.ClusterIP == corev1.ClusterIPNone,
}

opts.Metadata.Labels = structutils.MergeMaps(opts.Metadata.Labels, labels.NewBuilder().WithRestapiLabels(restapi).Build())
Expand Down
58 changes: 53 additions & 5 deletions internal/builder/restapi_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ func TestBuilder_BuildRestapiService(t *testing.T) {
restapi *slinkyv1alpha1.RestApi
}
tests := []struct {
name string
fields fields
args args
want *corev1.Service
wantErr bool
name string
fields fields
args args
want *corev1.Service
wantErr bool
wantClusterIP string
wantPublishNotReadyAddresses bool
}{
{
name: "default",
Expand All @@ -51,6 +53,41 @@ func TestBuilder_BuildRestapiService(t *testing.T) {
},
},
},
wantClusterIP: "",
wantPublishNotReadyAddresses: false,
},
{
name: "headless service",
fields: fields{
client: fake.NewClientBuilder().
WithObjects(&slinkyv1alpha1.Controller{
ObjectMeta: metav1.ObjectMeta{
Name: "slurm",
},
}).
Build(),
},
args: args{
restapi: &slinkyv1alpha1.RestApi{
ObjectMeta: metav1.ObjectMeta{
Name: "slurm",
},
Spec: slinkyv1alpha1.RestApiSpec{
Service: slinkyv1alpha1.ServiceSpec{
ServiceSpecWrapper: slinkyv1alpha1.ServiceSpecWrapper{
ServiceSpec: corev1.ServiceSpec{
ClusterIP: corev1.ClusterIPNone,
},
},
},
ControllerRef: slinkyv1alpha1.ObjectReference{
Name: "slurm",
},
},
},
},
wantClusterIP: corev1.ClusterIPNone,
wantPublishNotReadyAddresses: true,
},
}
for _, tt := range tests {
Expand Down Expand Up @@ -80,6 +117,17 @@ func TestBuilder_BuildRestapiService(t *testing.T) {
got2.Spec.Template.Spec.Containers[0].Ports[0].Name,
got2.Spec.Template.Spec.Containers[0].Ports[0].ContainerPort)
}

// Validate ClusterIP
if got.Spec.ClusterIP != tt.wantClusterIP {
t.Errorf("ClusterIP = %v, want %v", got.Spec.ClusterIP, tt.wantClusterIP)
}

// Validate PublishNotReadyAddresses
if got.Spec.PublishNotReadyAddresses != tt.wantPublishNotReadyAddresses {
t.Errorf("PublishNotReadyAddresses = %v, want %v",
got.Spec.PublishNotReadyAddresses, tt.wantPublishNotReadyAddresses)
}
})
}
}