File tree Expand file tree Collapse file tree 4 files changed +7
-12
lines changed
Expand file tree Collapse file tree 4 files changed +7
-12
lines changed Original file line number Diff line number Diff line change @@ -57,9 +57,7 @@ CONFORMANCE_TEST_REPORT_OUTPUT ?= $(DIR)/apisix-ingress-controller-conformance-r
5757# # https://github.com/kubernetes-sigs/gateway-api/blob/v1.3.0/conformance/utils/suite/profiles.go
5858CONFORMANCE_PROFILES ?= GATEWAY-HTTP,GATEWAY-GRPC,GATEWAY-TLS
5959
60-
6160TEST_EXCLUDES ?= /e2e /conformance /benchmark
62-
6361TEST_PACKAGES = $(shell go list ./... $(foreach p,$(TEST_EXCLUDES ) ,| grep -v $(p ) ) )
6462
6563# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -133,7 +131,6 @@ vet: ## Run go vet against code.
133131
134132.PHONY : test
135133test : manifests generate fmt vet envtest # # Run tests.
136- KUBEBUILDER_ASSETS=" $( shell $( ENVTEST) use $( ENVTEST_K8S_VERSION) --bin-dir $( LOCALBIN) -p path) " go test $$(go list ./... | grep -v /e2e | grep -v /conformance ) -coverprofile cover.out
137134 KUBEBUILDER_ASSETS=" $$ ( $( ENVTEST) use $( ENVTEST_K8S_VERSION) --bin-dir $( LOCALBIN) -p path )" go test $(TEST_PACKAGES ) -coverprofile cover.out
138135
139136.PHONY : kind-e2e-test
Original file line number Diff line number Diff line change @@ -288,12 +288,8 @@ func (d *apisixProvider) Start(ctx context.Context) error {
288288}
289289
290290func (d * apisixProvider ) sync (ctx context.Context ) error {
291- now := time .Now ()
292- d .log .Info ("starting to sync ADC configs" , "time" , now )
293- _ , err := d .client .Sync (ctx )
294- d .log .Info ("finished syncing ADC configs" , "duration" , time .Since (now ))
295- // statusesMap, err := d.client.Sync(ctx)
296- //d.handleADCExecutionErrors(statusesMap)
291+ statusesMap , err := d .client .Sync (ctx )
292+ d .handleADCExecutionErrors (statusesMap )
297293 return err
298294}
299295
Original file line number Diff line number Diff line change 66// "License"); you may not use this file except in compliance
77// with the License. You may obtain a copy of the License at
88//
9- // http://www.apache.org/licenses/LICENSE-2.0
10- // // Unless required by applicable law or agreed to in writing,
9+ // http://www.apache.org/licenses/LICENSE-2.0
10+ //
11+ // Unless required by applicable law or agreed to in writing,
1112// software distributed under the License is distributed on an
1213// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1314// KIND, either express or implied. See the License for the
Original file line number Diff line number Diff line change 77// with the License. You may obtain a copy of the License at
88//
99// http://www.apache.org/licenses/LICENSE-2.0
10- // // Unless required by applicable law or agreed to in writing,
10+ //
11+ // Unless required by applicable law or agreed to in writing,
1112// software distributed under the License is distributed on an
1213// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1314// KIND, either express or implied. See the License for the
You can’t perform that action at this time.
0 commit comments