Skip to content

Commit 067cd4b

Browse files
committed
jianl - First e2e test
1 parent 75c15b5 commit 067cd4b

File tree

4 files changed

+59
-17
lines changed

4 files changed

+59
-17
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
bin/
33
.DS_Store
44
_output
5+
.openshift-tests-extension

.openshift-tests-extension/openshift_payload_cluster-version-operator.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

test/cvo/cvo.go

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,34 @@
11
package cvo
22

33
import (
4-
. "github.com/onsi/ginkgo/v2"
5-
. "github.com/onsi/gomega"
4+
"context"
5+
6+
g "github.com/onsi/ginkgo/v2"
7+
o "github.com/onsi/gomega"
8+
"github.com/openshift/cluster-version-operator/test/utilities"
9+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
10+
"k8s.io/client-go/kubernetes"
611
)
712

8-
var _ = Describe("[Jira:Cluster Version Operator] cluster-version-operator-tests", func() {
9-
It("should support passing tests", func() {
10-
Expect(true).To(BeTrue())
13+
var _ = g.Describe("[Jira:Cluster Version Operator] cluster-version-operator-tests", g.Ordered, g.Label("cvo"), func() {
14+
defer g.GinkgoRecover()
15+
var oc *kubernetes.Clientset
16+
17+
g.BeforeAll(func() {
18+
oc, _ = utilities.GetClient()
19+
o.Expect(oc).NotTo(o.BeNil())
20+
})
21+
22+
g.It("Author:jianl-High-42543-the removed resources are not created in a fresh installed cluster", g.Label("High", "42543"), func() {
23+
g.By("Validate resource with 'release.openshift.io/delete: \"true\"' annotation is not installed")
24+
25+
_, err := oc.CoreV1().Services("openshift-cloud-credential-operator").Get(context.TODO(), "controller-manager-service", metav1.GetOptions{})
26+
o.Expect(err).To(o.HaveOccurred(), "Service controller-manager-service was accidentally installed")
27+
28+
_, err = oc.RbacV1().ClusterRoleBindings().Get(context.TODO(), "default-account-openshift-machine-config-operator", metav1.GetOptions{})
29+
o.Expect(err).To(o.HaveOccurred(), "ClusterRoleBinding default-account-openshift-machine-config-operator was accidentally installed")
30+
31+
_, err = oc.BatchV1().CronJobs("openshift-machine-config-operator").Get(context.TODO(), "machine-config-nodes-crd-cleanup", metav1.GetOptions{})
32+
o.Expect(err).To(o.HaveOccurred(), "CronJob machine-config-nodes-crd-cleanup was accidentally installed")
1133
})
1234
})

test/utilities/connection.go

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package utilities
2+
3+
import (
4+
"errors"
5+
"os"
6+
7+
"k8s.io/client-go/kubernetes"
8+
"k8s.io/client-go/tools/clientcmd"
9+
)
10+
11+
// getClient
12+
// @Description create a kubernetes.Clientset object
13+
// @Create jianl Oct 23 2025
14+
// @Return (Instance of kubernetes.Clientset, error)
15+
func GetClient() (*kubernetes.Clientset, error) {
16+
configPath, present := os.LookupEnv("KUBECONFIG")
17+
if present {
18+
config, err := clientcmd.BuildConfigFromFlags("", configPath)
19+
if err != nil {
20+
return nil, err
21+
}
22+
// Create the Clientset
23+
clientset, err := kubernetes.NewForConfig(config)
24+
if err != nil {
25+
return nil, err
26+
}
27+
return clientset, nil
28+
} else {
29+
return nil, errors.New("KUBECONFIG not set")
30+
}
31+
}

0 commit comments

Comments
 (0)