Merge remote-tracking branch 'origin/release-v2-dev' into chore/gateway_ingress_contoller

Signed-off-by: ashing <[email protected]>

Author: ronething

Dockerfile

@@ -16,10 +16,13 @@ RUN apt update \
     && apt autoremove -y wget
 
 FROM gcr.io/distroless/cc-debian12:${BASE_IMAGE_TAG}
+
+ARG TARGETARCH
+
 WORKDIR /app
 
 COPY --from=deps /bin/adc /bin/adc
-COPY ./bin/api7-ingress-controller .
+COPY ./bin/api7-ingress-controller_${TARGETARCH} ./api7-ingress-controller
 COPY ./config/samples/config.yaml ./conf/config.yaml
 
 ENTRYPOINT ["/app/api7-ingress-controller"]

Makefile

@@ -156,14 +156,28 @@ pull-infra-images:
 
 .PHONY: build
 build: manifests generate fmt vet ## Build manager binary.
-	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -o bin/api7-ingress-controller -ldflags $(GO_LDFLAGS) cmd/main.go
+	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -o bin/api7-ingress-controller_$(GOARCH) -ldflags $(GO_LDFLAGS) cmd/main.go
 
 linux-build:
 	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -o bin/api7-ingress-controller -ldflags $(GO_LDFLAGS) cmd/main.go
 
 .PHONY: build-image
 build-image: docker-build
 
+.PHONY: build-multi-arch
+build-multi-arch:
+	@CGO_ENABLED=0 GOARCH=amd64 go build -o bin/api7-ingress-controller_amd64 -ldflags $(GO_LDFLAGS) cmd/main.go
+	@CGO_ENABLED=0 GOARCH=arm64 go build -o bin/api7-ingress-controller_arm64 -ldflags $(GO_LDFLAGS) cmd/main.go
+
+.PHONY: build-multi-arch-image
+build-multi-arch-image: build-multi-arch
+    # daemon.json: "features":{"containerd-snapshotter": true}
+	@docker buildx build --load --platform linux/amd64,linux/arm64 -t $(IMG) .
+
+.PHONY: build-push-multi-arch-image
+build-push-multi-arch-image: build-multi-arch
+	@docker buildx build --push --platform linux/amd64,linux/arm64 -t $(IMG) .
+
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
 	go run ./cmd/main.go

api/adc/types.go

@@ -10,8 +10,6 @@ import (
 	"time"
 
 	"github.com/incubator4/go-resty-expr/expr"
-
-	"github.com/api7/api7-ingress-controller/api/common"
 )
 
 const (
@@ -115,16 +113,16 @@ type Service struct {
 type Route struct {
 	Metadata `json:",inline" yaml:",inline"`
 
-	EnableWebsocket *bool       `json:"enable_websocket,omitempty" yaml:"enable_websocket,omitempty"`
-	FilterFunc      string      `json:"filter_func,omitempty" yaml:"filter_func,omitempty"`
-	Hosts           []string    `json:"hosts,omitempty" yaml:"hosts,omitempty"`
-	Methods         []string    `json:"methods,omitempty" yaml:"methods,omitempty"`
-	Plugins         Plugins     `json:"plugins,omitempty" yaml:"plugins,omitempty"`
-	Priority        *int64      `json:"priority,omitempty" yaml:"priority,omitempty"`
-	RemoteAddrs     []string    `json:"remote_addrs,omitempty" yaml:"remote_addrs,omitempty"`
-	Timeout         *Timeout    `json:"timeout,omitempty" yaml:"timeout,omitempty"`
-	Uris            []string    `json:"uris" yaml:"uris"`
-	Vars            common.Vars `json:"vars,omitempty" yaml:"vars,omitempty"`
+	EnableWebsocket *bool    `json:"enable_websocket,omitempty" yaml:"enable_websocket,omitempty"`
+	FilterFunc      string   `json:"filter_func,omitempty" yaml:"filter_func,omitempty"`
+	Hosts           []string `json:"hosts,omitempty" yaml:"hosts,omitempty"`
+	Methods         []string `json:"methods,omitempty" yaml:"methods,omitempty"`
+	Plugins         Plugins  `json:"plugins,omitempty" yaml:"plugins,omitempty"`
+	Priority        *int64   `json:"priority,omitempty" yaml:"priority,omitempty"`
+	RemoteAddrs     []string `json:"remote_addrs,omitempty" yaml:"remote_addrs,omitempty"`
+	Timeout         *Timeout `json:"timeout,omitempty" yaml:"timeout,omitempty"`
+	Uris            []string `json:"uris" yaml:"uris"`
+	Vars            Vars     `json:"vars,omitempty" yaml:"vars,omitempty"`
 }
 
 type Timeout struct {
@@ -502,3 +500,49 @@ type ResponseData struct {
 	Value    map[string]any `json:"value"`
 	ErrorMsg string         `json:"error_msg"`
 }
+
+// Vars represents the route match expressions of APISIX.
+type Vars [][]StringOrSlice
+
+// UnmarshalJSON implements json.Unmarshaler interface.
+// lua-cjson doesn't distinguish empty array and table,
+// and by default empty array will be encoded as '{}'.
+// We have to maintain the compatibility.
+func (vars *Vars) UnmarshalJSON(p []byte) error {
+	if p[0] == '{' {
+		if len(p) != 2 {
+			return errors.New("unexpected non-empty object")
+		}
+		return nil
+	}
+	var data [][]StringOrSlice
+	if err := json.Unmarshal(p, &data); err != nil {
+		return err
+	}
+	*vars = data
+	return nil
+}
+
+// StringOrSlice represents a string or a string slice.
+// TODO Do not use interface{} to avoid the reflection overheads.
+type StringOrSlice struct {
+	StrVal   string          `json:"-"`
+	SliceVal []StringOrSlice `json:"-"`
+}
+
+func (s *StringOrSlice) MarshalJSON() ([]byte, error) {
+	if s.SliceVal != nil {
+		return json.Marshal(s.SliceVal)
+	}
+	return json.Marshal(s.StrVal)
+}
+
+func (s *StringOrSlice) UnmarshalJSON(p []byte) error {
+	if len(p) == 0 {
+		return errors.New("empty object")
+	}
+	if p[0] == '[' {
+		return json.Unmarshal(p, &s.SliceVal)
+	}
+	return json.Unmarshal(p, &s.StrVal)
+}

api/common/types.go

@@ -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
@@ -12,22 +10,18 @@ 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 {
 	// TargetRef identifies an API object to apply policy to.
 	// Currently, Backends (i.e. Service, ServiceImport, or any
 	// implementation-specific backendRef) are the only valid API
 	// target references.
-	// +listType=map
-	// +listMapKey=group
-	// +listMapKey=kind
-	// +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"`
@@ -74,9 +68,12 @@ type LoadBalancer struct {
 }
 
 type Timeout struct {
+	// +kubebuilder:default="60s"
 	Connect metav1.Duration `json:"connect,omitempty" yaml:"connect,omitempty"`
-	Send    metav1.Duration `json:"send,omitempty" yaml:"send,omitempty"`
-	Read    metav1.Duration `json:"read,omitempty" yaml:"read,omitempty"`
+	// +kubebuilder:default="60s"
+	Send metav1.Duration `json:"send,omitempty" yaml:"send,omitempty"`
+	// +kubebuilder:default="60s"
+	Read metav1.Duration `json:"read,omitempty" yaml:"read,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/common/zz_generated.deepcopy.go

@@ -17,10 +17,9 @@ limitations under the License.
 package v1alpha1
 
 import (
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
-
-	"github.com/api7/api7-ingress-controller/api/common"
 )
 
 // HTTPRoutePolicySpec defines the desired state of HTTPRoutePolicy.
@@ -36,8 +35,8 @@ type HTTPRoutePolicySpec struct {
 	// +kubebuilder:validation:MaxItems=16
 	TargetRefs []gatewayv1alpha2.LocalPolicyTargetReferenceWithSectionName `json:"targetRefs"`
 
-	Priority *int64 `json:"priority,omitempty" yaml:"priority,omitempty"`
-	Vars     Vars   `json:"vars,omitempty" yaml:"vars,omitempty"`
+	Priority *int64                 `json:"priority,omitempty" yaml:"priority,omitempty"`
+	Vars     []apiextensionsv1.JSON `json:"vars,omitempty" yaml:"vars,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -61,10 +60,6 @@ type HTTPRoutePolicyList struct {
 	Items           []HTTPRoutePolicy `json:"items"`
 }
 
-// Vars represents the route match expressions of APISIX.
-// +kubebuilder:object:generate=false
-type Vars = common.Vars
-
 func init() {
 	SchemeBuilder.Register(&HTTPRoutePolicy{}, &HTTPRoutePolicyList{})
 }

api/v1alpha1/backendtrafficpolicy_types.go

@@ -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