Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions api/adc/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ type Route struct {
}

type Timeout struct {
Connect float64 `json:"connect"`
Read float64 `json:"read"`
Send float64 `json:"send"`
Connect *int64 `json:"connect,omitempty"`
Read *int64 `json:"read,omitempty"`
Send *int64 `json:"send,omitempty"`
}

type StreamRoute struct {
Expand Down
8 changes: 3 additions & 5 deletions api/v1alpha1/backendtrafficpolicy_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
)

// +kubebuilder:object:root=true
Expand All @@ -12,8 +10,8 @@ type BackendTrafficPolicy struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec BackendTrafficPolicySpec `json:"spec,omitempty"`
Status gatewayv1alpha2.PolicyStatus `json:"status,omitempty"`
Spec BackendTrafficPolicySpec `json:"spec,omitempty"`
Status PolicyStatus `json:"status,omitempty"`
}

type BackendTrafficPolicySpec struct {
Expand All @@ -27,7 +25,7 @@ type BackendTrafficPolicySpec struct {
// +listMapKey=name
// +kubebuilder:validation:MinItems=1
// +kubebuilder:validation:MaxItems=16
TargetRefs []gatewayv1alpha2.LocalPolicyTargetReferenceWithSectionName `json:"targetRefs"`
TargetRefs []BackendPolicyTargetReferenceWithSectionName `json:"targetRefs"`
// LoadBalancer represents the load balancer configuration for Kubernetes Service.
// The default strategy is round robin.
LoadBalancer *LoadBalancer `json:"loadbalancer,omitempty" yaml:"loadbalancer,omitempty"`
Expand Down
8 changes: 8 additions & 0 deletions api/v1alpha1/policies_type.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package v1alpha1

import gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"

type PolicyStatus gatewayv1alpha2.PolicyStatus

// +kubebuilder:validation:XValidation:rule="self.kind == 'Service' && self.group == \"\""
type BackendPolicyTargetReferenceWithSectionName gatewayv1alpha2.LocalPolicyTargetReferenceWithSectionName
46 changes: 45 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
- kind
- name
type: object
x-kubernetes-validations:
- rule: self.kind == 'Service' && self.group == ""
maxItems: 16
minItems: 1
type: array
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/consumer_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (r *ConsumerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
}

var statusErr error
tctx := provider.NewDefaultTranslateContext()
tctx := provider.NewDefaultTranslateContext(ctx)

if err := r.processSpec(ctx, tctx, consumer); err != nil {
r.Log.Error(err, "failed to process consumer spec", "consumer", consumer)
Expand Down
10 changes: 7 additions & 3 deletions internal/controller/httproute_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
return ctrl.Result{}, nil
}

tctx := provider.NewDefaultTranslateContext()
tctx := provider.NewDefaultTranslateContext(ctx)

if err := r.processHTTPRoute(tctx, hr); err != nil {
acceptStatus.status = false
Expand Down Expand Up @@ -249,7 +249,7 @@ func (r *HTTPRouteReconciler) processHTTPRouteBackendRefs(tctx *provider.Transla
}

var service corev1.Service
if err := r.Get(context.TODO(), client.ObjectKey{
if err := r.Get(tctx, client.ObjectKey{
Namespace: namespace,
Name: name,
}, &service); err != nil {
Expand All @@ -268,9 +268,13 @@ func (r *HTTPRouteReconciler) processHTTPRouteBackendRefs(tctx *provider.Transla
terr = fmt.Errorf("port %d not found in service %s", *backend.Port, name)
continue
}
tctx.Services[client.ObjectKey{
Namespace: namespace,
Name: name,
}] = &service

endpointSliceList := new(discoveryv1.EndpointSliceList)
if err := r.List(context.TODO(), endpointSliceList,
if err := r.List(tctx, endpointSliceList,
client.InNamespace(namespace),
client.MatchingLabels{
discoveryv1.LabelServiceName: name,
Expand Down
31 changes: 31 additions & 0 deletions internal/controller/indexer/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (

"github.com/api7/api7-ingress-controller/api/v1alpha1"
networkingv1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
Expand All @@ -19,6 +21,7 @@ const (
SecretIndexRef = "secretRefs"
IngressClassRef = "ingressClassRef"
ConsumerGatewayRef = "consumerGatewayRef"
PolicyTargetRefs = "targetRefs"
)

func SetupIndexer(mgr ctrl.Manager) error {
Expand Down Expand Up @@ -227,6 +230,18 @@ func IngressSecretIndexFunc(rawObj client.Object) []string {
return secrets
}

func GenIndexKeyWithGK(group, kind, namespace, name string) string {
gvk := schema.GroupKind{
Group: group,
Kind: kind,
}
nsName := types.NamespacedName{
Namespace: namespace,
Name: name,
}
return gvk.String() + "/" + nsName.String()
}

func GenIndexKey(namespace, name string) string {
return client.ObjectKey{
Namespace: namespace,
Expand Down Expand Up @@ -292,3 +307,19 @@ func GatewayParametersRefIndexFunc(rawObj client.Object) []string {
}
return nil
}

func BackendTrafficPolicyIndexFunc(rawObj client.Object) []string {
btp := rawObj.(*v1alpha1.BackendTrafficPolicy)
keys := make([]string, 0, len(btp.Spec.TargetRefs))
for _, ref := range btp.Spec.TargetRefs {
keys = append(keys,
GenIndexKeyWithGK(
v1alpha1.GroupVersion.Group,
string(ref.Kind),
btp.GetNamespace(),
string(ref.Name),
),
)
}
return keys
}
20 changes: 10 additions & 10 deletions internal/controller/ingress_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@ func (r *IngressReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
r.Log.Info("reconciling ingress", "ingress", ingress.Name)

// create a translate context
tctx := provider.NewDefaultTranslateContext()
tctx := provider.NewDefaultTranslateContext(ctx)

// process TLS configuration
if err := r.processTLS(ctx, tctx, ingress); err != nil {
if err := r.processTLS(tctx, ingress); err != nil {
r.Log.Error(err, "failed to process TLS configuration", "ingress", ingress.Name)
return ctrl.Result{}, err
}

// process backend services
if err := r.processBackends(ctx, tctx, ingress); err != nil {
if err := r.processBackends(tctx, ingress); err != nil {
r.Log.Error(err, "failed to process backend services", "ingress", ingress.Name)
return ctrl.Result{}, err
}
Expand Down Expand Up @@ -295,14 +295,14 @@ func (r *IngressReconciler) listIngressesBySecret(ctx context.Context, obj clien
}

// processTLS process the TLS configuration of the ingress
func (r *IngressReconciler) processTLS(ctx context.Context, tctx *provider.TranslateContext, ingress *networkingv1.Ingress) error {
func (r *IngressReconciler) processTLS(tctx *provider.TranslateContext, ingress *networkingv1.Ingress) error {
for _, tls := range ingress.Spec.TLS {
if tls.SecretName == "" {
continue
}

secret := corev1.Secret{}
if err := r.Get(ctx, client.ObjectKey{
if err := r.Get(tctx, client.ObjectKey{
Namespace: ingress.Namespace,
Name: tls.SecretName,
}, &secret); err != nil {
Expand All @@ -323,7 +323,7 @@ func (r *IngressReconciler) processTLS(ctx context.Context, tctx *provider.Trans
}

// processBackends process the backend services of the ingress
func (r *IngressReconciler) processBackends(ctx context.Context, tctx *provider.TranslateContext, ingress *networkingv1.Ingress) error {
func (r *IngressReconciler) processBackends(tctx *provider.TranslateContext, ingress *networkingv1.Ingress) error {
var terr error

// process all the backend services in the rules
Expand All @@ -336,7 +336,7 @@ func (r *IngressReconciler) processBackends(ctx context.Context, tctx *provider.
continue
}
service := path.Backend.Service
if err := r.processBackendService(ctx, tctx, ingress.Namespace, service); err != nil {
if err := r.processBackendService(tctx, ingress.Namespace, service); err != nil {
terr = err
}
}
Expand All @@ -345,10 +345,10 @@ func (r *IngressReconciler) processBackends(ctx context.Context, tctx *provider.
}

// processBackendService process a single backend service
func (r *IngressReconciler) processBackendService(ctx context.Context, tctx *provider.TranslateContext, namespace string, backendService *networkingv1.IngressServiceBackend) error {
func (r *IngressReconciler) processBackendService(tctx *provider.TranslateContext, namespace string, backendService *networkingv1.IngressServiceBackend) error {
// get the service
var service corev1.Service
if err := r.Get(ctx, client.ObjectKey{
if err := r.Get(tctx, client.ObjectKey{
Namespace: namespace,
Name: backendService.Name,
}, &service); err != nil {
Expand Down Expand Up @@ -385,7 +385,7 @@ func (r *IngressReconciler) processBackendService(ctx context.Context, tctx *pro

// get the endpoint slices
endpointSliceList := &discoveryv1.EndpointSliceList{}
if err := r.List(ctx, endpointSliceList,
if err := r.List(tctx, endpointSliceList,
client.InNamespace(namespace),
client.MatchingLabels{
discoveryv1.LabelServiceName: backendService.Name,
Expand Down
Loading
Loading