Skip to content

Commit dfe3a1d

Browse files
dspodspo
committed
Merge branch origin/feat/support_global_rules
2 parents 9fb1138 + 364200f commit dfe3a1d

File tree

7 files changed

+56
-63
lines changed

7 files changed

+56
-63
lines changed

‎.dockerignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Dockerfile.dev‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,12 @@ RUN apt update \
2121
&& mv ./node-binary/linux-${TARGETARCH} /bin/adc \
2222
&& rm -rf /app
2323

24-
FROM golang:1.22 AS builder
25-
WORKDIR /workspace
26-
COPY go.* ./
27-
28-
RUN if [ "$ENABLE_PROXY" = "true" ] ; then go env -w GOPROXY=https://goproxy.cn,direct ; fi \
29-
&& go mod download
30-
31-
COPY . .
32-
33-
RUN --mount=type=cache,target=/root/.cache/go-build make build && mv bin/api7-ingress-controller /bin && rm -rf /workspace
34-
3524
FROM debian:bullseye-slim
3625
WORKDIR /app
3726

38-
COPY --from=builder /bin/api7-ingress-controller .
3927
COPY --from=node_builder /bin/adc /bin/adc
40-
COPY config/samples/config.yaml ./conf/config.yaml
28+
COPY ./bin/api7-ingress-controller .
29+
COPY ./config/samples/config.yaml ./conf/config.yaml
4130

4231
ENTRYPOINT ["/app/api7-ingress-controller"]
4332
CMD ["-c", "/app/conf/config.yaml"]

‎Makefile‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ IMG ?= api7/api7-ingress-controller:$(IMAGE_TAG)
1010
ENVTEST_K8S_VERSION = 1.30.0
1111

1212
KIND_NAME ?= api7-ingress-cluster
13-
GATEAY_API_VERSION ?= v1.1.0
13+
GATEAY_API_VERSION ?= v1.2.0
1414

1515
DASHBOARD_VERSION ?= dev
1616
TEST_TIMEOUT ?= 30m
@@ -127,6 +127,10 @@ kind-load-images: pull-infra-images
127127
@kind load docker-image $(IMG) --name $(KIND_NAME)
128128
@kind load docker-image jmalloc/echo-server:latest --name $(KIND_NAME)
129129

130+
.PHONY: kind-load-ingress-image
131+
kind-load-ingress-image:
132+
@kind load docker-image $(IMG) --name $(KIND_NAME)
133+
130134
.PHONY: pull-infra-images
131135
pull-infra-images:
132136
@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev
@@ -146,6 +150,8 @@ kind-load-image:
146150
build: manifests generate fmt vet ## Build manager binary.
147151
CGO_ENABLED=0 go build -o bin/api7-ingress-controller -ldflags $(GO_LDFLAGS) cmd/main.go
148152

153+
linux-build:
154+
GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -o bin/api7-ingress-controller -ldflags $(GO_LDFLAGS) cmd/main.go
149155

150156
.PHONY: build-image
151157
build-image: docker-build
@@ -158,7 +164,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
158164
# (i.e. docker build --platform linux/arm64). However, you must enable docker buildKit for it.
159165
# More info: https://docs.docker.com/develop/develop-images/build_enhancements/
160166
.PHONY: docker-build
161-
docker-build: ## Build docker image with the manager.
167+
docker-build: build ## Build docker image with the manager.
162168
$(CONTAINER_TOOL) build -t ${IMG} -f Dockerfile.dev .
163169

164170
.PHONY: docker-push
@@ -196,11 +202,11 @@ endif
196202

197203
.PHONY: install-gateway-api
198204
install-gateway-api: ## Install Gateway API CRDs into the K8s cluster specified in ~/.kube/config.
199-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/$(GATEAY_API_VERSION)/experimental-install.yaml
205+
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/$(GATEAY_API_VERSION)/standard-install.yaml
200206

201207
.PHONY: uninstall-gateway-api
202208
uninstall-gateway-api: ## Uninstall Gateway API CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
203-
kubectl delete -f https://github.com/kubernetes-sigs/gateway-api/releases/download/$(GATEAY_API_VERSION)/experimental-install.yaml
209+
kubectl delete -f https://github.com/kubernetes-sigs/gateway-api/releases/download/$(GATEAY_API_VERSION)/standard-install.yaml
204210

205211
.PHONY: install
206212
install: manifests kustomize install-gateway-api ## Install CRDs into the K8s cluster specified in ~/.kube/config.

‎go.mod‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ require (
3232
gopkg.in/yaml.v3 v3.0.1
3333
gorm.io/gorm v1.25.11
3434
helm.sh/helm/v3 v3.15.4
35-
k8s.io/api v0.31.0
36-
k8s.io/apiextensions-apiserver v0.31.0
37-
k8s.io/apimachinery v0.31.0
38-
k8s.io/client-go v0.31.0
35+
k8s.io/api v0.31.1
36+
k8s.io/apiextensions-apiserver v0.31.1
37+
k8s.io/apimachinery v0.31.1
38+
k8s.io/client-go v0.31.1
3939
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
4040
sigs.k8s.io/controller-runtime v0.19.0
41-
sigs.k8s.io/gateway-api v1.1.0
41+
sigs.k8s.io/gateway-api v1.2.0
4242
sigs.k8s.io/yaml v1.4.0
4343
)
4444

@@ -82,7 +82,7 @@ require (
8282
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
8383
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
8484
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect
85-
github.com/fatih/color v1.16.0 // indirect
85+
github.com/fatih/color v1.17.0 // indirect
8686
github.com/fatih/structs v1.1.0 // indirect
8787
github.com/felixge/httpsnoop v1.0.4 // indirect
8888
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -139,7 +139,7 @@ require (
139139
github.com/mattn/go-runewidth v0.0.15 // indirect
140140
github.com/mattn/go-sqlite3 v1.14.19 // indirect
141141
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
142-
github.com/miekg/dns v1.1.58 // indirect
142+
github.com/miekg/dns v1.1.62 // indirect
143143
github.com/mitchellh/copystructure v1.2.0 // indirect
144144
github.com/mitchellh/go-homedir v1.1.0 // indirect
145145
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -199,23 +199,23 @@ require (
199199
golang.org/x/mod v0.20.0 // indirect
200200
golang.org/x/oauth2 v0.21.0 // indirect
201201
golang.org/x/sync v0.8.0 // indirect
202-
golang.org/x/sys v0.23.0 // indirect
202+
golang.org/x/sys v0.24.0 // indirect
203203
golang.org/x/term v0.23.0 // indirect
204204
golang.org/x/text v0.17.0 // indirect
205205
golang.org/x/time v0.5.0 // indirect
206206
golang.org/x/tools v0.24.0 // indirect
207207
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
208-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
208+
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
209209
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
210-
google.golang.org/grpc v1.65.0 // indirect
210+
google.golang.org/grpc v1.66.2 // indirect
211211
google.golang.org/protobuf v1.34.2 // indirect
212212
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
213213
gopkg.in/fsnotify.v1 v1.4.7 // indirect
214214
gopkg.in/inf.v0 v0.9.1 // indirect
215215
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
216-
k8s.io/apiserver v0.31.0 // indirect
216+
k8s.io/apiserver v0.31.1 // indirect
217217
k8s.io/cli-runtime v0.30.3 // indirect
218-
k8s.io/component-base v0.31.0 // indirect
218+
k8s.io/component-base v0.31.1 // indirect
219219
k8s.io/klog/v2 v2.130.1 // indirect
220220
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
221221
k8s.io/kubectl v0.30.3 // indirect

‎go.sum‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZM
135135
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:DddqAaWDpywytcG8w/qoQ5sAN8X12d3Z3koB0C3Rxsc=
136136
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
137137
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
138-
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
139-
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
138+
github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
139+
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
140140
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
141141
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
142142
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -370,8 +370,8 @@ github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb44
370370
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 h1:ofNAzWCcyTALn2Zv40+8XitdzCgXY6e9qvXwN9W0YXg=
371371
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo=
372372
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
373-
github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
374-
github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
373+
github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
374+
github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
375375
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
376376
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
377377
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
@@ -667,8 +667,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
667667
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
668668
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
669669
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
670-
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
671-
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
670+
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
671+
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
672672
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
673673
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
674674
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -709,15 +709,15 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
709709
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
710710
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
711711
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
712-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw=
713-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU=
712+
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU=
713+
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo=
714714
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA=
715715
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
716716
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
717717
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
718718
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
719-
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
720-
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
719+
google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
720+
google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
721721
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
722722
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
723723
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -763,20 +763,20 @@ helm.sh/helm/v3 v3.15.4 h1:UFHd6oZ1IN3FsUZ7XNhOQDyQ2QYknBNWRHH57e9cbHY=
763763
helm.sh/helm/v3 v3.15.4/go.mod h1:phOwlxqGSgppCY/ysWBNRhG3MtnpsttOzxaTK+Mt40E=
764764
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
765765
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
766-
k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
767-
k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
768-
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
769-
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
770-
k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
771-
k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
772-
k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY=
773-
k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk=
766+
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
767+
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
768+
k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
769+
k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ=
770+
k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
771+
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
772+
k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c=
773+
k8s.io/apiserver v0.31.1/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM=
774774
k8s.io/cli-runtime v0.30.3 h1:aG69oRzJuP2Q4o8dm+f5WJIX4ZBEwrvdID0+MXyUY6k=
775775
k8s.io/cli-runtime v0.30.3/go.mod h1:hwrrRdd9P84CXSKzhHxrOivAR9BRnkMt0OeP5mj7X30=
776-
k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
777-
k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
778-
k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs=
779-
k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo=
776+
k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0=
777+
k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg=
778+
k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8=
779+
k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w=
780780
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
781781
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
782782
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f h1:0LQagt0gDpKqvIkAMPaRGcXawNMouPECM1+F9BVxEaM=
@@ -794,8 +794,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsA
794794
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
795795
sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
796796
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
797-
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
798-
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
797+
sigs.k8s.io/gateway-api v1.2.0 h1:LrToiFwtqKTKZcZtoQPTuo3FxhrrhTgzQG0Te+YGSo8=
798+
sigs.k8s.io/gateway-api v1.2.0/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
799799
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
800800
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
801801
sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g=

‎internal/provider/adc/adc.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,13 @@ func (d *adcClient) Update(ctx context.Context, tctx *provider.TranslateContext,
8585
}
8686

8787
func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
88-
task := Task{
89-
Name: obj.GetName(),
90-
Labels: label.GenLabel(obj),
91-
}
92-
93-
var extraArgs []string
88+
var (
89+
task = Task{
90+
Name: obj.GetName(),
91+
Labels: label.GenLabel(obj),
92+
}
93+
extraArgs []string
94+
)
9495

9596
switch obj.(type) {
9697
case *gatewayv1.HTTPRoute:

‎test/e2e/gatewayapi/gatewayproxy.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/api7/api7-ingress-controller/test/e2e/scaffold"
1212
)
1313

14-
var _ = FDescribe("Test GatewayProxy", func() {
14+
var _ = Describe("Test GatewayProxy", func() {
1515
s := scaffold.NewDefaultScaffold()
1616

1717
var defaultGatewayClass = `

0 commit comments

Comments
 (0)