Skip to content

Commit 36c70c6

Browse files
authored
test: re-enable KonnectExtension tests (#1994)
Signed-off-by: Mattia Lavacca <[email protected]>
1 parent 8353d00 commit 36c70c6

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

controller/konnect/konnectextension_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func listExtendableReferencedExtensions[t extensions.ExtendableT](_ context.Cont
121121
recs := []reconcile.Request{}
122122

123123
for _, ext := range o.GetExtensions() {
124-
if ext.Group != konnectv1alpha1.SchemeGroupVersion.Group ||
124+
if ext.Group != konnectv1alpha2.SchemeGroupVersion.Group ||
125125
ext.Kind != konnectv1alpha2.KonnectExtensionKind {
126126
continue
127127
}

test/integration/dataplane_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
)
3434

3535
const (
36-
waitTime = time.Minute
36+
waitTime = 90 * time.Second
3737
tickTime = 250 * time.Millisecond
3838
)
3939

test/integration/konnect_extension_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ func TestKonnectExtensionKonnectControlPlaneNotFound(t *testing.T) {
6565
}
6666

6767
func TestKonnectExtensionControlPlaneRotation(t *testing.T) {
68-
t.Skip("TODO: adapt to ControlPlane v2alpha1 https://github.com/kong/kong-operator/issues/1730")
69-
7068
ns, _ := helpers.SetupTestEnv(t, GetCtx(), GetEnv())
7169

7270
// Let's generate a unique test ID that we can refer to in Konnect entities.
@@ -160,8 +158,6 @@ func TestKonnectExtensionControlPlaneRotation(t *testing.T) {
160158
}
161159

162160
func TestKonnectExtension(t *testing.T) {
163-
t.Skip("TODO: adapt to ControlPlane v2alpha1 https://github.com/kong/kong-operator/issues/1730")
164-
165161
ns, _ := helpers.SetupTestEnv(t, GetCtx(), GetEnv())
166162

167163
// Let's generate a unique test ID that we can refer to in Konnect entities.
@@ -292,7 +288,12 @@ func KonnectExtensionTestCases(t *testing.T, params KonnectExtensionTestCasePara
292288
consts.TLSCRT: cert,
293289
consts.TLSKey: key,
294290
},
295-
deploy.WithLabel("konghq.com/konnect-dp-cert", "true"),
291+
deploy.WithLabel(
292+
"konghq.com/konnect-dp-cert", "true",
293+
),
294+
deploy.WithLabel(
295+
"konghq.com/secret", "true",
296+
),
296297
)
297298
t.Cleanup(deleteObjectAndWaitForDeletionFn(t, secretCert.DeepCopy()))
298299

0 commit comments

Comments
 (0)