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

echo-external-node: Check if NodeWithoutCilium is enabled #2047

Merged
merged 1 commit into from
Oct 17, 2023
Merged

echo-external-node: Check if NodeWithoutCilium is enabled #2047

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
56 changes: 30 additions & 26 deletions connectivity/check/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,34 +953,38 @@ func (ct *ConnectivityTest) deploy(ctx context.Context) error {
}
}

_, err = ct.clients.src.GetDeployment(ctx, ct.params.TestNamespace, echoExternalNodeDeploymentName, metav1.GetOptions{})
if err != nil {
ct.Logf("✨ [%s] Deploying echo-external-node deployment...", ct.clients.src.ClusterName())
containerPort := 8080
echoExternalDeployment := newDeployment(deploymentParameters{
Name: echoExternalNodeDeploymentName,
Kind: kindEchoExternalNodeName,
Port: containerPort,
NamedPort: "http-8080",
HostPort: 8080,
Image: ct.params.JSONMockImage,
Labels: map[string]string{"external": "echo"},
Annotations: ct.params.DeploymentAnnotations.Match(echoExternalNodeDeploymentName),
NodeSelector: map[string]string{"cilium.io/no-schedule": "true"},
ReadinessProbe: newLocalReadinessProbe(containerPort, "/"),
HostNetwork: true,
Tolerations: []corev1.Toleration{
{Operator: corev1.TolerationOpExists},
},
})
_, err = ct.clients.src.CreateServiceAccount(ctx, ct.params.TestNamespace, k8s.NewServiceAccount(echoExternalNodeDeploymentName), metav1.CreateOptions{})
if ct.Features[features.NodeWithoutCilium].Enabled {
michi-covalent marked this conversation as resolved.
Show resolved Hide resolved
_, err = ct.clients.src.GetDeployment(ctx, ct.params.TestNamespace, echoExternalNodeDeploymentName, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("unable to create service account %s: %s", echoExternalNodeDeploymentName, err)
}
_, err = ct.clients.src.CreateDeployment(ctx, ct.params.TestNamespace, echoExternalDeployment, metav1.CreateOptions{})
if err != nil {
return fmt.Errorf("unable to create deployment %s: %s", echoExternalNodeDeploymentName, err)
ct.Logf("✨ [%s] Deploying echo-external-node deployment...", ct.clients.src.ClusterName())
containerPort := 8080
echoExternalDeployment := newDeployment(deploymentParameters{
Name: echoExternalNodeDeploymentName,
Kind: kindEchoExternalNodeName,
Port: containerPort,
NamedPort: "http-8080",
HostPort: 8080,
Image: ct.params.JSONMockImage,
Labels: map[string]string{"external": "echo"},
Annotations: ct.params.DeploymentAnnotations.Match(echoExternalNodeDeploymentName),
NodeSelector: map[string]string{"cilium.io/no-schedule": "true"},
ReadinessProbe: newLocalReadinessProbe(containerPort, "/"),
HostNetwork: true,
Tolerations: []corev1.Toleration{
{Operator: corev1.TolerationOpExists},
},
})
_, err = ct.clients.src.CreateServiceAccount(ctx, ct.params.TestNamespace, k8s.NewServiceAccount(echoExternalNodeDeploymentName), metav1.CreateOptions{})
if err != nil {
return fmt.Errorf("unable to create service account %s: %s", echoExternalNodeDeploymentName, err)
}
_, err = ct.clients.src.CreateDeployment(ctx, ct.params.TestNamespace, echoExternalDeployment, metav1.CreateOptions{})
if err != nil {
return fmt.Errorf("unable to create deployment %s: %s", echoExternalNodeDeploymentName, err)
}
}
} else {
ct.Infof("Skipping tests that require a node Without Cilium")
}
}

Expand Down
Loading