Skip to content

feat: set service ports when containerPort is set #156

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 1 commit into
base: main
Choose a base branch
from
+186 −0
Open

feat: set service ports when containerPort is set #156

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
49 changes: 49 additions & 0 deletions controllers/sandbox_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -272,6 +273,12 @@ func (r *SandboxReconciler) reconcileService(ctx context.Context, sandbox *sandb
},
},
}

ports := buildServicePorts(&sandbox.Spec.PodTemplate.Spec)
if len(ports) > 0 {
service.Spec.Ports = ports
}

service.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Service"))
if err := ctrl.SetControllerReference(sandbox, service, r.Scheme); err != nil {
log.Error(err, "Failed to set controller reference")
Expand All @@ -290,6 +297,48 @@ func (r *SandboxReconciler) reconcileService(ctx context.Context, sandbox *sandb
return service, nil
}

func buildServicePorts(podSpec *corev1.PodSpec) []corev1.ServicePort {
if podSpec == nil {
return nil
}

seen := map[string]struct{}{}
var ports []corev1.ServicePort

for _, container := range podSpec.Containers {
for _, containerPort := range container.Ports {
if containerPort.ContainerPort <= 0 {
continue
}

protocol := containerPort.Protocol
if protocol == "" {
protocol = corev1.ProtocolTCP
}

key := fmt.Sprintf("%d/%s", containerPort.ContainerPort, protocol)
if _, exists := seen[key]; exists {
continue
}

port := corev1.ServicePort{
Port: containerPort.ContainerPort,
Protocol: protocol,
TargetPort: intstr.FromInt32(containerPort.ContainerPort),
}

if containerPort.Name != "" {
port.Name = containerPort.Name
}

ports = append(ports, port)
seen[key] = struct{}{}
}
}

return ports
}

func (r *SandboxReconciler) reconcilePod(ctx context.Context, sandbox *sandboxv1alpha1.Sandbox, nameHash string) (*corev1.Pod, error) {
log := log.FromContext(ctx)

Expand Down
137 changes: 137 additions & 0 deletions controllers/sandbox_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/utils/ptr"
sandboxv1alpha1 "sigs.k8s.io/agent-sandbox/api/v1alpha1"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -406,6 +407,142 @@ func TestReconcile(t *testing.T) {
},
},
},
{
name: "sandbox spec with container ports creates service ports",
sandboxSpec: sandboxv1alpha1.SandboxSpec{
PodTemplate: sandboxv1alpha1.PodTemplate{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "main",
Ports: []corev1.ContainerPort{
{
Name: "http",
ContainerPort: 8080,
},
{
Name: "metrics",
ContainerPort: 9090,
Protocol: corev1.ProtocolTCP,
},
{
Name: "duplicate",
ContainerPort: 8080,
},
},
},
{
Name: "sidecar",
Ports: []corev1.ContainerPort{
{
Name: "admin",
ContainerPort: 9000,
Protocol: corev1.ProtocolTCP,
},
},
},
},
},
},
},
wantStatus: sandboxv1alpha1.SandboxStatus{
Service: sandboxName,
ServiceFQDN: "sandbox-name.sandbox-ns.svc.cluster.local",
Replicas: 1,
LabelSelector: "agents.x-k8s.io/sandbox-name-hash=ab179450",
Conditions: []metav1.Condition{
{
Type: "Ready",
Status: "False",
ObservedGeneration: 1,
Reason: "DependenciesNotReady",
Message: "Pod exists with phase: ; Service Exists",
},
},
},
wantObjs: []client.Object{
&corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: sandboxName,
Namespace: sandboxNs,
ResourceVersion: "1",
Labels: map[string]string{
"agents.x-k8s.io/sandbox-name-hash": "ab179450",
},
OwnerReferences: []metav1.OwnerReference{sandboxControllerRef(sandboxName)},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "main",
Ports: []corev1.ContainerPort{
{
Name: "http",
ContainerPort: 8080,
},
{
Name: "metrics",
ContainerPort: 9090,
Protocol: corev1.ProtocolTCP,
},
{
Name: "duplicate",
ContainerPort: 8080,
},
},
},
{
Name: "sidecar",
Ports: []corev1.ContainerPort{
{
Name: "admin",
ContainerPort: 9000,
Protocol: corev1.ProtocolTCP,
},
},
},
},
},
},
&corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: sandboxName,
Namespace: sandboxNs,
ResourceVersion: "1",
Labels: map[string]string{
"agents.x-k8s.io/sandbox-name-hash": "ab179450",
},
OwnerReferences: []metav1.OwnerReference{sandboxControllerRef(sandboxName)},
},
Spec: corev1.ServiceSpec{
Selector: map[string]string{
"agents.x-k8s.io/sandbox-name-hash": "ab179450",
},
ClusterIP: "None",
Ports: []corev1.ServicePort{
{
Name: "http",
Port: 8080,
Protocol: corev1.ProtocolTCP,
TargetPort: intstr.FromInt32(8080),
},
{
Name: "metrics",
Port: 9090,
Protocol: corev1.ProtocolTCP,
TargetPort: intstr.FromInt32(9090),
},
{
Name: "admin",
Port: 9000,
Protocol: corev1.ProtocolTCP,
TargetPort: intstr.FromInt32(9000),
},
},
},
},
},
},
}

for _, tc := range testCases {
Expand Down