Skip to content

Commit

Permalink
HOSTEDCP-1308: Add kubevirt specifics to EnsureSATokenNotMountedUnles…
Browse files Browse the repository at this point in the history
…sNecessary
  • Loading branch information
Patryk-Stefanski committed Jan 17, 2024
1 parent ebba548 commit 0f06e29
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions test/e2e/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"fmt"
kubevirtv1 "kubevirt.io/api/core/v1"
"os"
"strings"
"testing"
Expand Down Expand Up @@ -1727,6 +1728,7 @@ func EnsureSATokenNotMountedUnlessNecessary(t *testing.T, ctx context.Context, c

var pods corev1.PodList
if err := c.List(ctx, &pods, &crclient.ListOptions{Namespace: hcpNamespace}); err != nil {
t.Fatalf("failed to list pods in namespace %s: %v", hcpNamespace, err)
}

expectedComponentsWithTokenMount := append(expectedKasManagementComponents,
Expand All @@ -1735,10 +1737,23 @@ func EnsureSATokenNotMountedUnlessNecessary(t *testing.T, ctx context.Context, c
"csi-snapshot-webhook",
"csi-snapshot-controller",
"ovnkube-control-plane", //remove once https://issues.redhat.com/browse/OCPBUGS-26408 is closed,
"kubevirt-cloud-controller-manager",
"kubevirt-csi-controller",
)

if hostedCluster.Spec.Platform.Type == hyperv1.KubevirtPlatform {
expectedComponentsWithTokenMount = append(expectedComponentsWithTokenMount, hostedCluster.Name+"-test-",
"kubevirt-cloud-controller-manager",
"kubevirt-csi-controller")

var vms kubevirtv1.VirtualMachineList
if err := c.List(ctx, &vms, &crclient.ListOptions{Namespace: hcpNamespace}); err != nil {
t.Fatalf("failed to list vms in namespace %s: %v", hcpNamespace, err)
}

for _, vm := range vms.Items {
expectedComponentsWithTokenMount = append(expectedComponentsWithTokenMount, vm.Name+"-console-logger")
}
}

for _, pod := range pods.Items {
hasPrefix := false
for _, prefix := range expectedComponentsWithTokenMount {
Expand Down

0 comments on commit 0f06e29

Please sign in to comment.