Skip to content

remove panic #2448

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
Nov 18, 2021
Merged

remove panic #2448

Show file tree
Hide file tree
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
14 changes: 8 additions & 6 deletions test/e2e/csv_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ import (
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/api/equality"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8slabels "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
Expand Down Expand Up @@ -1551,7 +1553,7 @@ var _ = Describe("ClusterServiceVersion", func() {
// Fetch cluster service version again to check for unnecessary control loops
sameCSV, err := fetchCSV(crc, csv.Name, testNamespace, csvSucceededChecker)
Expect(err).ShouldNot(HaveOccurred())
compareResources(GinkgoT(), fetchedCSV, sameCSV)
Expect(equality.Semantic.DeepEqual(fetchedCSV, sameCSV)).Should(BeTrue(), diff.ObjectDiff(fetchedCSV, sameCSV))
})
It("create with owned API service", func() {

Expand Down Expand Up @@ -2547,7 +2549,7 @@ var _ = Describe("ClusterServiceVersion", func() {
// Fetch cluster service version again to check for unnecessary control loops
sameCSV, err := fetchCSV(crc, csvNew.Name, testNamespace, csvSucceededChecker)
Expect(err).ShouldNot(HaveOccurred())
compareResources(GinkgoT(), fetchedCSV, sameCSV)
Expect(equality.Semantic.DeepEqual(fetchedCSV, sameCSV)).Should(BeTrue(), diff.ObjectDiff(fetchedCSV, sameCSV))
})
It("update different deployment name", func() {

Expand Down Expand Up @@ -2725,7 +2727,7 @@ var _ = Describe("ClusterServiceVersion", func() {
// Fetch cluster service version again to check for unnecessary control loops
sameCSV, err := fetchCSV(crc, csvNew.Name, testNamespace, csvSucceededChecker)
Expect(err).ShouldNot(HaveOccurred())
compareResources(GinkgoT(), fetchedCSV, sameCSV)
Expect(equality.Semantic.DeepEqual(fetchedCSV, sameCSV)).Should(BeTrue(), diff.ObjectDiff(fetchedCSV, sameCSV))

// Should have created new deployment and deleted old
depNew, err := c.GetDeployment(testNamespace, strategyNew.DeploymentSpecs[0].Name)
Expand Down Expand Up @@ -2915,7 +2917,7 @@ var _ = Describe("ClusterServiceVersion", func() {
// Fetch cluster service version again to check for unnecessary control loops
sameCSV, err := fetchCSV(crc, csvNew.Name, testNamespace, csvSucceededChecker)
Expect(err).ShouldNot(HaveOccurred())
compareResources(GinkgoT(), fetchedCSV, sameCSV)
Expect(equality.Semantic.DeepEqual(fetchedCSV, sameCSV)).Should(BeTrue(), diff.ObjectDiff(fetchedCSV, sameCSV))

// Should have created new deployment and deleted old
depNew, err := c.GetDeployment(testNamespace, strategyNew.DeploymentSpecs[0].Name)
Expand Down Expand Up @@ -3285,7 +3287,7 @@ var _ = Describe("ClusterServiceVersion", func() {
// Fetch cluster service version again to check for unnecessary control loops
sameCSV, err := fetchCSV(crc, csvNew.Name, testNamespace, csvSucceededChecker)
Expect(err).ShouldNot(HaveOccurred())
compareResources(GinkgoT(), fetchedCSV, sameCSV)
Expect(equality.Semantic.DeepEqual(fetchedCSV, sameCSV)).Should(BeTrue(), diff.ObjectDiff(fetchedCSV, sameCSV))

// Should have created new deployment and deleted old one
depNew, err := c.GetDeployment(testNamespace, strategyNew.DeploymentSpecs[0].Name)
Expand Down Expand Up @@ -3364,7 +3366,7 @@ var _ = Describe("ClusterServiceVersion", func() {
// Fetch cluster service version again to check for unnecessary control loops
sameCSV, err = fetchCSV(crc, csvNew2.Name, testNamespace, csvSucceededChecker)
Expect(err).ShouldNot(HaveOccurred())
compareResources(GinkgoT(), fetchedCSV, sameCSV)
Expect(equality.Semantic.DeepEqual(fetchedCSV, sameCSV)).Should(BeTrue(), diff.ObjectDiff(fetchedCSV, sameCSV))

// Should have created new deployment and deleted old one
depNew, err = c.GetDeployment(testNamespace, strategyNew2.DeploymentSpecs[0].Name)
Expand Down
12 changes: 7 additions & 5 deletions test/e2e/installplan_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ import (
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/api/equality"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
k8sjson "k8s.io/apimachinery/pkg/runtime/serializer/json"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery"
Expand Down Expand Up @@ -712,8 +714,8 @@ var _ = Describe("Install Plan", func() {
// Fetch installplan again to check for unnecessary control loops
fetchedInstallPlan, err = fetchInstallPlan(GinkgoT(), crc, fetchedInstallPlan.GetName(), func(fip *operatorsv1alpha1.InstallPlan) bool {
// Don't compare object meta as labels can be applied by the operator controller.
compareResources(GinkgoT(), fetchedInstallPlan.Spec, fip.Spec)
compareResources(GinkgoT(), fetchedInstallPlan.Status, fip.Status)
Expect(equality.Semantic.DeepEqual(fetchedInstallPlan.Spec, fip.Spec)).Should(BeTrue(), diff.ObjectDiff(fetchedInstallPlan, fip))
Expect(equality.Semantic.DeepEqual(fetchedInstallPlan.Status, fip.Status)).Should(BeTrue(), diff.ObjectDiff(fetchedInstallPlan, fip))
return true
})
require.NoError(GinkgoT(), err)
Expand Down Expand Up @@ -875,7 +877,7 @@ var _ = Describe("Install Plan", func() {

// Fetch installplan again to check for unnecessary control loops
fetchedInstallPlan, err = fetchInstallPlan(GinkgoT(), crc, fetchedInstallPlan.GetName(), func(fip *operatorsv1alpha1.InstallPlan) bool {
compareResources(GinkgoT(), fetchedInstallPlan, fip)
Expect(equality.Semantic.DeepEqual(fetchedInstallPlan, fip)).Should(BeTrue(), diff.ObjectDiff(fetchedInstallPlan, fip))
return true
})
require.NoError(GinkgoT(), err)
Expand Down Expand Up @@ -2343,7 +2345,7 @@ var _ = Describe("Install Plan", func() {

// Fetch installplan again to check for unnecessary control loops
fetchedInstallPlan, err = fetchInstallPlan(GinkgoT(), crc, fetchedInstallPlan.GetName(), func(fip *operatorsv1alpha1.InstallPlan) bool {
compareResources(GinkgoT(), fetchedInstallPlan, fip)
Expect(equality.Semantic.DeepEqual(fetchedInstallPlan, fip)).Should(BeTrue(), diff.ObjectDiff(fetchedInstallPlan, fip))
return true
})
require.NoError(GinkgoT(), err)
Expand Down Expand Up @@ -2544,7 +2546,7 @@ var _ = Describe("Install Plan", func() {

// Fetch installplan again to check for unnecessary control loops
fetchedInstallPlan, err = fetchInstallPlan(GinkgoT(), crc, fetchedInstallPlan.GetName(), func(fip *operatorsv1alpha1.InstallPlan) bool {
compareResources(GinkgoT(), fetchedInstallPlan, fip)
Expect(equality.Semantic.DeepEqual(fetchedInstallPlan, fip)).Should(BeTrue(), diff.ObjectDiff(fetchedInstallPlan, fip))
return true
})
require.NoError(GinkgoT(), err)
Expand Down
10 changes: 0 additions & 10 deletions test/e2e/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
extScheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
"k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand All @@ -26,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
k8sjson "k8s.io/apimachinery/pkg/runtime/serializer/json"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/apiserver/pkg/storage/names"
Expand Down Expand Up @@ -226,14 +224,6 @@ func awaitAnnotations(t GinkgoTInterface, query func() (metav1.ObjectMeta, error
return err
}

// compareResources compares resource equality then prints a diff for easier debugging
func compareResources(t GinkgoTInterface, expected, actual interface{}) {
if eq := equality.Semantic.DeepEqual(expected, actual); !eq {
t.Fatalf("Resource does not match expected value: %s",
diff.ObjectDiff(expected, actual))
}
}

type checkResourceFunc func() error

func waitForDelete(checkResource checkResourceFunc) error {
Expand Down