Skip to content

Bug 2095229: desiredRouterDeployment: Check for nil hostNetwork #780

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
openshift-ci merged 1 commit into from
Jun 15, 2022
Merged

Bug 2095229: desiredRouterDeployment: Check for nil hostNetwork #780

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
17 changes: 9 additions & 8 deletions pkg/operator/controller/ingress/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,15 +657,16 @@ func desiredRouterDeployment(ci *operatorv1.IngressController, ingressController
deployment.Spec.Template.Spec.Containers[0].StartupProbe.ProbeHandler.HTTPGet.Host = "localhost"
deployment.Spec.Template.Spec.DNSPolicy = corev1.DNSClusterFirstWithHostNet

config := ci.Status.EndpointPublishingStrategy.HostNetwork
if config.HTTPSPort == config.HTTPPort || config.HTTPPort == config.StatsPort || config.StatsPort == config.HTTPSPort {
return nil, fmt.Errorf("the specified HTTPS, HTTP and Stats ports %d, %d, %d are not unique", config.HTTPSPort, config.HTTPPort, config.StatsPort)
}
if config := ci.Status.EndpointPublishingStrategy.HostNetwork; config != nil {
if config.HTTPSPort == config.HTTPPort || config.HTTPPort == config.StatsPort || config.StatsPort == config.HTTPSPort {
return nil, fmt.Errorf("the specified HTTPS, HTTP and Stats ports %d, %d, %d are not unique", config.HTTPSPort, config.HTTPPort, config.StatsPort)
}

// Set the ports to the values from the host network configuration
httpPort = config.HTTPPort
httpsPort = config.HTTPSPort
statsPort = config.StatsPort
// Set the ports to the values from the host network configuration
httpPort = config.HTTPPort
httpsPort = config.HTTPSPort
statsPort = config.StatsPort
}

// Append the environment variables for the HTTP and HTTPS ports
env = append(env,
Expand Down
32 changes: 32 additions & 0 deletions pkg/operator/controller/ingress/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,38 @@ func TestDesiredRouterDeploymentVariety(t *testing.T) {
checkContainerPort(t, deployment, "metrics", 9146)
}

// TestDesiredRouterDeploymentHostNetworkNil verifies that
// desiredRouterDeployment behaves correctly when
// status.endpointPublishingStrategy.type is "HostNetwork" but
// status.endpointPublishingStrategy.hostNetwork is nil, which can happen on a
// cluster that was upgraded from a version of OpenShift that did not define any
// subfields for spec.endpointPublishingStrategy.hostNetwork.
// See <https://bugzilla.redhat.com/show_bug.cgi?id=2095229>.
func TestDesiredRouterDeploymentHostNetworkNil(t *testing.T) {
ic, ingressConfig, infraConfig, apiConfig, networkConfig, proxyNeeded := getRouterDeploymentComponents(t)
ic.Status.EndpointPublishingStrategy.Type = operatorv1.HostNetworkStrategyType
proxyNeeded, err := IsProxyProtocolNeeded(ic, infraConfig.Status.PlatformStatus)
if err != nil {
t.Fatal(err)
}
deployment, err := desiredRouterDeployment(ic, ingressControllerImage, ingressConfig, infraConfig, apiConfig, networkConfig, proxyNeeded, false, nil)
if err != nil {
t.Fatal(err)
}
env := []envData{
{"STATS_PORT", true, "1936"},
{"ROUTER_SERVICE_HTTP_PORT", true, "80"},
{"ROUTER_SERVICE_HTTPS_PORT", true, "443"},
}
if err := checkDeploymentEnvironment(t, deployment, env); err != nil {
t.Error(err)
}
checkDeploymentHasEnvSorted(t, deployment)
checkContainerPort(t, deployment, "http", 80)
checkContainerPort(t, deployment, "https", 443)
checkContainerPort(t, deployment, "metrics", 1936)
}

func checkContainerPort(t *testing.T, d *appsv1.Deployment, portName string, port int32) {
t.Helper()
for _, p := range d.Spec.Template.Spec.Containers[0].Ports {
Expand Down