Skip to content
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

Jump to bottom

Bug 1880902: automatically set the dnsPolicy with ClusterFirstWithHostNet when endpoint publishing strategy type is set to hostnetwork #492

Merged
merged 1 commit into from Nov 30, 2020
Merged

Bug 1880902: automatically set the dnsPolicy with ClusterFirstWithHostNet when endpoint publishing strategy type is set to hostnetwork #492

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/operator/controller/ingress/deployment.go
View file
Open in desktop
Expand Up @@ -374,6 +374,7 @@ func desiredRouterDeployment(ci *operatorv1.IngressController, ingressController
}

deployment.Spec.Template.Spec.Containers[0].Image = ingressControllerImage
deployment.Spec.Template.Spec.DNSPolicy = corev1.DNSClusterFirst

if ci.Status.EndpointPublishingStrategy.Type == operatorv1.HostNetworkStrategyType {
// Expose ports 80 and 443 on the host to provide endpoints for
Expand All @@ -386,6 +387,7 @@ func desiredRouterDeployment(ci *operatorv1.IngressController, ingressController
// problems or firewall restrictions.
deployment.Spec.Template.Spec.Containers[0].LivenessProbe.Handler.HTTPGet.Host = "localhost"
deployment.Spec.Template.Spec.Containers[0].ReadinessProbe.Handler.HTTPGet.Host = "localhost"
deployment.Spec.Template.Spec.DNSPolicy = corev1.DNSClusterFirstWithHostNet
}

// Fill in the default certificate secret name.
Expand Down Expand Up @@ -861,6 +863,7 @@ func hashableDeployment(deployment *appsv1.Deployment, onlyTemplate bool) *appsv
return containers[i].Name < containers[j].Name
})
hashableDeployment.Spec.Template.Spec.Containers = containers
hashableDeployment.Spec.Template.Spec.DNSPolicy = deployment.Spec.Template.Spec.DNSPolicy
hashableDeployment.Spec.Template.Spec.HostNetwork = deployment.Spec.Template.Spec.HostNetwork
volumes := make([]corev1.Volume, len(deployment.Spec.Template.Spec.Volumes))
for i, vol := range deployment.Spec.Template.Spec.Volumes {
Expand Down Expand Up @@ -1005,6 +1008,7 @@ func deploymentConfigChanged(current, expected *appsv1.Deployment) (bool, *appsv
containers[i+1] = *container.DeepCopy()
}
updated.Spec.Template.Spec.Containers = containers
updated.Spec.Template.Spec.DNSPolicy = expected.Spec.Template.Spec.DNSPolicy
updated.Spec.Template.Labels = expected.Spec.Template.Labels
updated.Spec.Strategy = expected.Spec.Strategy
volumes := make([]corev1.Volume, len(expected.Spec.Template.Spec.Volumes))
Expand Down
20 changes: 20 additions & 0 deletions pkg/operator/controller/ingress/deployment_test.go
View file
Open in desktop
Expand Up @@ -229,6 +229,10 @@ func TestDesiredRouterDeployment(t *testing.T) {
t.Error("expected host network to be false")
}

if deployment.Spec.Template.Spec.DNSPolicy != corev1.DNSClusterFirst {
t.Errorf("expected dnsPolicy to be %s, got %s", corev1.DNSClusterFirst, deployment.Spec.Template.Spec.DNSPolicy)
}

if len(deployment.Spec.Template.Spec.Containers[0].LivenessProbe.Handler.HTTPGet.Host) != 0 {
t.Errorf("expected empty liveness probe host, got %q", deployment.Spec.Template.Spec.Containers[0].LivenessProbe.Handler.HTTPGet.Host)
}
Expand Down Expand Up @@ -307,6 +311,9 @@ func TestDesiredRouterDeployment(t *testing.T) {
if deployment.Spec.Template.Spec.HostNetwork != false {
t.Error("expected host network to be false")
}
if deployment.Spec.Template.Spec.DNSPolicy != corev1.DNSClusterFirst {
t.Errorf("expected dnsPolicy to be %s, got %s", corev1.DNSClusterFirst, deployment.Spec.Template.Spec.DNSPolicy)
}
if len(deployment.Spec.Template.Spec.Containers[0].LivenessProbe.Handler.HTTPGet.Host) != 0 {
t.Errorf("expected empty liveness probe host, got %q", deployment.Spec.Template.Spec.Containers[0].LivenessProbe.Handler.HTTPGet.Host)
}
Expand Down Expand Up @@ -459,6 +466,11 @@ func TestDesiredRouterDeployment(t *testing.T) {
if deployment.Spec.Template.Spec.HostNetwork != true {
t.Error("expected host network to be true")
}

if deployment.Spec.Template.Spec.DNSPolicy != corev1.DNSClusterFirstWithHostNet {
t.Errorf("expected dnsPolicy to be %s, got %s", corev1.DNSClusterFirstWithHostNet, deployment.Spec.Template.Spec.DNSPolicy)
}

if deployment.Spec.Template.Spec.Containers[0].LivenessProbe.Handler.HTTPGet.Host != "localhost" {
t.Errorf("expected liveness probe host to be \"localhost\", got %q", deployment.Spec.Template.Spec.Containers[0].LivenessProbe.Handler.HTTPGet.Host)
}
Expand Down Expand Up @@ -875,6 +887,13 @@ func TestDeploymentConfigChanged(t *testing.T) {
},
expect: true,
},
{
description: "if dnsPolicy is changed",
mutate: func(deployment *appsv1.Deployment) {
deployment.Spec.Template.Spec.DNSPolicy = corev1.DNSClusterFirstWithHostNet
},
expect: true,
},
}

for _, tc := range testCases {
Expand All @@ -901,6 +920,7 @@ func TestDeploymentConfigChanged(t *testing.T) {
},
},
Spec: corev1.PodSpec{
DNSPolicy: corev1.DNSClusterFirst,
Volumes: []corev1.Volume{
{
Name: "default-certificate",
Expand Down