Skip to content

Commit 0c18222

Browse files
kuiwang02kuiwang02
committed
UPSTREAM: <carry>: support disconnected
1 parent 25e39ce commit 0c18222

File tree

2 files changed

+28
-15
lines changed

2 files changed

+28
-15
lines changed

‎openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,11 @@
495495
"environmentSelector": {}
496496
},
497497
{
498-
"name": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working validating webhook",
499-
"labels": {},
498+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Serial] OLMv1 operator with webhooks should have a working validating webhook",
499+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working validating webhook",
500+
"labels": {
501+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working validating webhook": {}
502+
},
500503
"resources": {
501504
"isolation": {}
502505
},
@@ -505,8 +508,11 @@
505508
"environmentSelector": {}
506509
},
507510
{
508-
"name": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working mutating webhook",
509-
"labels": {},
511+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Serial] OLMv1 operator with webhooks should have a working mutating webhook",
512+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working mutating webhook",
513+
"labels": {
514+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working mutating webhook": {}
515+
},
510516
"resources": {
511517
"isolation": {}
512518
},
@@ -515,8 +521,11 @@
515521
"environmentSelector": {}
516522
},
517523
{
518-
"name": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working conversion webhook",
519-
"labels": {},
524+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Serial] OLMv1 operator with webhooks should have a working conversion webhook",
525+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working conversion webhook",
526+
"labels": {
527+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working conversion webhook": {}
528+
},
520529
"resources": {
521530
"isolation": {}
522531
},
@@ -525,8 +534,11 @@
525534
"environmentSelector": {}
526535
},
527536
{
528-
"name": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should be tolerant to tls secret deletion",
529-
"labels": {},
537+
"name": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Serial] OLMv1 operator with webhooks should be tolerant to tls secret deletion",
538+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should be tolerant to tls secret deletion",
539+
"labels": {
540+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should be tolerant to tls secret deletion": {}
541+
},
530542
"resources": {
531543
"isolation": {}
532544
},

‎openshift/tests-extension/test/webhooks.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
"github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
2828
"github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/helpers"
29+
"github.com/openshift/origin/test/extended/util/image"
2930
)
3031

3132
const (
@@ -35,7 +36,7 @@ const (
3536
webhookServiceCert = "webhook-operator-controller-manager-service-cert"
3637
)
3738

38-
var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks",
39+
var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Serial] OLMv1 operator with webhooks",
3940
Ordered, Serial, func() {
4041
var (
4142
k8sClient client.Client
@@ -63,7 +64,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServi
6364
err = k8sClient.Get(ctx, client.ObjectKey{Name: webhookCatalogName}, catalog)
6465
if apierrors.IsNotFound(err) {
6566
By(fmt.Sprintf("creating the webhook-operator catalog with name %s", webhookCatalogName))
66-
catalog = helpers.NewClusterCatalog(webhookCatalogName, "quay.io/operator-framework/webhook-operator-index:0.0.4")
67+
catalog = helpers.NewClusterCatalog(webhookCatalogName, image.LocationFor("quay.io/olmtest/webhook-operator-index:v0.0.5"))
6768
err = k8sClient.Create(ctx, catalog)
6869
Expect(err).ToNot(HaveOccurred())
6970

@@ -95,7 +96,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServi
9596
}
9697
})
9798

98-
It("should have a working validating webhook", func(ctx SpecContext) {
99+
It("should have a working validating webhook", Label("original-name:[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working validating webhook"), func(ctx SpecContext) {
99100
By("creating a webhook test resource that will be rejected by the validating webhook")
100101
Eventually(func() error {
101102
name := fmt.Sprintf("validating-webhook-test-%s", rand.String(5))
@@ -121,7 +122,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServi
121122
}).WithTimeout(2 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
122123
})
123124

124-
It("should have a working mutating webhook", func(ctx SpecContext) {
125+
It("should have a working mutating webhook", Label("original-name:[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working mutating webhook"), func(ctx SpecContext) {
125126
By("creating a valid webhook")
126127
mutatingWebhookResourceName := "mutating-webhook-test"
127128
resource := newWebhookTest(mutatingWebhookResourceName, webhookOperatorInstallNamespace, true)
@@ -143,7 +144,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServi
143144
}))
144145
})
145146

146-
It("should have a working conversion webhook", func(ctx SpecContext) {
147+
It("should have a working conversion webhook", Label("original-name:[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should have a working conversion webhook"), func(ctx SpecContext) {
147148
By("creating a conversion webhook test resource")
148149
conversionWebhookResourceName := "conversion-webhook-test"
149150
resourceV1 := newWebhookTest(conversionWebhookResourceName, webhookOperatorInstallNamespace, true)
@@ -167,7 +168,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServi
167168
}))
168169
})
169170

170-
It("should be tolerant to tls secret deletion", func(ctx SpecContext) {
171+
It("should be tolerant to tls secret deletion", Label("original-name:[sig-olmv1][OCPFeatureGate:NewOLMWebhookProviderOpenshiftServiceCA][Skipped:Disconnected][Serial] OLMv1 operator with webhooks should be tolerant to tls secret deletion"), func(ctx SpecContext) {
171172
certificateSecretName := webhookServiceCert
172173
By("ensuring secret exists before deletion attempt")
173174
Eventually(func(g Gomega) {
@@ -286,7 +287,7 @@ func setupWebhookOperator(ctx SpecContext, k8sClient client.Client, webhookOpera
286287
helpers.ExpectClusterRoleBindingExists(ctx, operatorClusterRoleBindingName)
287288

288289
ceName := webhookOperatorInstallNamespace
289-
ce := helpers.NewClusterExtensionObject("webhook-operator", "0.0.4", ceName, saName, webhookOperatorInstallNamespace)
290+
ce := helpers.NewClusterExtensionObject("webhook-operator", "0.0.5", ceName, saName, webhookOperatorInstallNamespace)
290291
ce.Spec.Source.Catalog.Selector = &metav1.LabelSelector{
291292
MatchLabels: map[string]string{
292293
"olm.operatorframework.io/metadata.name": webhookCatalogName,

0 commit comments

Comments
 (0)