Skip to content

OCPBUGS-45189, OCPBUGS-45182: e2e/openstack: adjustments for missing manila apps & pods #5202

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-merge-bot merged 3 commits into from
Dec 5, 2024
Merged

OCPBUGS-45189, OCPBUGS-45182: e2e/openstack: adjustments for missing manila apps & pods #5202

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5d7342
OCPBUGS-45189: e2e/openstack: adjustments for missing manila apps & pods
EmilienM Nov 29, 2024
f47d771
OCPBUGS-45182: Disable openstack-manila-csi-controllerplugin crash de…
EmilienM Nov 28, 2024
d4fa74f
e2e/utils: improve logs for EnsureSATokenNotMountedUnlessNecessary
EmilienM Dec 2, 2024
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
10 changes: 8 additions & 2 deletions test/e2e/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,11 @@ func EnsureNoCrashingPods(t *testing.T, ctx context.Context, client crclient.Cli
continue
}

// Temporary workaround for https://issues.redhat.com/browse/OCPBUGS-45182
if strings.HasPrefix(pod.Name, "openstack-manila-csi-controllerplugin-") {
continue
}

// Temporary workaround for https://issues.redhat.com/browse/CNV-40820
if strings.HasPrefix(pod.Name, "kubevirt-csi") {
continue
Expand Down Expand Up @@ -1194,6 +1199,7 @@ func EnsurePodsWithEmptyDirPVsHaveSafeToEvictAnnotations(t *testing.T, ctx conte
"redhat-marketplace-catalog": "app",
"openstack-cinder-csi-driver-controller": "app",
"manila-csi-driver-controller": "app",
Copy link
Member

@mandre mandre Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could remove this line, no?

Copy link
Member Author

@EmilienM EmilienM Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're very probably right, I was confused by:

https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_hypershift/5202/pull-ci-openshift-hypershift-main-e2e-openstack/1863871352625172480/artifacts/e2e-openstack/hypershift-openstack-e2e-execute/artifacts/TestCreateCluster/namespaces/e2e-clusters-x9kpt-example-mznq8/apps/deployments/openstack-manila-csi-controllerplugin.yaml

        podAntiAffinity:
          preferredDuringSchedulingIgnoredDuringExecution:
          - podAffinityTerm:
              labelSelector:
                matchLabels:
                  app: manila-csi-driver-controller

I'll remove it as a follow-up. We don't need to block the PR for that.

Copy link
Member Author

@EmilienM EmilienM Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To not forget it, I already created the PR: #5221

"openstack-manila-csi": "app",
}

hcpPods := &corev1.PodList{}
Expand Down Expand Up @@ -1912,7 +1918,7 @@ func EnsureSATokenNotMountedUnlessNecessary(t *testing.T, ctx context.Context, c
expectedComponentsWithTokenMount = append(expectedComponentsWithTokenMount,
"openstack-cinder-csi-driver-controller",
"openstack-cinder-csi-driver-operator",
"manila-csi-driver-controller",
"openstack-manila-csi-controllerplugin",
"manila-csi-driver-operator",
)
}
Expand Down Expand Up @@ -1940,7 +1946,7 @@ func EnsureSATokenNotMountedUnlessNecessary(t *testing.T, ctx context.Context, c
}
if !hasPrefix {
for _, volume := range pod.Spec.Volumes {
g.Expect(volume.Name).ToNot(HavePrefix("kube-api-access-"))
g.Expect(volume.Name).ToNot(HavePrefix("kube-api-access-"), "pod %s should not have kube-api-access-* volume mounted", pod.Name)
}
}
}
Expand Down