e2e-test: add e2e tests for ApisixPluginConfig v2 (#1067)

apache · Jun 7, 2022 · 96dd07f · 96dd07f
1 parent d3a823f
commit 96dd07f
Show file tree

Hide file tree

Showing 3 changed files with 310 additions and 240 deletions.
diff --git a/samples/deploy/crd/v1/ApisixPluginConfig.yaml b/samples/deploy/crd/v1/ApisixPluginConfig.yaml
@@ -30,6 +30,59 @@ spec:
       - apc
   versions:
     - name: v2beta3
+      served: true
+      storage: false
+      subresources:
+        status: {}
+      additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+          priority: 0
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              required:
+                - plugins
+              properties:
+                plugins:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      name:
+                        type: string
+                        minLength: 1
+                      enable:
+                        type: boolean
+                      config:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true # we have to enable it since plugin config
+                  required:
+                    - name
+                    - enable
+            status:
+              type: object
+              properties:
+                conditions:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      "type":
+                        type: string
+                      reason:
+                        type: string
+                      status:
+                        type: string
+                      message:
+                        type: string
+                      observedGeneration:
+                        type: integer
+    - name: v2
       served: true
       storage: true
       subresources:

diff --git a/test/e2e/scaffold/scaffold.go b/test/e2e/scaffold/scaffold.go
@@ -19,6 +19,7 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -54,6 +55,7 @@ type Options struct {
 	APISIXRouteVersion         string
 	APISIXTlsVersion           string
 	APISIXConsumerVersion      string
+	ApisixPluginConfigVersion  string
 	APISIXClusterConfigVersion string
 	APISIXAdminAPIKey          string
 	EnableWebhooks             bool
@@ -115,6 +117,9 @@ func NewScaffold(o *Options) *Scaffold {
 	if o.APISIXConsumerVersion == "" {
 		o.APISIXConsumerVersion = config.ApisixV2beta3
 	}
+	if o.ApisixPluginConfigVersion == "" {
+		o.ApisixPluginConfigVersion = config.ApisixV2beta3
+	}
 	if o.APISIXClusterConfigVersion == "" {
 		o.APISIXClusterConfigVersion = config.ApisixV2beta3
 	}
@@ -145,6 +150,7 @@ func NewDefaultScaffold() *Scaffold {
 		APISIXRouteVersion:         kube.ApisixRouteV2beta3,
 		APISIXTlsVersion:           config.ApisixV2beta3,
 		APISIXConsumerVersion:      config.ApisixV2beta3,
+		ApisixPluginConfigVersion:  config.ApisixV2beta3,
 		APISIXClusterConfigVersion: config.ApisixV2beta3,
 		EnableWebhooks:             false,
 		APISIXPublishAddress:       "",
@@ -163,6 +169,7 @@ func NewDefaultV2Scaffold() *Scaffold {
 		APISIXRouteVersion:         kube.ApisixRouteV2,
 		APISIXTlsVersion:           config.ApisixV2,
 		APISIXConsumerVersion:      config.ApisixV2,
+		ApisixPluginConfigVersion:  config.ApisixV2,
 		APISIXClusterConfigVersion: config.ApisixV2,
 		EnableWebhooks:             false,
 		APISIXPublishAddress:       "",
@@ -532,3 +539,12 @@ func generateWebhookCert(ns string) error {
 
 	return nil
 }
+
+func (s *Scaffold) CreateVersionedApisixPluginConfig(yml string) error {
+	if !strings.Contains(yml, "kind: ApisixPluginConfig") {
+		return errors.New("not a ApisixPluginConfig")
+	}
+
+	ac := s.replaceApiVersion(yml, s.opts.ApisixPluginConfigVersion)
+	return s.CreateResourceFromString(ac)
+}