Skip to content

Let the K8S cluster decide on ipFamily usage #1651

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
macwinnie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Let the K8S cluster decide on ipFamily usage #1651

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
5 changes: 2 additions & 3 deletions config/samples/external_cache.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ metadata:
app.kubernetes.io/component: cache
spec:
internalTrafficPolicy: Cluster
ipFamilies:
- IPv4
ipFamilyPolicy: SingleStack
# Let Kubernetes default this from the cluster Service CIDR.
# Required for IPv6-only clusters.
ports:
- name: redis-6379
port: 6379
Expand Down
5 changes: 2 additions & 3 deletions controllers/repo_manager/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,15 @@ func serviceAPIObject(pulp pulpv1.Pulp) *corev1.Service {
func serviceAPISpec(pulp pulpv1.Pulp) corev1.ServiceSpec {

serviceInternalTrafficPolicyCluster := corev1.ServiceInternalTrafficPolicyType("Cluster")
ipFamilyPolicyType := corev1.IPFamilyPolicyType("SingleStack")
serviceAffinity := corev1.ServiceAffinity("None")
servicePortProto := corev1.Protocol("TCP")
targetPort := intstr.IntOrString{IntVal: 24817}
serviceType := corev1.ServiceType("ClusterIP")

return corev1.ServiceSpec{
InternalTrafficPolicy: &serviceInternalTrafficPolicyCluster,
IPFamilies: []corev1.IPFamily{"IPv4"},
IPFamilyPolicy: &ipFamilyPolicyType,
// Let Kubernetes default this from the cluster Service CIDR.
// Required for IPv6-only clusters.
Ports: []corev1.ServicePort{{
Name: "api-24817",
Port: 24817,
Expand Down
5 changes: 2 additions & 3 deletions controllers/repo_manager/content.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,15 @@ func serviceContentObject(pulp pulpv1.Pulp) *corev1.Service {
func serviceContentSpec(pulp pulpv1.Pulp) corev1.ServiceSpec {

serviceInternalTrafficPolicyCluster := corev1.ServiceInternalTrafficPolicyType("Cluster")
ipFamilyPolicyType := corev1.IPFamilyPolicyType("SingleStack")
serviceAffinity := corev1.ServiceAffinity("None")
servicePortProto := corev1.Protocol("TCP")
targetPort := intstr.IntOrString{IntVal: 24816}
serviceType := corev1.ServiceType("ClusterIP")

return corev1.ServiceSpec{
InternalTrafficPolicy: &serviceInternalTrafficPolicyCluster,
IPFamilies: []corev1.IPFamily{"IPv4"},
IPFamilyPolicy: &ipFamilyPolicyType,
// Let Kubernetes default this from the cluster Service CIDR.
// Required for IPv6-only clusters.
Ports: []corev1.ServicePort{{
Name: "content-24816",
Port: 24816,
Expand Down
5 changes: 2 additions & 3 deletions controllers/repo_manager/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,6 @@ func labelsForDatabasePods(m *pulpv1.Pulp) map[string]string {
// serviceForDatabase returns a service object for postgres pods
func serviceForDatabase(m *pulpv1.Pulp) *corev1.Service {
serviceInternalTrafficPolicyCluster := corev1.ServiceInternalTrafficPolicyType("Cluster")
ipFamilyPolicyType := corev1.IPFamilyPolicyType("SingleStack")
serviceAffinity := corev1.ServiceAffinity("None")
servicePortProto := corev1.Protocol("TCP")
targetPort := intstr.IntOrString{IntVal: 5432}
Expand All @@ -492,8 +491,8 @@ func serviceForDatabase(m *pulpv1.Pulp) *corev1.Service {
ClusterIP: "None",
ClusterIPs: []string{"None"},
InternalTrafficPolicy: &serviceInternalTrafficPolicyCluster,
IPFamilies: []corev1.IPFamily{"IPv4"},
IPFamilyPolicy: &ipFamilyPolicyType,
// Let Kubernetes default this from the cluster Service CIDR.
// Required for IPv6-only clusters.
Ports: []corev1.ServicePort{{
Port: 5432,
Protocol: servicePortProto,
Expand Down
5 changes: 2 additions & 3 deletions controllers/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ service:
// serviceOtel defines a service to expose otel metrics
func ServiceOtel(resources FunctionResources) client.Object {
serviceInternalTrafficPolicyCluster := corev1.ServiceInternalTrafficPolicyType("Cluster")
ipFamilyPolicyType := corev1.IPFamilyPolicyType("SingleStack")
serviceAffinity := corev1.ServiceAffinity("None")
servicePortProto := corev1.Protocol("TCP")
targetPort := intstr.IntOrString{IntVal: settings.OtelContainerPort}
Expand All @@ -197,8 +196,8 @@ func ServiceOtel(resources FunctionResources) client.Object {
},
Spec: corev1.ServiceSpec{
InternalTrafficPolicy: &serviceInternalTrafficPolicyCluster,
IPFamilies: []corev1.IPFamily{"IPv4"},
IPFamilyPolicy: &ipFamilyPolicyType,
// Let Kubernetes default this from the cluster Service CIDR.
// Required for IPv6-only clusters.
Ports: []corev1.ServicePort{{
Name: "otel-" + strconv.Itoa(settings.OtelContainerPort),
Port: settings.OtelContainerPort,
Expand Down