Skip to content

Commit 0f3d4a8

Browse files
committed
feat: Add v2 API support for ApisixConsumer and include e2e tests
1 parent 7cbda5e commit 0f3d4a8

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

internal/manager/run.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"sigs.k8s.io/gateway-api/apis/v1beta1"
3434

3535
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
36+
apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
3637
"github.com/apache/apisix-ingress-controller/internal/controller"
3738
"github.com/apache/apisix-ingress-controller/internal/controller/config"
3839
"github.com/apache/apisix-ingress-controller/internal/controller/status"
@@ -52,6 +53,9 @@ func init() {
5253
if err := v1alpha1.AddToScheme(scheme); err != nil {
5354
panic(err)
5455
}
56+
if err := apiv2.AddToScheme(scheme); err != nil {
57+
panic(err)
58+
}
5559
if err := v1beta1.Install(scheme); err != nil {
5660
panic(err)
5761
}

test/e2e/apiv2/apisixconsumer.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,26 @@ import (
2020
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
2121
)
2222

23-
var _ = FDescribe("Test ApisixConsumer", func() {
23+
var _ = Describe("Test ApisixConsumer", func() {
2424
var (
2525
s = scaffold.NewDefaultScaffold()
2626
applier = framework.NewApplier(s.GinkgoT, s.K8sClient, s.CreateResourceFromString)
2727
)
28-
29-
var apisixConsumerSpec = `
28+
Context("Test ApisixConsumer", func() {
29+
It("Test ApisixConsumer", func() {
30+
var apisixConsumerSpec = `
3031
apiVersion: apisix.apache.org/v2
3132
kind: ApisixConsumer
3233
metadata:
33-
name: defaultApisixConsumer
34+
name: defaultapisixconsumer
3435
spec:
3536
authParameter:
3637
basicAuth:
3738
value:
3839
username: jack
3940
password: jack-password
4041
`
41-
applier.MustApplyApisixConsumer(types.NamespacedName{Name: "defaultApisixConsumer", Namespace: s.Namespace()}, apisixConsumerSpec)
42+
applier.MustApplyApisixConsumer(types.NamespacedName{Name: "defaultapisixconsumer", Namespace: s.Namespace()}, apisixConsumerSpec)
43+
})
44+
})
4245
})

0 commit comments

Comments
 (0)