Skip to content
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.

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

WRKLDS-605: e2e: Config v1 client shim for static configuration manifests with read-only operations #27714

Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ require (
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/go-ldap/ldap/v3 v3.4.3
github.com/golang/protobuf v1.5.2
github.com/google/gnostic v0.5.7-v3refs
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.1.2
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.3.0
Expand Down Expand Up @@ -138,7 +139,6 @@ require (
github.com/google/btree v1.0.1 // indirect
github.com/google/cadvisor v0.46.0 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions test/extended/apiserver/api_requests.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var _ = g.Describe("[sig-arch][Late]", func() {

oc := exutil.NewCLIWithoutNamespace("api-requests")

g.It("clients should not use APIs that are removed in upcoming releases [apigroup:config.openshift.io]", func() {
g.It("clients should not use APIs that are removed in upcoming releases [apigroup:apiserver.openshift.io]", func() {
ctx := context.Background()
apirequestCountClient, err := apiserverclientv1.NewForConfig(oc.AdminConfig())
o.Expect(err).NotTo(o.HaveOccurred())
Expand Down Expand Up @@ -91,7 +91,7 @@ var _ = g.Describe("[sig-arch][Late]", func() {
}
})

g.It("operators should not create watch channels very often [apigroup:config.openshift.io]", func() {
g.It("operators should not create watch channels very often [apigroup:apiserver.openshift.io]", func() {
ctx := context.Background()
apirequestCountClient, err := apiserverclientv1.NewForConfig(oc.AdminConfig())
o.Expect(err).NotTo(o.HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/apiserver/graceful_termination.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ var _ = g.Describe("[sig-api-machinery][Feature:APIServer][Late]", func() {
}
})

g.It("API LBs follow /readyz of kube-apiserver and stop sending requests before server shutdowns for external clients [apigroup:config.openshift.io]", func() {
g.It("API LBs follow /readyz of kube-apiserver and stop sending requests before server shutdowns for external clients", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/apiserver/kubeconfigs.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var _ = g.Describe("[Conformance][sig-api-machinery][Feature:APIServer] local ku
"localhost-recovery.kubeconfig",
} {
kubeconfig := kc
g.It(fmt.Sprintf("%q should be present on all masters and work [apigroup:config.openshift.io]", kubeconfig), func() {
g.It(fmt.Sprintf("%q should be present on all masters and work", kubeconfig), func() {
// external controlplane topology doesn't have master nodes
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/authentication/front_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var _ = g.Describe("[sig-auth][Feature:Authentication] ", func() {
oc := exutil.NewCLI("project-api")

g.Describe("TestFrontProxy", func() {
g.It(fmt.Sprintf("should succeed [apigroup:config.openshift.io]"), func() {
g.It(fmt.Sprintf("should succeed"), func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
4 changes: 2 additions & 2 deletions test/extended/authorization/authorization.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ func (test resourceAccessReviewTest) run() {
failMessage := ""
var err error

g.By("resourceAccessReviewTest - "+test.description+" [apigroup:config.openshift.io]", func() {
g.By("resourceAccessReviewTest - "+test.description, func() {
// keep trying the test until you get a success or you timeout. Every time you have a failure, set the fail message
// so that if you never have a success, we can call t.Errorf with a reasonable message
// exiting the poll with `failMessage=""` indicates success.
Expand Down Expand Up @@ -314,7 +314,7 @@ func (test localResourceAccessReviewTest) run() {
failMessage := ""
var err error

g.By("localResourceAccessReviewTest - "+test.description+" [apigroup:authorization.openshift.io][apigroup:config.openshift.io]", func() {
g.By("localResourceAccessReviewTest - "+test.description+" [apigroup:authorization.openshift.io]", func() {
// keep trying the test until you get a success or you timeout. Every time you have a failure, set the fail message
// so that if you never have a success, we can call t.Errorf with a reasonable message
// exiting the poll with `failMessage=""` indicates success.
Expand Down
6 changes: 3 additions & 3 deletions test/extended/baremetal/hosts.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal/OpenStack/vSphere/None/AWS/Azure/GCP platforms [apigroup:config.openshift.io]", func() {
var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal/OpenStack/vSphere/None/AWS/Azure/GCP platforms", func() {
defer g.GinkgoRecover()

var (
Expand All @@ -37,7 +37,7 @@ var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal/OpenStack/vSphe
})
})

var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal platform should [apigroup:config.openshift.io]", func() {
var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal platform should", func() {
defer g.GinkgoRecover()

oc := exutil.NewCLI("baremetal")
Expand Down Expand Up @@ -147,7 +147,7 @@ var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal platform should

// This block must be used for the serial tests. Any eventual extra worker deployed will be
// automatically deleted during the AfterEach
var _ = g.Describe("[sig-installer][Feature:baremetal][Serial] Baremetal platform should [apigroup:config.openshift.io]", func() {
var _ = g.Describe("[sig-installer][Feature:baremetal][Serial] Baremetal platform should", func() {
defer g.GinkgoRecover()

var (
Expand Down
4 changes: 2 additions & 2 deletions test/extended/ci/job_names.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var _ = g.Describe("[sig-ci] [Early] prow job name", func() {
}
isPeriodic := strings.HasPrefix(jobName, "periodic-")

g.It("should match platform type [apigroup:config.openshift.io]", func() {
g.It("should match platform type", func() {
if jobName == "" {
e2eskipper.Skipf("JOB_NAME env var not set, skipping")
} else if strings.Contains(jobName, "agnostic") {
Expand Down Expand Up @@ -66,7 +66,7 @@ var _ = g.Describe("[sig-ci] [Early] prow job name", func() {

})

g.It("should match network type [apigroup:config.openshift.io]", func() {
g.It("should match network type", func() {
if jobName == "" {
e2eskipper.Skipf("JOB_NAME env var not set, skipping")
}
Expand Down
2 changes: 1 addition & 1 deletion test/extended/cli/explain.go
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ var _ = g.Describe("[sig-cli] oc explain", func() {
})
}

g.It("should contain proper spec+status for CRDs [apigroup:config.openshift.io]", func() {
g.It("should contain proper spec+status for CRDs", func() {
crdClient := apiextensionsclientset.NewForConfigOrDie(oc.AdminConfig())
crdTypesTest := getCrdTypes(oc)
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
Expand Down
6 changes: 3 additions & 3 deletions test/extended/cli/mustgather.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
o.Expect(err).NotTo(o.HaveOccurred())
})

g.It("runs successfully [apigroup:config.openshift.io]", func() {
g.It("runs successfully", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())
if *controlPlaneTopology == configv1.ExternalTopologyMode {
Expand Down Expand Up @@ -101,7 +101,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
}
})

g.It("runs successfully with options [apigroup:config.openshift.io]", func() {
g.It("runs successfully with options", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())
if *controlPlaneTopology == configv1.ExternalTopologyMode {
Expand Down Expand Up @@ -301,7 +301,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {

g.When("looking at the audit logs", func() {
g.Describe("[sig-node] kubelet", func() {
g.It("runs apiserver processes strictly sequentially in order to not risk audit log corruption [apigroup:config.openshift.io]", func() {
g.It("runs apiserver processes strictly sequentially in order to not risk audit log corruption", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/cloud_controller_manager/ccm.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var _ = g.Describe("[sig-cloud-provider][Feature:OpenShiftCloudControllerManager
defer g.GinkgoRecover()
oc := exutil.NewCLI("ccm")

g.It("Deploy an external cloud provider [apigroup:config.openshift.io][apigroup:machineconfiguration.openshift.io]", func() {
g.It("Deploy an external cloud provider [apigroup:machineconfiguration.openshift.io]", func() {
infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var _ = g.Describe("[sig-cli][Feature:LegacyCommandTests][Disruptive][Serial] te
continue
}

g.It("test/cmd/"+currFilename+" [apigroup:image.openshift.io][apigroup:config.openshift.io]", func() {
g.It("test/cmd/"+currFilename+" [apigroup:image.openshift.io]", func() {
testsDir := exutil.FixturePath("testdata", "cmd", "test", "cmd")
oc.AddExplicitResourceToDelete(schema.GroupVersionResource{Group: "", Version: "v1", Resource: "namespaces"}, "", "cmd-"+currFilename[0:len(currFilename)-3])

Expand Down
4 changes: 2 additions & 2 deletions test/extended/csrapprover/csrapprover.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var _ = g.Describe("[sig-cluster-lifecycle]", func() {
oc := exutil.NewCLIWithPodSecurityLevel("cluster-client-cert", admissionapi.LevelBaseline)
defer g.GinkgoRecover()

g.It("Pods cannot access the /config/master API endpoint [apigroup:config.openshift.io]", func() {
g.It("Pods cannot access the /config/master API endpoint", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down Expand Up @@ -73,7 +73,7 @@ var _ = g.Describe("[sig-cluster-lifecycle]", func() {
o.Expect(curlOutput).To(o.ContainSubstring("Connection refused"))
})

g.It("CSRs from machines that are not recognized by the cloud provider are not approved [apigroup:config.openshift.io]", func() {
g.It("CSRs from machines that are not recognized by the cloud provider are not approved", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/etcd/etcd_test_runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var _ = g.Describe("[sig-api-machinery] API data in etcd", func() {

oc := exutil.NewCLIWithPodSecurityLevel("etcd-storage-path", psapi.LevelBaseline).AsAdmin()

_ = g.It("should be stored at the correct location and version for all resources [Serial][apigroup:config.openshift.io]", func() {
_ = g.It("should be stored at the correct location and version for all resources [Serial]", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/etcd/leader_changes.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var _ = g.Describe("[sig-etcd] etcd", func() {
earlyTimeStamp = time.Now()
})

g.It("leader changes are not excessive [Late][apigroup:config.openshift.io]", func() {
g.It("leader changes are not excessive [Late]", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())
if *controlPlaneTopology == configv1.ExternalTopologyMode {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/etcd/vertical_scaling.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
)

var _ = g.Describe("[sig-etcd][Feature:EtcdVerticalScaling][Suite:openshift/etcd/scaling] etcd [apigroup:config.openshift.io]", func() {
var _ = g.Describe("[sig-etcd][Feature:EtcdVerticalScaling][Suite:openshift/etcd/scaling] etcd", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLIWithoutNamespace("etcd-scaling").AsAdmin()

Expand Down
2 changes: 1 addition & 1 deletion test/extended/networking/egress_firewall.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var _ = g.Describe("[sig-network][Feature:EgressFirewall]", func() {
)
noegFwoc := exutil.NewCLIWithPodSecurityLevel(noEgressFWE2E, admissionapi.LevelBaseline)
noegFwf := noegFwoc.KubeFramework()
g.It("egressFirewall should have no impact outside its namespace [apigroup:config.openshift.io]", func() {
g.It("egressFirewall should have no impact outside its namespace", func() {
g.By("creating test pod")
pod := "dummy"
o.Expect(createTestEgressFw(noegFwf, pod)).To(o.Succeed())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/networking/egressip.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const (
egressUpdateTimeout = 180
)

var _ = g.Describe("[sig-network][Feature:EgressIP][apigroup:config.openshift.io]", func() {
var _ = g.Describe("[sig-network][Feature:EgressIP][apigroup:operator.openshift.io]", func() {
oc := exutil.NewCLIWithPodSecurityLevel(namespacePrefix, admissionapi.LevelPrivileged)
portAllocator := NewPortAllocator(egressIPTargetHostPortMin, egressIPTargetHostPortMax)

Expand Down
2 changes: 1 addition & 1 deletion test/extended/oauth/client_secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var _ = g.Describe("[sig-auth][Feature:OAuthServer]", func() {
ctx := context.Background()

g.Describe("ClientSecretWithPlus", func() {
g.It(fmt.Sprintf("should create oauthclient [apigroup:config.openshift.io][apigroup:oauth.openshift.io][apigroup:user.openshift.io]"), func() {
g.It(fmt.Sprintf("should create oauthclient [apigroup:oauth.openshift.io][apigroup:user.openshift.io]"), func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/oauth/oauthcertfallback.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var _ = g.Describe("[sig-auth][Feature:OAuthServer] OAuth server", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("oauth")

g.It("has the correct token and certificate fallback semantics [apigroup:config.openshift.io][apigroup:user.openshift.io]", func() {
g.It("has the correct token and certificate fallback semantics [apigroup:user.openshift.io]", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/oauth/well_known.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var _ = g.Describe("[sig-auth][Feature:OAuthServer] well-known endpoint", func()
oauthNamespace = "openshift-authentication"
)

g.It("should be reachable [apigroup:config.openshift.io][apigroup:route.openshift.io]", func() {
g.It("should be reachable [apigroup:route.openshift.io]", func() {
metadataJSON, err := oc.Run("get").Args("--raw", "/.well-known/oauth-authorization-server").Output()
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
4 changes: 2 additions & 2 deletions test/extended/olm/olm.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ var _ = g.Describe("[sig-operator] OLM should", func() {

// OCP-24061 - [bz 1685230] OLM operator should use imagePullPolicy: IfNotPresent
// author: [email protected]
g.It("have imagePullPolicy:IfNotPresent on thier deployments [apigroup:config.openshift.io]", func() {
g.It("have imagePullPolicy:IfNotPresent on thier deployments", func() {
oc := oc.AsAdmin().WithoutNamespace()
namespace := "openshift-operator-lifecycle-manager"

Expand Down Expand Up @@ -142,7 +142,7 @@ var _ = g.Describe("[sig-arch] ocp payload should be based on existing source",
// TODO: This test should be more generic and across components
// OCP-20981, [BZ 1626434]The olm/catalog binary should output the exact version info
// author: [email protected]
g.It("OLM version should contain the source commit id [apigroup:config.openshift.io]", func() {
g.It("OLM version should contain the source commit id", func() {

oc := oc
namespace := "openshift-operator-lifecycle-manager"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/operators/daemon_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var _ = g.Describe("[sig-arch] Managed cluster", func() {
// during an upgrade as new pods start and then establish connections.
//
// Currently only applies to daemonsets that don't explicitly target the control plane.
g.It("should only include cluster daemonsets that have maxUnavailable update of 10 or 33 percent [apigroup:config.openshift.io]", func() {
g.It("should only include cluster daemonsets that have maxUnavailable update of 10 or 33 percent", func() {
// iterate over the references to find valid images
daemonSets, err := oc.KubeFramework().ClientSet.AppsV1().DaemonSets("").List(context.Background(), metav1.ListOptions{})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/prometheus/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ var _ = g.Describe("[sig-instrumentation][Late] Alerts", func() {
oc = exutil.NewCLIWithoutNamespace("prometheus")
)

g.It("shouldn't report any unexpected alerts in firing or pending state [apigroup:config.openshift.io]", func() {
g.It("shouldn't report any unexpected alerts in firing or pending state", func() {
// we only consider samples since the beginning of the test
testDuration := exutil.DurationSinceStartInSeconds()
alerts.CheckAlerts(alerts.AllowedAlertsDuringConformance, oc.AdminConfig(), oc.NewPrometheusClient(context.TODO()), oc.AdminConfigClient(), testDuration, nil)
Expand Down
2 changes: 1 addition & 1 deletion test/extended/prometheus/prometheus_builds.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var _ = g.Describe("[sig-instrumentation][sig-builds][Feature:Builds] Prometheus
})

g.Describe("when installed on the cluster", func() {
g.It("should start and expose a secured proxy and verify build metrics [apigroup:config.openshift.io][apigroup:build.openshift.io]", func() {
g.It("should start and expose a secured proxy and verify build metrics [apigroup:build.openshift.io]", func() {
controlPlaneTopology, infra_err := exutil.GetControlPlaneTopology(oc)
o.Expect(infra_err).NotTo(o.HaveOccurred())

Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/grpc-interop.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var _ = g.Describe("[sig-network-edge][Conformance][Area:Networking][Feature:Rou
})

g.Describe("The HAProxy router", func() {
g.It("should pass the gRPC interoperability tests [apigroup:config.openshift.io][apigroup:route.openshift.io][apigroup:operator.openshift.io]", func() {
g.It("should pass the gRPC interoperability tests [apigroup:route.openshift.io][apigroup:operator.openshift.io]", func() {
isProxyJob, err := exutil.IsClusterProxyEnabled(oc)
o.Expect(err).NotTo(o.HaveOccurred(), "failed to get proxy configuration")
if isProxyJob {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/h2spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var _ = g.Describe("[sig-network-edge][Conformance][Area:Networking][Feature:Rou
})

g.Describe("The HAProxy router", func() {
g.It("should pass the h2spec conformance tests [apigroup:config.openshift.io][apigroup:authorization.openshift.io][apigroup:user.openshift.io][apigroup:security.openshift.io][apigroup:operator.openshift.io]", func() {
g.It("should pass the h2spec conformance tests [apigroup:authorization.openshift.io][apigroup:user.openshift.io][apigroup:security.openshift.io][apigroup:operator.openshift.io]", func() {
isProxyJob, err := exutil.IsClusterProxyEnabled(oc)
o.Expect(err).NotTo(o.HaveOccurred(), "failed to get proxy configuration")
if isProxyJob {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/headers.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-network][Feature:Router][apigroup:config.openshift.io][apigroup:operator.openshift.io]", func() {
var _ = g.Describe("[sig-network][Feature:Router][apigroup:operator.openshift.io]", func() {
defer g.GinkgoRecover()
var (
configPath = exutil.FixturePath("testdata", "router", "router-http-echo-server.yaml")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/idle.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var _ = g.Describe("[sig-network-edge][Conformance][Area:Networking][Feature:Rou
})

g.Describe("The HAProxy router", func() {
g.It("should be able to connect to a service that is idled because a GET on the route will unidle it [apigroup:config.openshift.io]", func() {
g.It("should be able to connect to a service that is idled because a GET on the route will unidle it", func() {
network, err := oc.AdminConfigClient().ConfigV1().Networks().Get(context.Background(), "cluster", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred(), "failed to get cluster network configuration")
if !(network.Status.NetworkType == "OVNKubernetes" || network.Status.NetworkType == "OpenShiftSDN") {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
)

var _ = g.Describe("[sig-network][Feature:Router][apigroup:config.openshift.io]", func() {
var _ = g.Describe("[sig-network][Feature:Router]", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLIWithPodSecurityLevel("router-metrics", admissionapi.LevelBaseline)
Expand Down
2 changes: 1 addition & 1 deletion test/extended/security/fips.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var _ = g.Describe("[sig-arch] [Conformance] FIPS", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLIWithPodSecurityLevel("fips", admissionapi.LevelPrivileged)

g.It("TestFIPS [apigroup:config.openshift.io]", func() {
g.It("TestFIPS", func() {
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())
clusterAdminKubeClientset := oc.AdminKubeClient()
Expand Down
Loading