Skip to content

[release-4.7] Re-enable quota test #26284

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-robot merged 2 commits into from
Jul 17, 2021
Merged

[release-4.7] Re-enable quota test #26284

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2b10b6
Skip cluster quota test to allow service ca configmap publisher to merge
marun Jun 29, 2021
fafedca
Re-enable cluster quota test
marun May 26, 2021
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
50 changes: 25 additions & 25 deletions test/extended/quota/clusterquota.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilversion "k8s.io/apimachinery/pkg/util/version"
utilwait "k8s.io/apimachinery/pkg/util/wait"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/kubernetes/test/e2e/framework"
Expand All @@ -31,22 +30,6 @@ var _ = g.Describe("[sig-api-machinery][Feature:ClusterResourceQuota]", func() {
g.It(fmt.Sprintf("should control resource limits across namespaces"), func() {
t := g.GinkgoT(1)

versionInfo, err := oc.KubeClient().Discovery().ServerVersion()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
const kubeRootCAName = "kube-root-ca.crt"
version, err := utilversion.ParseSemantic(versionInfo.String())
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
expectKubeRootCACM := version.AtLeast(utilversion.MustParseGeneric("1.20"))
namespaceInitialCMCount := 0
if expectKubeRootCACM {
framework.Logf("server version %q is higher or equal to 1.20, expecting ConfigMap %q to be present", versionInfo, kubeRootCAName)
namespaceInitialCMCount = 1
}

clusterAdminKubeClient := oc.AdminKubeClient()
clusterAdminQuotaClient := oc.AdminQuotaClient()
clusterAdminImageClient := oc.AdminImageClient()
Expand All @@ -67,11 +50,21 @@ var _ = g.Describe("[sig-api-machinery][Feature:ClusterResourceQuota]", func() {
},
}

if expectKubeRootCACM {
q := cq.Spec.Quota.Hard[corev1.ResourceConfigMaps]
q.Add(resource.MustParse("2"))
cq.Spec.Quota.Hard[corev1.ResourceConfigMaps] = q
}
const kubeRootCAName = "kube-root-ca.crt"
framework.Logf("expecting ConfigMap %q to be present", kubeRootCAName)

const serviceCAName = "openshift-service-ca.crt"
framework.Logf("expecting ConfigMap %q to be present", serviceCAName)

// Each namespace is expected to have a configmap each for kube root ca and service ca
namespaceInitialCMCount := 2

// Ensure quota includes the 2 mandatory configmaps
// TODO(marun) Figure out why the added quantity isn't 2
mandatoryCMQuantity := resource.NewQuantity(int64(namespaceInitialCMCount)*2, resource.DecimalSI)
q := cq.Spec.Quota.Hard[corev1.ResourceConfigMaps]
q.Add(*mandatoryCMQuantity)
cq.Spec.Quota.Hard[corev1.ResourceConfigMaps] = q

if _, err := clusterAdminQuotaClient.QuotaV1().ClusterResourceQuotas().Create(context.Background(), cq, metav1.CreateOptions{}); err != nil {
t.Fatalf("unexpected error: %v", err)
Expand All @@ -80,12 +73,19 @@ var _ = g.Describe("[sig-api-machinery][Feature:ClusterResourceQuota]", func() {

firstProjectName := oc.CreateProject()
secondProjectName := oc.CreateProject()
if expectKubeRootCACM {
for _, ns := range []string{firstProjectName, secondProjectName} {
_, err = exutil.WaitForCMState(context.Background(), oc.KubeClient().CoreV1(), ns, kubeRootCAName, func(cm *corev1.ConfigMap) (bool, error) {

// Wait for the creation of the mandatory configmaps before performing checks of quota
// enforcement to ensure reliable test execution.
for _, ns := range []string{firstProjectName, secondProjectName} {
for _, cm := range []string{kubeRootCAName, serviceCAName} {
_, err := exutil.WaitForCMState(context.Background(), oc.KubeClient().CoreV1(), ns, cm, func(cm *corev1.ConfigMap) (bool, error) {
// Any event means the CM is present
framework.Logf("configmap %q is present in namespace %q", cm, ns)
return true, nil
})
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
}
}

Expand Down