-
Notifications
You must be signed in to change notification settings - Fork 209
NO-ISSUE: OTA-1605 Create MustGetKubeClient function for e2e test #1249
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| package cvo | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Comment not related to the code I will hold us to a higher standard regarding the git hygiene, if I may. Please see the Contributing guide for the cluster-version-operator repository. I am mainly concerned about the following points:
Currently, the PR consists of a single commit Please keep in mind that these guidelines have their practical purposes.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated the commit, because this is the first OTE PR, it contains many logic, so the description may not describes everything. I will keep PR simple and describe the logic in the future. |
||
| import ( | ||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| g "github.com/onsi/ginkgo/v2" | ||
| o "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| var _ = Describe("[Jira:Cluster Version Operator] cluster-version-operator-tests", func() { | ||
| It("should support passing tests", func() { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why is my sanity test being removed? :(
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Its future usefulness is questionable. However, for the moment, I am using it to validate that the openshift/origin#30316 PR is functional. Would it be okay for me rename to the component in the /cc @hongkailiu
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can then validate this PR with an integrated OTE in the CVO repository.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you want to keep "should support passing tests" only temporarily (to validate and merge openshift/origin#30316), and then do I would not practice Maybe it is not a big deal, and it is OK delete as long as having them ignored?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't mind just keeping the test forever.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I meant "ignore" as is in, do not touch. Not as in utilizing the
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ack. Jian has reverted the deleting.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @DavidHurta I just added back the case and rename it as you mentioned. It is a independent test suite.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks. It helps with the integration. It also provides a signal of the integration working in the future. Such sanity tests are also in several other OpenShift repositories that already integrated the OTE or are in the process of the integration. |
||
| Expect(true).To(BeTrue()) | ||
| var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator-tests should support passing tests`, func() { | ||
| g.It("the sanity test should pass", func() { | ||
| o.Expect(true).To(o.BeTrue()) | ||
| }) | ||
| }) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| package utilities | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "os" | ||
|
|
||
| "k8s.io/client-go/rest" | ||
| "k8s.io/client-go/tools/clientcmd" | ||
|
|
||
| configclient "github.com/openshift/client-go/config/clientset/versioned" | ||
| configclientv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1" | ||
| configv1alpha1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1" | ||
| configv1alpha2 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha2" | ||
| ) | ||
|
|
||
| // getKubeConfig get KUBECONFIG file from environment variable | ||
| func getKubeConfig() (*rest.Config, error) { | ||
| configPath, present := os.LookupEnv("KUBECONFIG") | ||
| fmt.Print("configPath: ", configPath) | ||
| if !present { | ||
| return nil, errors.New("the environment variable KUBECONFIG must be set") | ||
| } | ||
| config, err := clientcmd.BuildConfigFromFlags("", configPath) | ||
| return config, err | ||
| } | ||
|
|
||
| // getClient creates a configclient.Clientset instance. | ||
| func getClient() (*configclient.Clientset, error) { | ||
| config, err := getKubeConfig() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to load build config: %w", err) | ||
| } | ||
| // Create the Clientset | ||
| clientset, err := configclient.NewForConfig(config) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to create a Kubernetes clientset: %w", err) | ||
| } | ||
|
|
||
| return clientset, nil | ||
| } | ||
|
|
||
| // getV1Client creates a configclientv1.ConfigV1Client instance. | ||
| func getV1Client() (*configclientv1.ConfigV1Client, error) { | ||
| config, err := getKubeConfig() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to load build config: %w", err) | ||
| } | ||
| // Create the Clientset | ||
| clientset, err := configclientv1.NewForConfig(config) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to create a Kubernetes clientset: %w", err) | ||
| } | ||
|
|
||
| return clientset, nil | ||
| } | ||
|
|
||
| // getV1alpha1Client creates a configv1alpha1.ConfigV1alpha1Client instance. | ||
| func getV1alpha1Client() (*configv1alpha1.ConfigV1alpha1Client, error) { | ||
| // Create the Clientset | ||
| config, err := getKubeConfig() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to load build config: %w", err) | ||
| } | ||
| clientset, err := configv1alpha1.NewForConfig(config) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to create a Kubernetes clientset: %w", err) | ||
| } | ||
|
|
||
| return clientset, nil | ||
| } | ||
|
|
||
| // getV1alpha2Client creates a configv1alpha2.ConfigV1alpha2Client instance. | ||
| func getV1alpha2Client() (*configv1alpha2.ConfigV1alpha2Client, error) { | ||
| // Create the Clientset | ||
| config, err := getKubeConfig() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to load build config: %w", err) | ||
| } | ||
| clientset, err := configv1alpha2.NewForConfig(config) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to create a Kubernetes clientset: %w", err) | ||
| } | ||
|
|
||
| return clientset, nil | ||
| } | ||
|
|
||
| // MustGetClient creates a configclient.Clientset instance, or panics on failures. | ||
| func MustGetClient() *configclient.Clientset { | ||
| clientset, err := getClient() | ||
| if err != nil { | ||
| panic("unable to create a Kubernetes clientset: " + err.Error()) | ||
| } | ||
| return clientset | ||
| } | ||
|
|
||
| // MustGetV1Client creates a configclientv1.ConfigV1Client instance, or panics on failures. | ||
| func MustGetV1Client() *configclientv1.ConfigV1Client { | ||
| clientset, err := getV1Client() | ||
| if err != nil { | ||
| panic("unable to create a Kubernetes clientset: " + err.Error()) | ||
| } | ||
| return clientset | ||
| } | ||
|
|
||
| // MUSTGetV1alpha1Client creates a configv1alpha1.ConfigV1alpha1Client instance, or panics on failures. | ||
| func MUSTGetV1alpha1Client() *configv1alpha1.ConfigV1alpha1Client { | ||
| clientset, err := getV1alpha1Client() | ||
| if err != nil { | ||
| panic("unable to create a Kubernetes clientset: " + err.Error()) | ||
| } | ||
| return clientset | ||
| } | ||
|
|
||
| // MUSTGetV1alpha2Client creates a configv1alpha2.ConfigV1alpha2Client instance, or panics on failures. | ||
| func MUSTGetV1alpha2Client() *configv1alpha2.ConfigV1alpha2Client { | ||
| clientset, err := getV1alpha2Client() | ||
| if err != nil { | ||
| panic("unable to create a Kubernetes clientset: " + err.Error()) | ||
| } | ||
| return clientset | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.