Skip to content

Commit d1b0eef

Browse files
committed
OCPBUGS-55050: Remove exception for Gateway API Proxy resources limits
Previously, there was a need for exception on Gateway API Proxy pods to allow resources limits, as this wasn't properly configurable. The situation is now fixed on cluster ingress operator, and the exception can be removed.
1 parent a44654e commit d1b0eef

1 file changed

Lines changed: 1 addition & 22 deletions

File tree

test/extended/operators/resources.go

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
g "github.com/onsi/ginkgo/v2"
1010
v1 "k8s.io/api/core/v1"
11-
apierrors "k8s.io/apimachinery/pkg/api/errors"
1211
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1312
"k8s.io/kube-openapi/pkg/util/sets"
1413
e2e "k8s.io/kubernetes/test/e2e/framework"
@@ -57,10 +56,6 @@ var _ = g.Describe("[sig-arch] Managed cluster", func() {
5756
"batch/v1/Job/openshift-monitoring/<batch_job>/container/osd-rebalance-infra-nodes/request[cpu]": "https://issues.redhat.com/browse/OSD-21708",
5857
"batch/v1/Job/openshift-monitoring/<batch_job>/container/osd-rebalance-infra-nodes/request[memory]": "https://issues.redhat.com/browse/OSD-21708",
5958

60-
// Istio pods
61-
"apps/v1/Deployment/openshift-ingress/gateway/container/istio-proxy/limit[cpu]": "https://issues.redhat.com/browse/OCPBUGS-55050",
62-
"apps/v1/Deployment/openshift-ingress/gateway/container/istio-proxy/limit[memory]": "https://issues.redhat.com/browse/OCPBUGS-55050",
63-
6459
// ovn pods
6560
"apps/v1/DaemonSet/openshift-multus/cni-sysctl-allowlist-ds/container/kube-multus-additional-cni-plugins/request[cpu]": "https://issues.redhat.com/browse/TRT-1871",
6661
"apps/v1/DaemonSet/openshift-multus/cni-sysctl-allowlist-ds/container/kube-multus-additional-cni-plugins/request[memory]": "https://issues.redhat.com/browse/TRT-1871",
@@ -128,24 +123,8 @@ var _ = g.Describe("[sig-arch] Managed cluster", func() {
128123
case "ReplicaSet":
129124
if i := strings.LastIndex(ref.Name, "-"); i != -1 {
130125
name := ref.Name[0:i]
131-
if deploy, err := oc.KubeFramework().ClientSet.AppsV1().Deployments(pod.Namespace).Get(context.Background(), name, metav1.GetOptions{}); err != nil {
132-
if apierrors.IsNotFound(err) {
133-
e2e.Logf("ignoring replicaset %s because no owning deployment %s exists", ref.Name, name)
134-
// Ignore this pod entirely because it most likely
135-
// belongs to an orphaned replicaset.
136-
continue podLoop
137-
} else {
138-
e2e.Failf("unable to get deployment %s for replicaset %s: %v", name, ref.Name, err)
139-
}
140-
} else {
126+
if deploy, err := oc.KubeFramework().ClientSet.AppsV1().Deployments(pod.Namespace).Get(context.Background(), name, metav1.GetOptions{}); err == nil {
141127
ref.Name = deploy.Name
142-
if pod.Namespace == "openshift-ingress" && strings.HasPrefix(ref.Name, "gateway-") {
143-
// The gateway deployment's name contains a hash, which
144-
// must be removed in order to be able to define an
145-
// exception. Remove this if block when the
146-
// corresponding exception is removed.
147-
ref.Name = "gateway"
148-
}
149128
ref.Kind = "Deployment"
150129
ref.APIVersion = "apps/v1"
151130
}

0 commit comments

Comments
 (0)