Skip to content

Commit

Permalink
chore(tests): do not set images but instead allow operator defaults t…
Browse files Browse the repository at this point in the history
…o be used
  • Loading branch information
pmalek committed Jun 13, 2024
1 parent f610301 commit f7eaa74
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions test/e2e/test_helm_install_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,11 @@ func deploymentReadyConditions() []appsv1.DeploymentCondition {

func splitRepoVersionFromImage(t *testing.T, image string) (string, string) {
splitImage := strings.Split(image, ":")
if len(splitImage) != 2 {
l := len(splitImage)
if l < 2 {
t.Fatalf("image %q does not contain a tag", image)
}
return splitImage[0], splitImage[1]
return strings.Join(splitImage[:l-1], ":"), splitImage[l-1]
}

func baseGatewayConfigurationSpec() operatorv1beta1.GatewayConfigurationSpec {
Expand All @@ -375,8 +376,7 @@ func baseGatewayConfigurationSpec() operatorv1beta1.GatewayConfigurationSpec {
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: consts.DataPlaneProxyContainerName,
Image: helpers.GetDefaultDataPlaneImage(),
Name: consts.DataPlaneProxyContainerName,
ReadinessProbe: &corev1.Probe{
InitialDelaySeconds: 1,
PeriodSeconds: 1,
Expand All @@ -394,8 +394,7 @@ func baseGatewayConfigurationSpec() operatorv1beta1.GatewayConfigurationSpec {
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: consts.ControlPlaneControllerContainerName,
Image: consts.DefaultControlPlaneImage,
Name: consts.ControlPlaneControllerContainerName,
ReadinessProbe: &corev1.Probe{
InitialDelaySeconds: 1,
PeriodSeconds: 1,
Expand Down

0 comments on commit f7eaa74

Please sign in to comment.