Skip to content

Bug 2091086: cli: don't insist on metal3 CRDs being present when cluster capabilities are None #26998

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 1 commit into from
May 27, 2022
Merged

Bug 2091086: cli: don't insist on metal3 CRDs being present when cluster capabilities are None #26998

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
33 changes: 26 additions & 7 deletions test/extended/cli/explain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
e2e "k8s.io/kubernetes/test/e2e/framework"

configv1 "github.com/openshift/api/config/v1"
configclient "github.com/openshift/client-go/config/clientset/versioned"
"github.com/openshift/origin/test/extended/networking"
exutil "github.com/openshift/origin/test/extended/util"
)
Expand Down Expand Up @@ -414,17 +415,36 @@ var (
}
)

var _ = g.Describe("[sig-cli] oc explain", func() {
defer g.GinkgoRecover()

oc := exutil.NewCLI("oc-explain")
func getCrdTypes(oc *exutil.CLI) []schema.GroupVersionResource {
configClient := configclient.NewForConfigOrDie(oc.AdminConfig())
clusterVersion, err := configClient.ConfigV1().ClusterVersions().Get(context.TODO(), "version", metav1.GetOptions{})
if err != nil {
e2e.Failf("Failed to get cluster version: %v", err)
}

crdTypes := append(baseCRDTypes, mcoTypes...)
crdTypes = append(crdTypes, autoscalingTypes...)
crdTypes = append(crdTypes, machineTypes...)
crdTypes = append(crdTypes, metal3Types...)
crdTypes = append(crdTypes, additionalOperatorTypes...)

// Only add metal3 types when the baremetal capability is enabled
for _, capability := range clusterVersion.Status.Capabilities.EnabledCapabilities {
if capability == configv1.ClusterVersionCapabilityBaremetal {
crdTypes = append(crdTypes, metal3Types...)
break
}
}

return crdTypes
}

var _ = g.Describe("[sig-cli] oc explain", func() {
defer g.GinkgoRecover()

oc := exutil.NewCLI("oc-explain")

g.It("list uncovered GroupVersionResources", func() {
crdTypes := getCrdTypes(oc)
resourceMap := make(map[schema.GroupVersionResource]bool)
kubeClient := kclientset.NewForConfigOrDie(oc.AdminConfig())
_, resourceList, err := kubeClient.Discovery().ServerGroupsAndResources()
Expand Down Expand Up @@ -480,8 +500,7 @@ var _ = g.Describe("[sig-cli] oc explain", func() {

g.It("should contain proper spec+status for CRDs", func() {
crdClient := apiextensionsclientset.NewForConfigOrDie(oc.AdminConfig())
crdTypesTest := crdTypes
Comment thread
honza marked this conversation as resolved.

crdTypesTest := getCrdTypes(oc)
controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
o.Expect(err).NotTo(o.HaveOccurred())
// External clusters are not expected to have 'autoscaling' or
Expand Down