Merge remote-tracking branch 'origin/release-v2-dev' into feat/support_apisixtls

Signed-off-by: ashing <axingfly@gmail.com>

Author: ronething

Dockerfile.dev

@@ -8,7 +8,7 @@ WORKDIR /app
 
 RUN apt update \
     && apt install -y git \
-    && git clone --branch main https://github.com/api7/adc.git \
+    && git clone --depth 1 --branch main https://github.com/api7/adc.git \
     && cd adc \
     && corepack enable pnpm \
     && pnpm install \

api/adc/types.go

@@ -128,11 +128,11 @@ type ConsumerGroup struct {
 
 // +k8s:deepcopy-gen=true
 type Consumer struct {
-	Credentials []Credential      `json:"credentials,omitempty" yaml:"credentials,omitempty"`
-	Description string            `json:"description,omitempty" yaml:"description,omitempty"`
-	Labels      map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
-	Plugins     Plugins           `json:"plugins,omitempty" yaml:"plugins,omitempty"`
-	Username    string            `json:"username" yaml:"username"`
+	Metadata `json:",inline" yaml:",inline"`
+
+	Credentials []Credential `json:"credentials,omitempty" yaml:"credentials,omitempty"`
+	Plugins     Plugins      `json:"plugins,omitempty" yaml:"plugins,omitempty"`
+	Username    string       `json:"username" yaml:"username"`
 }
 
 // +k8s:deepcopy-gen=true

api/adc/zz_generated.deepcopy.go

@@ -36,14 +36,19 @@ type ApisixUpstreamSpec struct {
 	PortLevelSettings []PortLevelSettings `json:"portLevelSettings,omitempty" yaml:"portLevelSettings,omitempty"`
 }
 
+// ApisixUpstreamStatus defines the observed state of ApisixUpstream.
+type ApisixUpstreamStatus = ApisixStatus
+
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // ApisixUpstream is the Schema for the apisixupstreams API.
 type ApisixUpstream struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec ApisixUpstreamSpec `json:"spec,omitempty"`
+	Spec   ApisixUpstreamSpec   `json:"spec,omitempty"`
+	Status ApisixUpstreamStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/v2/apisixupstream_types.go

@@ -490,6 +490,68 @@ spec:
                   the pass_host is set to rewrite
                 type: string
             type: object
+          status:
+            description: ApisixStatus is the status report for Apisix ingress Resources
+            properties:
+              conditions:
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+            type: object
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}

api/v2/zz_generated.deepcopy.go

@@ -1300,6 +1300,8 @@ _Appears in:_
 
 
 
+
+
 #### ApisixTlsSpec
 
 

config/crd/bases/apisix.apache.org_apisixupstreams.yaml

@@ -30,7 +30,6 @@ import (
 	"github.com/apache/apisix-ingress-controller/api/v1alpha1"
 	apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
 	"github.com/apache/apisix-ingress-controller/internal/controller/status"
-	"github.com/apache/apisix-ingress-controller/internal/provider"
 	"github.com/apache/apisix-ingress-controller/internal/utils"
 )
 
@@ -46,11 +45,7 @@ type ApisixPluginConfigReconciler struct {
 func (r *ApisixPluginConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&apiv2.ApisixPluginConfig{}).
-		WithEventFilter(
-			predicate.Or(
-				predicate.GenerationChangedPredicate{},
-			),
-		).
+		WithEventFilter(predicate.GenerationChangedPredicate{}).
 		Watches(&networkingv1.IngressClass{},
 			handler.EnqueueRequestsFromMapFunc(r.listApisixPluginConfigForIngressClass),
 			builder.WithPredicates(
@@ -67,23 +62,12 @@ func (r *ApisixPluginConfigReconciler) SetupWithManager(mgr ctrl.Manager) error
 func (r *ApisixPluginConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	var pc apiv2.ApisixPluginConfig
 	if err := r.Get(ctx, req.NamespacedName, &pc); err != nil {
-		if client.IgnoreNotFound(err) == nil {
-			pc.Namespace = req.Namespace
-			pc.Name = req.Name
-			pc.TypeMeta = metav1.TypeMeta{
-				Kind:       KindApisixPluginConfig,
-				APIVersion: apiv2.GroupVersion.String(),
-			}
-
-			return ctrl.Result{}, nil
-		}
-		return ctrl.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	var (
-		tctx = provider.NewDefaultTranslateContext(ctx)
-		ic   *networkingv1.IngressClass
-		err  error
+		ic  *networkingv1.IngressClass
+		err error
 	)
 	defer func() {
 		r.updateStatus(&pc, err)
@@ -92,7 +76,7 @@ func (r *ApisixPluginConfigReconciler) Reconcile(ctx context.Context, req ctrl.R
 	if ic, err = r.getIngressClass(&pc); err != nil {
 		return ctrl.Result{}, err
 	}
-	if err = r.processIngressClassParameters(ctx, tctx, &pc, ic); err != nil {
+	if err = r.processIngressClassParameters(ctx, &pc, ic); err != nil {
 		return ctrl.Result{}, err
 	}
 	return ctrl.Result{}, nil
@@ -174,15 +158,13 @@ func (r *ApisixPluginConfigReconciler) getDefaultIngressClass() (*networkingv1.I
 }
 
 // processIngressClassParameters processes the IngressClass parameters that reference GatewayProxy
-func (r *ApisixPluginConfigReconciler) processIngressClassParameters(ctx context.Context, tc *provider.TranslateContext, pc *apiv2.ApisixPluginConfig, ingressClass *networkingv1.IngressClass) error {
+func (r *ApisixPluginConfigReconciler) processIngressClassParameters(ctx context.Context, pc *apiv2.ApisixPluginConfig, ingressClass *networkingv1.IngressClass) error {
 	if ingressClass == nil || ingressClass.Spec.Parameters == nil {
 		return nil
 	}
 
 	var (
-		ingressClassKind = utils.NamespacedNameKind(ingressClass)
-		pcKind           = utils.NamespacedNameKind(pc)
-		parameters       = ingressClass.Spec.Parameters
+		parameters = ingressClass.Spec.Parameters
 	)
 	if parameters.APIGroup == nil || *parameters.APIGroup != v1alpha1.GroupVersion.Group || parameters.Kind != KindGatewayProxy {
 		return nil
@@ -197,15 +179,7 @@ func (r *ApisixPluginConfigReconciler) processIngressClassParameters(ctx context
 		ns = &pc.Namespace
 	}
 
-	if err := r.Get(ctx, client.ObjectKey{Namespace: *ns, Name: parameters.Name}, &gatewayProxy); err != nil {
-		r.Log.Error(err, "failed to get GatewayProxy", "namespace", *ns, "name", parameters.Name)
-		return err
-	}
-
-	tc.GatewayProxies[ingressClassKind] = gatewayProxy
-	tc.ResourceParentRefs[pcKind] = append(tc.ResourceParentRefs[pcKind], ingressClassKind)
-
-	return nil
+	return r.Get(ctx, client.ObjectKey{Namespace: *ns, Name: parameters.Name}, &gatewayProxy)
 }
 
 func (r *ApisixPluginConfigReconciler) updateStatus(pc *apiv2.ApisixPluginConfig, err error) {