github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123628 from Jefftree/agg-conformance

Browse Source 
promote aggregated discovery conformance tests
This commit is contained in:
Kubernetes Prow Robot
2024-03-04 11:23:59 -08:00
committed by GitHub
parent 6c8dc1d1ed ebcb78df52
commit 320e288b5e
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/conformance/testdata/conformance.yaml vendored
View File

@@ -225,6 +225,35 @@
all MUST be denied.
release: v1.16
file: test/e2e/apimachinery/webhook.go
- testname: Aggregated Discovery Interface
codename: '[sig-api-machinery] AggregatedDiscovery should support aggregated discovery
interface [Conformance]'
description: An apiserver MUST support the Aggregated Discovery client interface.
Built-in resources MUST all be present.
release: v1.30
file: test/e2e/apimachinery/aggregated_discovery.go
- testname: Aggregated Discovery Interface CRDs
codename: '[sig-api-machinery] AggregatedDiscovery should support aggregated discovery
interface for CRDs [Conformance]'
description: An apiserver MUST support the Aggregated Discovery client interface.
Add a CRD to the apiserver. The CRD resource MUST be present in the discovery
document.
release: v1.30
file: test/e2e/apimachinery/aggregated_discovery.go
- testname: Aggregated Discovery Endpoint Accept Headers
codename: '[sig-api-machinery] AggregatedDiscovery should support raw aggregated
discovery endpoint Accept headers [Conformance]'
description: An apiserver MUST support the Aggregated Discovery endpoint Accept
headers. Built-in resources MUST all be present.
release: v1.30
file: test/e2e/apimachinery/aggregated_discovery.go
- testname: Aggregated Discovery Endpoint Accept Headers CRDs
codename: '[sig-api-machinery] AggregatedDiscovery should support raw aggregated
discovery request for CRDs [Conformance]'
description: An apiserver MUST support the Aggregated Discovery endpoint Accept
headers. Add a CRD to the apiserver. The CRD MUST appear in the discovery document.
release: v1.30
file: test/e2e/apimachinery/aggregated_discovery.go
- testname: aggregator-supports-the-sample-apiserver
codename: '[sig-api-machinery] Aggregator Should be able to support the 1.17 Sample
API Server using the current Aggregator [Conformance]'

10
test/e2e/apimachinery/aggregated_discovery.go
View File

@@ -34,8 +34,6 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/kubernetes/test/e2e/framework"
admissionapi "k8s.io/pod-security-admission/api"
"github.com/onsi/ginkgo/v2"
)
var _ = SIGDescribe("AggregatedDiscovery", func() {
@@ -150,7 +148,7 @@ var _ = SIGDescribe("AggregatedDiscovery", func() {
Testname: Aggregated Discovery Endpoint Accept Headers
Description: An apiserver MUST support the Aggregated Discovery endpoint Accept headers. Built-in resources MUST all be present.
*/
ginkgo.It("should support raw aggregated discovery endpoint Accept headers", func(ctx context.Context) {
framework.ConformanceIt("should support raw aggregated discovery endpoint Accept headers", func(ctx context.Context) {
d, err := f.ClientSet.Discovery().RESTClient().Get().AbsPath("/apis").SetHeader("Accept", aggregatedAccept).Do(ctx).Raw()
if err != nil {
framework.Failf("Failed to get raw aggregated discovery document")
@@ -193,7 +191,7 @@ var _ = SIGDescribe("AggregatedDiscovery", func() {
Description: An apiserver MUST support the Aggregated Discovery endpoint Accept headers.
Add a CRD to the apiserver. The CRD MUST appear in the discovery document.
*/
ginkgo.It("should support raw aggregated discovery request for CRDs", func(ctx context.Context) {
framework.ConformanceIt("should support raw aggregated discovery request for CRDs", func(ctx context.Context) {
config, err := framework.LoadConfig()
framework.ExpectNoError(err)
apiExtensionClient, err := apiextensionclientset.NewForConfig(config)
@@ -258,7 +256,7 @@ var _ = SIGDescribe("AggregatedDiscovery", func() {
Testname: Aggregated Discovery Interface
Description: An apiserver MUST support the Aggregated Discovery client interface. Built-in resources MUST all be present.
*/
ginkgo.It("should support aggregated discovery interface", func(ctx context.Context) {
framework.ConformanceIt("should support aggregated discovery interface", func(ctx context.Context) {
d := f.ClientSet.Discovery()
ad, ok := d.(clientdiscovery.AggregatedDiscoveryInterface)
@@ -302,7 +300,7 @@ var _ = SIGDescribe("AggregatedDiscovery", func() {
Description: An apiserver MUST support the Aggregated Discovery client interface.
Add a CRD to the apiserver. The CRD resource MUST be present in the discovery document.
*/
ginkgo.It("should support aggregated discovery interface for CRDs", func(ctx context.Context) {
framework.ConformanceIt("should support aggregated discovery interface for CRDs", func(ctx context.Context) {
config, err := framework.LoadConfig()
framework.ExpectNoError(err)
apiExtensionClient, err := apiextensionclientset.NewForConfig(config)