Skip to content

NO-ISSUE: test/extended/util/framework: Poll in IsMicroShiftCluster #30161

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NO-ISSUE: test/extended/util/framework: Poll in IsMicroShiftCluster #30161

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
20 changes: 13 additions & 7 deletions test/extended/util/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2310,18 +2310,24 @@ func IsHypershift(ctx context.Context, configClient clientconfigv1.Interface) (b
// IsMicroShiftCluster returns "true" if a cluster is MicroShift,
// "false" otherwise. It needs kube-admin client as input.
func IsMicroShiftCluster(kubeClient k8sclient.Interface) (bool, error) {
// MicroShift cluster contains "microshift-version" configmap in "kube-public" namespace
cm, err := kubeClient.CoreV1().ConfigMaps("kube-public").Get(context.Background(), "microshift-version", metav1.GetOptions{})
if err != nil {
if kapierrs.IsNotFound(err) {
e2e.Logf("microshift-version configmap not found")
return false, nil
ctx := context.Background()
var cm *corev1.ConfigMap
duration := 5 * time.Minute
if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, duration, true, func(ctx context.Context) (bool, error) {
// MicroShift cluster contains "microshift-version" configmap in "kube-public" namespace
var err error
cm, err = kubeClient.CoreV1().ConfigMaps("kube-public").Get(ctx, "microshift-version", metav1.GetOptions{})
if err == nil || kapierrs.IsNotFound(err) {
return true, nil
}
e2e.Logf("error accessing microshift-version configmap: %v", err)
return false, nil
}); err != nil {
e2e.Logf("failed to find microshift-version configmap while polling for %s: %v", duration, err)
return false, err
}
if cm == nil {
e2e.Logf("microshift-version configmap is nil")
e2e.Logf("microshift-version configmap not found")
return false, nil
}
e2e.Logf("MicroShift cluster with version: %s", cm.Data["version"])
Expand Down