This is an automated email from the ASF dual-hosted git repository.
alinsran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new 7fee6bd3 chore: use constant variable instead of hard code (#2560)
7fee6bd3 is described below
commit 7fee6bd3315db3c790880080cd59cba015f3e950
Author: ArthurMorgan <[email protected]>
AuthorDate: Thu Sep 18 11:30:23 2025 +0800
chore: use constant variable instead of hard code (#2560)
---
api/adc/types.go | 54 +--------------------------
internal/adc/cache/memdb.go | 40 ++++++++++----------
internal/adc/client/client.go | 4 +-
internal/adc/translator/apisixroute.go | 3 +-
internal/adc/translator/gateway.go | 3 +-
internal/adc/translator/httproute.go | 9 +++--
internal/adc/translator/ingress.go | 3 +-
internal/controller/apisixroute_controller.go | 2 +-
internal/controller/consumer_controller.go | 3 +-
internal/controller/gateway_controller.go | 3 +-
internal/controller/httproute_controller.go | 8 ++--
internal/controller/httproutepolicy.go | 11 +++---
internal/controller/indexer/indexer.go | 11 +++---
internal/controller/ingress_controller.go | 3 +-
internal/controller/policies.go | 3 +-
internal/manager/controllers.go | 26 ++++++-------
internal/provider/apisix/provider.go | 30 +++++++--------
test/conformance/suite_test.go | 3 +-
test/e2e/crds/v1alpha1/gatewayproxy.go | 3 +-
test/e2e/gatewayapi/controller.go | 9 +++--
test/e2e/gatewayapi/gatewayproxy.go | 13 ++++---
test/e2e/scaffold/scaffold.go | 17 +++++----
22 files changed, 112 insertions(+), 149 deletions(-)
diff --git a/api/adc/types.go b/api/adc/types.go
index 70fc4ce4..2133d731 100644
--- a/api/adc/types.go
+++ b/api/adc/types.go
@@ -30,54 +30,6 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
)
-const (
- // HashOnVars means the hash scope is variable.
- HashOnVars = "vars"
- // HashOnVarsCombination means the hash scope is the
- // variable combination.
- HashOnVarsCombination = "vars_combinations"
- // HashOnHeader means the hash scope is HTTP request
- // headers.
- HashOnHeader = "header"
- // HashOnCookie means the hash scope is HTTP Cookie.
- HashOnCookie = "cookie"
- // HashOnConsumer means the hash scope is APISIX consumer.
- HashOnConsumer = "consumer"
-
- // LbRoundRobin is the round robin load balancer.
- LBRoundRobin = "roundrobin"
- // LbConsistentHash is the consistent hash load balancer.
- LbConsistentHash = "chash"
- // LbEwma is the ewma load balancer.
- LbEwma = "ewma"
- // LbLeaseConn is the least connection load balancer.
- LbLeastConn = "least_conn"
-
- // SchemeHTTP represents the HTTP protocol.
- SchemeHTTP = "http"
- // SchemeGRPC represents the GRPC protocol.
- SchemeGRPC = "grpc"
- // SchemeHTTPS represents the HTTPS protocol.
- SchemeHTTPS = "https"
- // SchemeGRPCS represents the GRPCS protocol.
- SchemeGRPCS = "grpcs"
- // SchemeTCP represents the TCP protocol.
- SchemeTCP = "tcp"
- // SchemeUDP represents the UDP protocol.
- SchemeUDP = "udp"
-
- // DefaultUpstreamTimeout represents the default connect,
- // read and send timeout (in seconds) with upstreams.
- DefaultUpstreamTimeout = 60
-
- // PassHostPass represents pass option for pass_host Upstream settings.
- PassHostPass = "pass"
- // PassHostPass represents node option for pass_host Upstream settings.
- PassHostNode = "node"
- // PassHostPass represents rewrite option for pass_host Upstream
settings.
- PassHostRewrite = "rewrite"
-)
-
const (
TypeRoute = "route"
TypeService = "service"
@@ -393,11 +345,7 @@ const (
type Scheme string
const (
- Grpc Scheme = "grpc"
- Grpcs Scheme = "grpcs"
- Kafka Scheme = "kafka"
- TLS Scheme = "tls"
- UDP Scheme = "udp"
+ SchemeHTTP = "http"
)
type UpstreamType string
diff --git a/internal/adc/cache/memdb.go b/internal/adc/cache/memdb.go
index 966899d9..50f2a9f2 100644
--- a/internal/adc/cache/memdb.go
+++ b/internal/adc/cache/memdb.go
@@ -81,23 +81,23 @@ func (c *dbCache) Delete(obj any) error {
func (c *dbCache) InsertRoute(r *types.Route) error {
route := r.DeepCopy()
- return c.insert("route", route)
+ return c.insert(types.TypeRoute, route)
}
func (c *dbCache) InsertSSL(ssl *types.SSL) error {
- return c.insert("ssl", ssl.DeepCopy())
+ return c.insert(types.TypeSSL, ssl.DeepCopy())
}
func (c *dbCache) InsertService(u *types.Service) error {
- return c.insert("service", u.DeepCopy())
+ return c.insert(types.TypeService, u.DeepCopy())
}
func (c *dbCache) InsertConsumer(consumer *types.Consumer) error {
- return c.insert("consumer", consumer.DeepCopy())
+ return c.insert(types.TypeConsumer, consumer.DeepCopy())
}
func (c *dbCache) InsertGlobalRule(globalRule *types.GlobalRuleItem) error {
- return c.insert("global_rule", globalRule.DeepCopy())
+ return c.insert(types.TypeGlobalRule, globalRule.DeepCopy())
}
func (c *dbCache) insert(table string, obj any) error {
@@ -111,7 +111,7 @@ func (c *dbCache) insert(table string, obj any) error {
}
func (c *dbCache) GetRoute(id string) (*types.Route, error) {
- obj, err := c.get("route", id)
+ obj, err := c.get(types.TypeRoute, id)
if err != nil {
return nil, err
}
@@ -119,7 +119,7 @@ func (c *dbCache) GetRoute(id string) (*types.Route, error)
{
}
func (c *dbCache) GetSSL(id string) (*types.SSL, error) {
- obj, err := c.get("ssl", id)
+ obj, err := c.get(types.TypeSSL, id)
if err != nil {
return nil, err
}
@@ -127,7 +127,7 @@ func (c *dbCache) GetSSL(id string) (*types.SSL, error) {
}
func (c *dbCache) GetService(id string) (*types.Service, error) {
- obj, err := c.get("service", id)
+ obj, err := c.get(types.TypeService, id)
if err != nil {
return nil, err
}
@@ -135,7 +135,7 @@ func (c *dbCache) GetService(id string) (*types.Service,
error) {
}
func (c *dbCache) GetConsumer(username string) (*types.Consumer, error) {
- obj, err := c.get("consumer", username)
+ obj, err := c.get(types.TypeConsumer, username)
if err != nil {
return nil, err
}
@@ -143,7 +143,7 @@ func (c *dbCache) GetConsumer(username string)
(*types.Consumer, error) {
}
func (c *dbCache) GetGlobalRule(id string) (*types.GlobalRuleItem, error) {
- obj, err := c.get("global_rule", id)
+ obj, err := c.get(types.TypeGlobalRule, id)
if err != nil {
return nil, err
}
@@ -175,7 +175,7 @@ func (c *dbCache) get(table, id string) (any, error) {
}
func (c *dbCache) ListRoutes(opts ...ListOption) ([]*types.Route, error) {
- raws, err := c.list("route", opts...)
+ raws, err := c.list(types.TypeRoute, opts...)
if err != nil {
return nil, err
}
@@ -187,7 +187,7 @@ func (c *dbCache) ListRoutes(opts ...ListOption)
([]*types.Route, error) {
}
func (c *dbCache) ListSSL(opts ...ListOption) ([]*types.SSL, error) {
- raws, err := c.list("ssl", opts...)
+ raws, err := c.list(types.TypeSSL, opts...)
if err != nil {
return nil, err
}
@@ -199,7 +199,7 @@ func (c *dbCache) ListSSL(opts ...ListOption)
([]*types.SSL, error) {
}
func (c *dbCache) ListServices(opts ...ListOption) ([]*types.Service, error) {
- raws, err := c.list("service", opts...)
+ raws, err := c.list(types.TypeService, opts...)
if err != nil {
return nil, err
}
@@ -211,7 +211,7 @@ func (c *dbCache) ListServices(opts ...ListOption)
([]*types.Service, error) {
}
func (c *dbCache) ListConsumers(opts ...ListOption) ([]*types.Consumer, error)
{
- raws, err := c.list("consumer", opts...)
+ raws, err := c.list(types.TypeConsumer, opts...)
if err != nil {
return nil, err
}
@@ -223,7 +223,7 @@ func (c *dbCache) ListConsumers(opts ...ListOption)
([]*types.Consumer, error) {
}
func (c *dbCache) ListGlobalRules(opts ...ListOption)
([]*types.GlobalRuleItem, error) {
- raws, err := c.list("global_rule", opts...)
+ raws, err := c.list(types.TypeGlobalRule, opts...)
if err != nil {
return nil, err
}
@@ -257,23 +257,23 @@ func (c *dbCache) list(table string, opts ...ListOption)
([]any, error) {
}
func (c *dbCache) DeleteRoute(r *types.Route) error {
- return c.delete("route", r)
+ return c.delete(types.TypeRoute, r)
}
func (c *dbCache) DeleteSSL(ssl *types.SSL) error {
- return c.delete("ssl", ssl)
+ return c.delete(types.TypeSSL, ssl)
}
func (c *dbCache) DeleteService(u *types.Service) error {
- return c.delete("service", u)
+ return c.delete(types.TypeService, u)
}
func (c *dbCache) DeleteConsumer(consumer *types.Consumer) error {
- return c.delete("consumer", consumer)
+ return c.delete(types.TypeConsumer, consumer)
}
func (c *dbCache) DeleteGlobalRule(globalRule *types.GlobalRuleItem) error {
- return c.delete("global_rule", globalRule)
+ return c.delete(types.TypeGlobalRule, globalRule)
}
func (c *dbCache) delete(table string, obj any) error {
diff --git a/internal/adc/client/client.go b/internal/adc/client/client.go
index 3b99bd34..d918f8ba 100644
--- a/internal/adc/client/client.go
+++ b/internal/adc/client/client.go
@@ -233,7 +233,7 @@ func (c *Client) sync(ctx context.Context, task Task) error
{
pkgmetrics.RecordFileIODuration("prepare_sync_file", "failure",
time.Since(fileIOStart).Seconds())
return err
}
- pkgmetrics.RecordFileIODuration("prepare_sync_file", "success",
time.Since(fileIOStart).Seconds())
+ pkgmetrics.RecordFileIODuration("prepare_sync_file",
adctypes.StatusSuccess, time.Since(fileIOStart).Seconds())
defer cleanup()
args := BuildADCExecuteArgs(syncFilePath, task.Labels,
task.ResourceTypes)
@@ -249,7 +249,7 @@ func (c *Client) sync(ctx context.Context, task Task) error
{
err := c.executor.Execute(ctx, c.BackendMode, config, args)
duration := time.Since(startTime).Seconds()
- status := "success"
+ status := adctypes.StatusSuccess
if err != nil {
status = "failure"
log.Errorw("failed to execute adc command",
zap.Error(err), zap.Any("config", config))
diff --git a/internal/adc/translator/apisixroute.go
b/internal/adc/translator/apisixroute.go
index e5aa70c9..76888dd4 100644
--- a/internal/adc/translator/apisixroute.go
+++ b/internal/adc/translator/apisixroute.go
@@ -37,6 +37,7 @@ import (
apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
"github.com/apache/apisix-ingress-controller/internal/controller/label"
"github.com/apache/apisix-ingress-controller/internal/provider"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/internal/utils"
"github.com/apache/apisix-ingress-controller/pkg/id"
pkgutils "github.com/apache/apisix-ingress-controller/pkg/utils"
@@ -405,7 +406,7 @@ func (t *Translator)
translateApisixRouteBackendResolveGranularityEndpoint(tctx
backendRef := gatewayv1.BackendRef{
BackendObjectReference: gatewayv1.BackendObjectReference{
Group:
(*gatewayv1.Group)(&apiv2.GroupVersion.Group),
- Kind: (*gatewayv1.Kind)(ptr.To("Service")),
+ Kind:
(*gatewayv1.Kind)(ptr.To(internaltypes.KindService)),
Name: gatewayv1.ObjectName(backend.ServiceName),
Namespace: (*gatewayv1.Namespace)(&arNN.Namespace),
Port: (*gatewayv1.PortNumber)(&port),
diff --git a/internal/adc/translator/gateway.go
b/internal/adc/translator/gateway.go
index acfdf80b..43fc765f 100644
--- a/internal/adc/translator/gateway.go
+++ b/internal/adc/translator/gateway.go
@@ -36,6 +36,7 @@ import (
"github.com/apache/apisix-ingress-controller/internal/controller/label"
"github.com/apache/apisix-ingress-controller/internal/id"
"github.com/apache/apisix-ingress-controller/internal/provider"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/internal/utils"
)
@@ -86,7 +87,7 @@ func (t *Translator) translateSecret(tctx
*provider.TranslateContext, listener g
if ref.Namespace != nil {
ns = string(*ref.Namespace)
}
- if listener.TLS.CertificateRefs[0].Kind != nil &&
*listener.TLS.CertificateRefs[0].Kind == "Secret" {
+ if listener.TLS.CertificateRefs[0].Kind != nil &&
*listener.TLS.CertificateRefs[0].Kind == internaltypes.KindSecret {
sslObj := &adctypes.SSL{
Snis: []string{},
}
diff --git a/internal/adc/translator/httproute.go
b/internal/adc/translator/httproute.go
index a3e2ad95..b33de0e4 100644
--- a/internal/adc/translator/httproute.go
+++ b/internal/adc/translator/httproute.go
@@ -37,6 +37,7 @@ import (
"github.com/apache/apisix-ingress-controller/internal/controller/label"
"github.com/apache/apisix-ingress-controller/internal/id"
"github.com/apache/apisix-ingress-controller/internal/provider"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
)
func (t *Translator) fillPluginsFromHTTPRouteFilters(
@@ -70,7 +71,7 @@ func (t *Translator) fillPluginFromExtensionRef(plugins
adctypes.Plugins, namesp
if extensionRef == nil {
return
}
- if extensionRef.Kind == "PluginConfig" {
+ if extensionRef.Kind == internaltypes.KindPluginConfig {
pluginconfig := tctx.PluginConfigs[types.NamespacedName{
Namespace: namespace,
Name: string(extensionRef.Name),
@@ -300,7 +301,7 @@ func (t *Translator) fillHTTPRoutePoliciesForHTTPRoute(tctx
*provider.TranslateC
var policies []v1alpha1.HTTPRoutePolicy
for _, policy := range tctx.HTTPRoutePolicies {
for _, ref := range policy.Spec.TargetRefs {
- if string(ref.Kind) == "HTTPRoute" && (ref.SectionName
== nil || *ref.SectionName == "" || ptr.Equal(ref.SectionName, rule.Name)) {
+ if string(ref.Kind) == internaltypes.KindHTTPRoute &&
(ref.SectionName == nil || *ref.SectionName == "" || ptr.Equal(ref.SectionName,
rule.Name)) {
policies = append(policies, policy)
break
}
@@ -376,7 +377,7 @@ func (t *Translator) TranslateBackendRefWithFilter(tctx
*provider.TranslateConte
}
func (t *Translator) translateBackendRef(tctx *provider.TranslateContext, ref
gatewayv1.BackendRef, endpointFilter func(*discoveryv1.Endpoint) bool)
(adctypes.UpstreamNodes, error) {
- if ref.Kind != nil && *ref.Kind != "Service" {
+ if ref.Kind != nil && *ref.Kind != internaltypes.KindService {
return adctypes.UpstreamNodes{}, fmt.Errorf("kind %s is not
supported", *ref.Kind)
}
@@ -549,7 +550,7 @@ func (t *Translator) TranslateHTTPRoute(tctx
*provider.TranslateContext, httpRou
port int32
)
if backend.Kind == nil {
- kind = "Service"
+ kind = internaltypes.KindService
} else {
kind = string(*backend.Kind)
}
diff --git a/internal/adc/translator/ingress.go
b/internal/adc/translator/ingress.go
index 04aa7538..f17b159f 100644
--- a/internal/adc/translator/ingress.go
+++ b/internal/adc/translator/ingress.go
@@ -30,6 +30,7 @@ import (
"github.com/apache/apisix-ingress-controller/internal/controller/label"
"github.com/apache/apisix-ingress-controller/internal/id"
"github.com/apache/apisix-ingress-controller/internal/provider"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
)
func (t *Translator) translateIngressTLS(ingressTLS *networkingv1.IngressTLS,
secret *corev1.Secret, labels map[string]string) (*adctypes.SSL, error) {
@@ -123,7 +124,7 @@ func (t *Translator) TranslateIngress(tctx
*provider.TranslateContext, obj *netw
// get the EndpointSlice of the backend service
backendService := path.Backend.Service
if backendService != nil {
- backendRef := convertBackendRef(obj.Namespace,
backendService.Name, "Service")
+ backendRef := convertBackendRef(obj.Namespace,
backendService.Name, internaltypes.KindService)
t.AttachBackendTrafficPolicyToUpstream(backendRef, tctx.BackendTrafficPolicies,
upstream)
}
diff --git a/internal/controller/apisixroute_controller.go
b/internal/controller/apisixroute_controller.go
index 8fed3181..dd57202b 100644
--- a/internal/controller/apisixroute_controller.go
+++ b/internal/controller/apisixroute_controller.go
@@ -427,7 +427,7 @@ func (r *ApisixRouteReconciler) validateHTTPBackend(tctx
*provider.TranslateCont
return nil
}
- if backend.ResolveGranularity == "service" && service.Spec.ClusterIP ==
"" {
+ if backend.ResolveGranularity == apiv2.ResolveGranularityService &&
service.Spec.ClusterIP == "" {
r.Log.Error(errors.New("service has no ClusterIP"), "Service",
serviceNN, "ResolveGranularity", backend.ResolveGranularity)
return nil
}
diff --git a/internal/controller/consumer_controller.go
b/internal/controller/consumer_controller.go
index 20907a75..6ebe8c96 100644
--- a/internal/controller/consumer_controller.go
+++ b/internal/controller/consumer_controller.go
@@ -42,6 +42,7 @@ import (
"github.com/apache/apisix-ingress-controller/internal/controller/status"
"github.com/apache/apisix-ingress-controller/internal/manager/readiness"
"github.com/apache/apisix-ingress-controller/internal/provider"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/internal/utils"
)
@@ -193,7 +194,7 @@ func (r *ConsumerReconciler) Reconcile(ctx context.Context,
req ctrl.Request) (c
consumer.Name = req.Name
consumer.TypeMeta = metav1.TypeMeta{
- Kind: "Consumer",
+ Kind: internaltypes.KindConsumer,
APIVersion: v1alpha1.GroupVersion.String(),
}
diff --git a/internal/controller/gateway_controller.go
b/internal/controller/gateway_controller.go
index 2ed7bf46..76648a4a 100644
--- a/internal/controller/gateway_controller.go
+++ b/internal/controller/gateway_controller.go
@@ -41,6 +41,7 @@ import (
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/controller/status"
"github.com/apache/apisix-ingress-controller/internal/provider"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/internal/utils"
)
@@ -316,7 +317,7 @@ func (r *GatewayReconciler) listGatewaysForHTTPRoute(ctx
context.Context, obj cl
if parentRef.Group != nil && *parentRef.Group !=
gatewayv1.GroupName {
continue
}
- if parentRef.Kind != nil && *parentRef.Kind != "Gateway" {
+ if parentRef.Kind != nil && *parentRef.Kind !=
internaltypes.KindGateway {
continue
}
if parentRef.Namespace != nil {
diff --git a/internal/controller/httproute_controller.go
b/internal/controller/httproute_controller.go
index b6f39287..6fe87881 100644
--- a/internal/controller/httproute_controller.go
+++ b/internal/controller/httproute_controller.go
@@ -397,7 +397,7 @@ func (r *HTTPRouteReconciler)
listHTTPRouteByHTTPRoutePolicy(ctx context.Context
var keys = make(map[k8stypes.NamespacedName]struct{})
for _, ref := range httpRoutePolicy.Spec.TargetRefs {
- if ref.Kind != "HTTPRoute" {
+ if ref.Kind != types.KindHTTPRoute {
continue
}
key := k8stypes.NamespacedName{
@@ -456,7 +456,7 @@ func (r *HTTPRouteReconciler)
processHTTPRouteBackendRefs(tctx *provider.Transla
targetNN.Namespace = string(*backend.Namespace)
}
- if backend.Kind != nil && *backend.Kind != "Service" {
+ if backend.Kind != nil && *backend.Kind != types.KindService {
terr = types.NewInvalidKindError(*backend.Kind)
continue
}
@@ -544,7 +544,7 @@ func (r *HTTPRouteReconciler) processHTTPRoute(tctx
*provider.TranslateContext,
if filter.Type != gatewayv1.HTTPRouteFilterExtensionRef
|| filter.ExtensionRef == nil {
continue
}
- if filter.ExtensionRef.Kind == "PluginConfig" {
+ if filter.ExtensionRef.Kind == types.KindPluginConfig {
pluginconfig := new(v1alpha1.PluginConfig)
if err := r.Get(context.Background(),
client.ObjectKey{
Namespace: httpRoute.GetNamespace(),
@@ -560,7 +560,7 @@ func (r *HTTPRouteReconciler) processHTTPRoute(tctx
*provider.TranslateContext,
}
}
for _, backend := range rule.BackendRefs {
- if backend.Kind != nil && *backend.Kind != "Service" {
+ if backend.Kind != nil && *backend.Kind !=
types.KindService {
terror =
types.NewInvalidKindError(*backend.Kind)
continue
}
diff --git a/internal/controller/httproutepolicy.go
b/internal/controller/httproutepolicy.go
index 260b09e5..11484dbd 100644
--- a/internal/controller/httproutepolicy.go
+++ b/internal/controller/httproutepolicy.go
@@ -34,6 +34,7 @@ import (
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/controller/status"
"github.com/apache/apisix-ingress-controller/internal/provider"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/internal/utils"
)
@@ -41,7 +42,7 @@ func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx
*provider.TranslateC
// list HTTPRoutePolicies, which sectionName is not specified
var (
list v1alpha1.HTTPRoutePolicyList
- key = indexer.GenIndexKeyWithGK(gatewayv1.GroupName,
"HTTPRoute", httpRoute.GetNamespace(), httpRoute.GetName())
+ key = indexer.GenIndexKeyWithGK(gatewayv1.GroupName,
internaltypes.KindHTTPRoute, httpRoute.GetNamespace(), httpRoute.GetName())
)
if err := r.List(context.Background(), &list,
client.MatchingFields{indexer.PolicyTargetRefs: key}); err != nil {
return err
@@ -63,7 +64,7 @@ func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx
*provider.TranslateC
var conflicts = make(map[types.NamespacedName]v1alpha1.HTTPRoutePolicy)
for _, rule := range httpRoute.Spec.Rules {
- var policies = findPoliciesWhichTargetRefTheRule(rule.Name,
"HTTPRoute", list)
+ var policies = findPoliciesWhichTargetRefTheRule(rule.Name,
internaltypes.KindHTTPRoute, list)
if conflict := checkPoliciesConflict(policies); conflict {
for _, policy := range policies {
namespacedName :=
types.NamespacedName{Namespace: policy.GetNamespace(), Name: policy.GetName()}
@@ -105,7 +106,7 @@ func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx
*provider.TranslateC
func (r *HTTPRouteReconciler) updateHTTPRoutePolicyStatusOnDeleting(ctx
context.Context, nn types.NamespacedName) error {
var (
list v1alpha1.HTTPRoutePolicyList
- key = indexer.GenIndexKeyWithGK(gatewayv1.GroupName,
"HTTPRoute", nn.Namespace, nn.Name)
+ key = indexer.GenIndexKeyWithGK(gatewayv1.GroupName,
internaltypes.KindHTTPRoute, nn.Namespace, nn.Name)
)
if err := r.List(ctx, &list,
client.MatchingFields{indexer.PolicyTargetRefs: key}); err != nil {
return err
@@ -137,7 +138,7 @@ func (r *HTTPRouteReconciler)
updateHTTPRoutePolicyStatusOnDeleting(ctx context.
func (r *IngressReconciler) processHTTPRoutePolicies(tctx
*provider.TranslateContext, ingress *networkingv1.Ingress) error {
var (
list v1alpha1.HTTPRoutePolicyList
- key = indexer.GenIndexKeyWithGK(networkingv1.GroupName,
"Ingress", ingress.GetNamespace(), ingress.GetName())
+ key = indexer.GenIndexKeyWithGK(networkingv1.GroupName,
internaltypes.KindIngress, ingress.GetNamespace(), ingress.GetName())
)
if err := r.List(context.Background(), &list,
client.MatchingFields{indexer.PolicyTargetRefs: key}); err != nil {
return err
@@ -179,7 +180,7 @@ func (r *IngressReconciler) processHTTPRoutePolicies(tctx
*provider.TranslateCon
func (r *IngressReconciler) updateHTTPRoutePolicyStatusOnDeleting(ctx
context.Context, nn types.NamespacedName) error {
var (
list v1alpha1.HTTPRoutePolicyList
- key = indexer.GenIndexKeyWithGK(networkingv1.GroupName,
"Ingress", nn.Namespace, nn.Name)
+ key = indexer.GenIndexKeyWithGK(networkingv1.GroupName,
internaltypes.KindIngress, nn.Namespace, nn.Name)
)
if err := r.List(ctx, &list,
client.MatchingFields{indexer.PolicyTargetRefs: key}); err != nil {
return err
diff --git a/internal/controller/indexer/indexer.go
b/internal/controller/indexer/indexer.go
index e621ac10..e89a3934 100644
--- a/internal/controller/indexer/indexer.go
+++ b/internal/controller/indexer/indexer.go
@@ -31,6 +31,7 @@ import (
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
)
const (
@@ -431,7 +432,7 @@ func GatewaySecretIndexFunc(rawObj client.Object) (keys
[]string) {
continue
}
for _, ref := range listener.TLS.CertificateRefs {
- if ref.Kind == nil || *ref.Kind != "Secret" {
+ if ref.Kind == nil || *ref.Kind !=
internaltypes.KindSecret {
continue
}
namespace := gateway.GetNamespace()
@@ -486,7 +487,7 @@ func HTTPRouteServiceIndexFunc(rawObj client.Object)
[]string {
for _, rule := range hr.Spec.Rules {
for _, backend := range rule.BackendRefs {
namespace := hr.GetNamespace()
- if backend.Kind != nil && *backend.Kind != "Service" {
+ if backend.Kind != nil && *backend.Kind !=
internaltypes.KindService {
continue
}
if backend.Namespace != nil {
@@ -620,7 +621,7 @@ func HTTPRouteExtensionIndexFunc(rawObj client.Object)
[]string {
if filter.Type != gatewayv1.HTTPRouteFilterExtensionRef
|| filter.ExtensionRef == nil {
continue
}
- if filter.ExtensionRef.Kind == "PluginConfig" {
+ if filter.ExtensionRef.Kind ==
internaltypes.KindPluginConfig {
keys = append(keys,
GenIndexKey(hr.GetNamespace(), string(filter.ExtensionRef.Name)))
}
}
@@ -646,7 +647,7 @@ func GatewayParametersRefIndexFunc(rawObj client.Object)
[]string {
gw := rawObj.(*gatewayv1.Gateway)
if gw.Spec.Infrastructure != nil &&
gw.Spec.Infrastructure.ParametersRef != nil {
// now we only care about kind: GatewayProxy
- if gw.Spec.Infrastructure.ParametersRef.Kind == "GatewayProxy" {
+ if gw.Spec.Infrastructure.ParametersRef.Kind ==
internaltypes.KindGatewayProxy {
name := gw.Spec.Infrastructure.ParametersRef.Name
return []string{GenIndexKey(gw.GetNamespace(), name)}
}
@@ -676,7 +677,7 @@ func IngressClassParametersRefIndexFunc(rawObj
client.Object) []string {
if ingressClass.Spec.Parameters != nil &&
ingressClass.Spec.Parameters.APIGroup != nil &&
*ingressClass.Spec.Parameters.APIGroup ==
v1alpha1.GroupVersion.Group &&
- ingressClass.Spec.Parameters.Kind == "GatewayProxy" {
+ ingressClass.Spec.Parameters.Kind ==
internaltypes.KindGatewayProxy {
ns := ingressClass.GetNamespace()
if ingressClass.Spec.Parameters.Namespace != nil {
ns = *ingressClass.Spec.Parameters.Namespace
diff --git a/internal/controller/ingress_controller.go
b/internal/controller/ingress_controller.go
index c86b40c2..8ef3d735 100644
--- a/internal/controller/ingress_controller.go
+++ b/internal/controller/ingress_controller.go
@@ -47,6 +47,7 @@ import (
"github.com/apache/apisix-ingress-controller/internal/controller/status"
"github.com/apache/apisix-ingress-controller/internal/manager/readiness"
"github.com/apache/apisix-ingress-controller/internal/provider"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/internal/utils"
)
@@ -427,7 +428,7 @@ func (r *IngressReconciler)
listIngressesByHTTPRoutePolicy(ctx context.Context,
var keys = make(map[types.NamespacedName]struct{})
for _, ref := range httpRoutePolicy.Spec.TargetRefs {
- if ref.Kind != "Ingress" {
+ if ref.Kind != internaltypes.KindIngress {
continue
}
key := types.NamespacedName{
diff --git a/internal/controller/policies.go b/internal/controller/policies.go
index c272c71e..f117cdea 100644
--- a/internal/controller/policies.go
+++ b/internal/controller/policies.go
@@ -37,6 +37,7 @@ import (
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/controller/status"
"github.com/apache/apisix-ingress-controller/internal/provider"
+ internaltypes
"github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/internal/utils"
)
@@ -137,7 +138,7 @@ func ProcessBackendTrafficPolicy(
sectionName := targetRef.SectionName
key := PolicyTargetKey{
NsName: types.NamespacedName{Namespace:
p.GetNamespace(), Name: string(targetRef.Name)},
- GroupKind: schema.GroupKind{Group: "", Kind:
"Service"},
+ GroupKind: schema.GroupKind{Group: "", Kind:
internaltypes.KindService},
}
condition := NewPolicyCondition(policy.Generation,
true, "Policy has been accepted")
if sectionName != nil &&
!servicePortNameMap[fmt.Sprintf("%s/%s/%s", policy.Namespace,
string(targetRef.Name), *sectionName)] {
diff --git a/internal/manager/controllers.go b/internal/manager/controllers.go
index 6c878b21..79886225 100644
--- a/internal/manager/controllers.go
+++ b/internal/manager/controllers.go
@@ -101,20 +101,20 @@ func setupControllers(ctx context.Context, mgr
manager.Manager, pro provider.Pro
&controller.GatewayClassReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("GatewayClass"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindGatewayClass),
Updater: updater,
},
&controller.GatewayReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("Gateway"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindGateway),
Provider: pro,
Updater: updater,
},
&controller.HTTPRouteReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("HTTPRoute"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindHTTPRoute),
Provider: pro,
Updater: updater,
Readier: readier,
@@ -122,7 +122,7 @@ func setupControllers(ctx context.Context, mgr
manager.Manager, pro provider.Pro
&controller.IngressReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("Ingress"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindIngress),
Provider: pro,
Updater: updater,
Readier: readier,
@@ -130,7 +130,7 @@ func setupControllers(ctx context.Context, mgr
manager.Manager, pro provider.Pro
&controller.ConsumerReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("Consumer"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindConsumer),
Provider: pro,
Updater: updater,
Readier: readier,
@@ -138,13 +138,13 @@ func setupControllers(ctx context.Context, mgr
manager.Manager, pro provider.Pro
&controller.IngressClassReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("IngressClass"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindIngressClass),
Provider: pro,
},
&controller.ApisixGlobalRuleReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixGlobalRule"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindApisixGlobalRule),
Provider: pro,
Updater: updater,
Readier: readier,
@@ -152,7 +152,7 @@ func setupControllers(ctx context.Context, mgr
manager.Manager, pro provider.Pro
&controller.ApisixRouteReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixRoute"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindApisixRoute),
Provider: pro,
Updater: updater,
Readier: readier,
@@ -160,7 +160,7 @@ func setupControllers(ctx context.Context, mgr
manager.Manager, pro provider.Pro
&controller.ApisixConsumerReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixConsumer"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindApisixConsumer),
Provider: pro,
Updater: updater,
Readier: readier,
@@ -168,13 +168,13 @@ func setupControllers(ctx context.Context, mgr
manager.Manager, pro provider.Pro
&controller.ApisixPluginConfigReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixPluginConfig"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindApisixPluginConfig),
Updater: updater,
},
&controller.ApisixTlsReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixTls"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindApisixTls),
Provider: pro,
Updater: updater,
Readier: readier,
@@ -182,13 +182,13 @@ func setupControllers(ctx context.Context, mgr
manager.Manager, pro provider.Pro
&controller.ApisixUpstreamReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixUpstream"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindApisixUpstream),
Updater: updater,
},
&controller.GatewayProxyController{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
- Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName("GatewayProxy"),
+ Log:
ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindGatewayProxy),
Provider: pro,
},
}, nil
diff --git a/internal/provider/apisix/provider.go
b/internal/provider/apisix/provider.go
index ab29dbdf..571c5bcc 100644
--- a/internal/provider/apisix/provider.go
+++ b/internal/provider/apisix/provider.go
@@ -102,31 +102,31 @@ func (d *apisixProvider) Update(ctx context.Context, tctx
*provider.TranslateCon
switch t := obj.(type) {
case *gatewayv1.HTTPRoute:
result, err = d.translator.TranslateHTTPRoute(tctx,
t.DeepCopy())
- resourceTypes = append(resourceTypes, "service")
+ resourceTypes = append(resourceTypes, adctypes.TypeService)
case *gatewayv1.Gateway:
result, err = d.translator.TranslateGateway(tctx, t.DeepCopy())
- resourceTypes = append(resourceTypes, "global_rule", "ssl",
"plugin_metadata")
+ resourceTypes = append(resourceTypes, adctypes.TypeGlobalRule,
adctypes.TypeSSL, adctypes.TypePluginMetadata)
case *networkingv1.Ingress:
result, err = d.translator.TranslateIngress(tctx, t.DeepCopy())
- resourceTypes = append(resourceTypes, "service", "ssl")
+ resourceTypes = append(resourceTypes, adctypes.TypeService,
adctypes.TypeSSL)
case *v1alpha1.Consumer:
result, err = d.translator.TranslateConsumerV1alpha1(tctx,
t.DeepCopy())
- resourceTypes = append(resourceTypes, "consumer")
+ resourceTypes = append(resourceTypes, adctypes.TypeConsumer)
case *networkingv1.IngressClass:
result, err = d.translator.TranslateIngressClass(tctx,
t.DeepCopy())
- resourceTypes = append(resourceTypes, "global_rule",
"plugin_metadata")
+ resourceTypes = append(resourceTypes, adctypes.TypeGlobalRule,
adctypes.TypePluginMetadata)
case *apiv2.ApisixRoute:
result, err = d.translator.TranslateApisixRoute(tctx,
t.DeepCopy())
- resourceTypes = append(resourceTypes, "service")
+ resourceTypes = append(resourceTypes, adctypes.TypeService)
case *apiv2.ApisixGlobalRule:
result, err = d.translator.TranslateApisixGlobalRule(tctx,
t.DeepCopy())
- resourceTypes = append(resourceTypes, "global_rule")
+ resourceTypes = append(resourceTypes, adctypes.TypeGlobalRule)
case *apiv2.ApisixTls:
result, err = d.translator.TranslateApisixTls(tctx,
t.DeepCopy())
- resourceTypes = append(resourceTypes, "ssl")
+ resourceTypes = append(resourceTypes, adctypes.TypeSSL)
case *apiv2.ApisixConsumer:
result, err = d.translator.TranslateApisixConsumer(tctx,
t.DeepCopy())
- resourceTypes = append(resourceTypes, "consumer")
+ resourceTypes = append(resourceTypes, adctypes.TypeConsumer)
case *v1alpha1.GatewayProxy:
return d.updateConfigForGatewayProxy(tctx, t)
}
@@ -174,26 +174,26 @@ func (d *apisixProvider) Delete(ctx context.Context, obj
client.Object) error {
var labels map[string]string
switch obj.(type) {
case *gatewayv1.HTTPRoute, *apiv2.ApisixRoute:
- resourceTypes = append(resourceTypes, "service")
+ resourceTypes = append(resourceTypes, adctypes.TypeService)
labels = label.GenLabel(obj)
case *gatewayv1.Gateway:
// delete all resources
case *networkingv1.Ingress:
- resourceTypes = append(resourceTypes, "service", "ssl")
+ resourceTypes = append(resourceTypes, adctypes.TypeService,
adctypes.TypeSSL)
labels = label.GenLabel(obj)
case *v1alpha1.Consumer:
- resourceTypes = append(resourceTypes, "consumer")
+ resourceTypes = append(resourceTypes, adctypes.TypeConsumer)
labels = label.GenLabel(obj)
case *networkingv1.IngressClass:
// delete all resources
case *apiv2.ApisixGlobalRule:
- resourceTypes = append(resourceTypes, "global_rule")
+ resourceTypes = append(resourceTypes, adctypes.TypeGlobalRule)
labels = label.GenLabel(obj)
case *apiv2.ApisixTls:
- resourceTypes = append(resourceTypes, "ssl")
+ resourceTypes = append(resourceTypes, adctypes.TypeSSL)
labels = label.GenLabel(obj)
case *apiv2.ApisixConsumer:
- resourceTypes = append(resourceTypes, "consumer")
+ resourceTypes = append(resourceTypes, adctypes.TypeConsumer)
labels = label.GenLabel(obj)
}
nnk := utils.NamespacedNameKind(obj)
diff --git a/test/conformance/suite_test.go b/test/conformance/suite_test.go
index 75b45cad..e7ab91b1 100644
--- a/test/conformance/suite_test.go
+++ b/test/conformance/suite_test.go
@@ -31,6 +31,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+ "github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/test/e2e/framework"
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
)
@@ -225,7 +226,7 @@ func patchGatewaysForConformanceTest(ctx context.Context,
k8sClient client.Clien
gateway.Spec.Infrastructure =
&gatewayv1.GatewayInfrastructure{
ParametersRef:
&gatewayv1.LocalParametersReference{
Group: "apisix.apache.org",
- Kind: "GatewayProxy",
+ Kind: types.KindGatewayProxy,
Name: "conformance-gateway-proxy",
},
}
diff --git a/test/e2e/crds/v1alpha1/gatewayproxy.go
b/test/e2e/crds/v1alpha1/gatewayproxy.go
index 90275f2c..a2d5c233 100644
--- a/test/e2e/crds/v1alpha1/gatewayproxy.go
+++ b/test/e2e/crds/v1alpha1/gatewayproxy.go
@@ -30,6 +30,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/utils/ptr"
+ apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
"github.com/apache/apisix-ingress-controller/test/e2e/framework"
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
)
@@ -167,7 +168,7 @@ spec:
Expect(err).NotTo(HaveOccurred(), "forward pod:
%s", pod.Name)
err =
wait.PollUntilContextTimeout(context.Background(), time.Second, 30*time.Second,
true, func(ctx context.Context) (done bool, err error) {
- resp := scaffold.NewClient("http",
tunnel.Endpoint()).
+ resp :=
scaffold.NewClient(apiv2.SchemeHTTP, tunnel.Endpoint()).
GET("/get").WithHost("httpbin.org").Expect().Raw()
return resp.StatusCode == http.StatusOK
&& resp.Header.Get("X-Pod-Hostname") == pod.GetName(), nil
})
diff --git a/test/e2e/gatewayapi/controller.go
b/test/e2e/gatewayapi/controller.go
index 578e8598..817e9e17 100644
--- a/test/e2e/gatewayapi/controller.go
+++ b/test/e2e/gatewayapi/controller.go
@@ -25,6 +25,7 @@ import (
. "github.com/onsi/gomega"
"github.com/stretchr/testify/assert"
+ "github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
)
@@ -111,7 +112,7 @@ spec:
time.Sleep(10 * time.Second)
By("check GatewayClass condition")
- gcyaml, err := s.GetResourceYamlFromNamespace("GatewayClass",
gatewayClassName, s.Namespace())
+ gcyaml, err :=
s.GetResourceYamlFromNamespace(types.KindGatewayClass, gatewayClassName,
s.Namespace())
Expect(err).NotTo(HaveOccurred(), "getting GatewayClass yaml")
Expect(gcyaml).To(ContainSubstring(`status: "True"`), "checking
GatewayClass condition status")
Expect(gcyaml).To(ContainSubstring("message: the gatewayclass
has been accepted by the apisix-ingress-controller"), "checking GatewayClass
condition message")
@@ -122,7 +123,7 @@ spec:
time.Sleep(10 * time.Second)
By("check Gateway condition")
- gwyaml, err := s.GetResourceYamlFromNamespace("Gateway",
gatewayName, gatewayName)
+ gwyaml, err :=
s.GetResourceYamlFromNamespace(types.KindGateway, gatewayName, gatewayName)
Expect(err).NotTo(HaveOccurred(), "getting Gateway yaml")
Expect(gwyaml).To(ContainSubstring(`status: "True"`), "checking
Gateway condition status")
Expect(gwyaml).To(ContainSubstring("message: the gateway has
been accepted by the apisix-ingress-controller"), "checking Gateway condition
message")
@@ -163,7 +164,7 @@ spec:
beforeEach(s1)
})
It("Apply resource ", func() {
- ResourceApplied(s1, "HTTPRoute", "httpbin",
s1.Namespace(), fmt.Sprintf(route1, s1.Namespace()), 1)
+ ResourceApplied(s1, types.KindHTTPRoute, "httpbin",
s1.Namespace(), fmt.Sprintf(route1, s1.Namespace()), 1)
s1.RetryAssertion(func() int {
routes, _ :=
s1.DefaultDataplaneResource().Route().List(s1.Context)
@@ -210,7 +211,7 @@ spec:
beforeEach(s2)
})
It("Apply resource ", func() {
- ResourceApplied(s2, "HTTPRoute", "httpbin2",
s2.Namespace(), fmt.Sprintf(route2, s2.Namespace(), s2.Namespace()), 1)
+ ResourceApplied(s2, types.KindHTTPRoute, "httpbin2",
s2.Namespace(), fmt.Sprintf(route2, s2.Namespace(), s2.Namespace()), 1)
time.Sleep(5 * time.Second)
routes, err :=
s2.DefaultDataplaneResource().Route().List(s2.Context)
Expect(err).NotTo(HaveOccurred())
diff --git a/test/e2e/gatewayapi/gatewayproxy.go
b/test/e2e/gatewayapi/gatewayproxy.go
index 1cad06ea..99283cac 100644
--- a/test/e2e/gatewayapi/gatewayproxy.go
+++ b/test/e2e/gatewayapi/gatewayproxy.go
@@ -24,6 +24,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
+ "github.com/apache/apisix-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
)
@@ -135,7 +136,7 @@ spec:
time.Sleep(5 * time.Second)
By("Check GatewayClass condition")
- gcYaml, err := s.GetResourceYaml("GatewayClass",
gatewayClassName)
+ gcYaml, err := s.GetResourceYaml(types.KindGatewayClass,
gatewayClassName)
Expect(err).NotTo(HaveOccurred(), "getting GatewayClass yaml")
Expect(gcYaml).To(ContainSubstring(`status: "True"`), "checking
GatewayClass condition status")
Expect(gcYaml).To(ContainSubstring("message: the gatewayclass
has been accepted by the apisix-ingress-controller"), "checking GatewayClass
condition message")
@@ -151,7 +152,7 @@ spec:
time.Sleep(5 * time.Second)
By("check Gateway condition")
- gwyaml, err := s.GetResourceYaml("Gateway", s.Namespace())
+ gwyaml, err := s.GetResourceYaml(types.KindGateway,
s.Namespace())
Expect(err).NotTo(HaveOccurred(), "getting Gateway yaml")
Expect(gwyaml).To(ContainSubstring(`status: "True"`), "checking
Gateway condition status")
Expect(gwyaml).To(ContainSubstring("message: the gateway has
been accepted by the apisix-ingress-controller"), "checking Gateway condition
message")
@@ -160,7 +161,7 @@ spec:
Context("Test Gateway with enabled GatewayProxy plugin", func() {
It("Should apply plugin configuration when enabled", func() {
By("Create HTTPRoute for Gateway with GatewayProxy")
- s.ResourceApplied("HTTPRoute", "test-route",
fmt.Sprintf(httpRouteForTest, s.Namespace()), 1)
+ s.ResourceApplied(types.KindHTTPRoute, "test-route",
fmt.Sprintf(httpRouteForTest, s.Namespace()), 1)
By("Check if the plugin is applied")
s.RequestAssert(&scaffold.RequestAssert{
@@ -178,7 +179,7 @@ spec:
Expect(err).NotTo(HaveOccurred(), "updating
GatewayProxy with disabled plugin")
By("Create HTTPRoute for Gateway with GatewayProxy")
- s.ResourceApplied("HTTPRoute", "test-route",
fmt.Sprintf(httpRouteForTest, s.Namespace()), 1)
+ s.ResourceApplied(types.KindHTTPRoute, "test-route",
fmt.Sprintf(httpRouteForTest, s.Namespace()), 1)
By("Check if the plugin is not applied")
s.RequestAssert(&scaffold.RequestAssert{
@@ -215,7 +216,7 @@ spec:
Expect(err).NotTo(HaveOccurred(), "creating
GatewayProxy with enabled plugin")
By("Create HTTPRoute")
- s.ResourceApplied("HTTPRoute", "test-route",
fmt.Sprintf(httpRouteForTest, s.Namespace()), 1)
+ s.ResourceApplied(types.KindHTTPRoute, "test-route",
fmt.Sprintf(httpRouteForTest, s.Namespace()), 1)
s.RequestAssert(&scaffold.RequestAssert{
Method: "GET",
@@ -286,7 +287,7 @@ spec:
Expect(err).NotTo(HaveOccurred(), "creating
GatewayProxy with valid provider")
s.RetryAssertion(func() string {
- gpYaml, _ := s.GetResourceYaml("GatewayProxy",
s.Namespace())
+ gpYaml, _ :=
s.GetResourceYaml(types.KindGatewayProxy, s.Namespace())
return gpYaml
}).Should(ContainSubstring(`"type":"ControlPlane"`),
"checking GatewayProxy is applied")
})
diff --git a/test/e2e/scaffold/scaffold.go b/test/e2e/scaffold/scaffold.go
index e41aacbb..d96f306b 100644
--- a/test/e2e/scaffold/scaffold.go
+++ b/test/e2e/scaffold/scaffold.go
@@ -35,6 +35,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
"github.com/apache/apisix-ingress-controller/test/e2e/framework"
)
@@ -175,7 +176,7 @@ func (s *Scaffold) DefaultHTTPBackend() (string, []int32) {
// NewAPISIXClient creates the default HTTP client.
func (s *Scaffold) NewAPISIXClient() *httpexpect.Expect {
u := url.URL{
- Scheme: "http",
+ Scheme: apiv2.SchemeHTTP,
Host: s.apisixTunnels.HTTP.Endpoint(),
}
return httpexpect.WithConfig(httpexpect.Config{
@@ -212,7 +213,7 @@ func (s *Scaffold) UpdateNamespace(ns string) {
// NewAPISIXHttpsClient creates the default HTTPS client.
func (s *Scaffold) NewAPISIXHttpsClient(host string) *httpexpect.Expect {
u := url.URL{
- Scheme: "https",
+ Scheme: apiv2.SchemeHTTPS,
Host: s.apisixTunnels.HTTPS.Endpoint(),
}
return httpexpect.WithConfig(httpexpect.Config{
@@ -235,7 +236,7 @@ func (s *Scaffold) NewAPISIXHttpsClient(host string)
*httpexpect.Expect {
// NewAPISIXClientWithTCPProxy creates the HTTP client but with the TCP proxy
of APISIX.
func (s *Scaffold) NewAPISIXClientWithTCPProxy() *httpexpect.Expect {
u := url.URL{
- Scheme: "http",
+ Scheme: apiv2.SchemeHTTP,
Host: s.apisixTunnels.TCP.Endpoint(),
}
return httpexpect.WithConfig(httpexpect.Config{
@@ -341,11 +342,11 @@ func (s *Scaffold) createDataplaneTunnels(
for _, port := range svc.Spec.Ports {
switch port.Name {
- case "http":
+ case apiv2.SchemeHTTP:
httpPort = int(port.Port)
- case "https":
+ case apiv2.SchemeHTTPS:
httpsPort = int(port.Port)
- case "tcp":
+ case apiv2.SchemeTCP:
tcpPort = int(port.Port)
}
}
@@ -392,7 +393,7 @@ func (s *Scaffold) NewAPISIXClientForGateway(identifier
string) (*httpexpect.Exp
}
u := url.URL{
- Scheme: "http",
+ Scheme: apiv2.SchemeHTTP,
Host: resources.Tunnels.HTTP.Endpoint(),
}
return httpexpect.WithConfig(httpexpect.Config{
@@ -417,7 +418,7 @@ func (s *Scaffold)
NewAPISIXHttpsClientForGateway(identifier string, host string
}
u := url.URL{
- Scheme: "https",
+ Scheme: apiv2.SchemeHTTPS,
Host: resources.Tunnels.HTTPS.Endpoint(),
}
return httpexpect.WithConfig(httpexpect.Config{
