Skip to content

Commit 6e101bb

Browse files
committed
fix test2
1 parent 4bd5232 commit 6e101bb

File tree

3 files changed

+5
-17
lines changed

3 files changed

+5
-17
lines changed

api/adc/types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,9 @@ func (p Plugins) DeepCopy() Plugins {
261261

262262
// UpstreamNode is the node in upstream
263263
type UpstreamNode struct {
264-
Host string `json:"host,omitempty" yaml:"host,omitempty"`
265-
Port int `json:"port,omitempty" yaml:"port,omitempty"`
266-
Weight int `json:"weight,omitempty" yaml:"weight,omitempty"`
264+
Host string `json:"host" yaml:"host"`
265+
Port int `json:"port" yaml:"port"`
266+
Weight int `json:"weight" yaml:"weight"`
267267
Priority int `json:"priority,omitempty" yaml:"priority,omitempty"`
268268
}
269269

test/e2e/gatewayapi/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ spec:
129129
routes, err := s1.DefaultDataplaneResource().Route().List(s1.Context)
130130
Expect(err).NotTo(HaveOccurred())
131131
Expect(routes).To(HaveLen(1))
132-
assert.Equal(GinkgoT(), routes[0].Labels["controller_name"], "gateway.api7.io/api7-ingress-controller-1")
132+
assert.Equal(GinkgoT(), routes[0].Labels["k8s/controller-name"], "gateway.api7.io/api7-ingress-controller-1")
133133
})
134134
})
135135
Context("Create resource with second controller", func() {
@@ -175,7 +175,7 @@ spec:
175175
routes, err := s2.DefaultDataplaneResource().Route().List(s2.Context)
176176
Expect(err).NotTo(HaveOccurred())
177177
Expect(routes).To(HaveLen(1))
178-
assert.Equal(GinkgoT(), routes[0].Labels["controller_name"], "gateway.api7.io/api7-ingress-controller-2")
178+
assert.Equal(GinkgoT(), routes[0].Labels["k8s/controller-name"], "gateway.api7.io/api7-ingress-controller-2")
179179
})
180180
})
181181
})

test/e2e/gatewayapi/httproute.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -772,12 +772,6 @@ spec:
772772
- path:
773773
type: Exact
774774
value: /get
775-
filters:
776-
- type: RequestMirror
777-
requestMirror:
778-
backendRef:
779-
name: echo-service
780-
port: 80
781775
backendRefs:
782776
- name: httpbin-service-e2e-test
783777
port: 80
@@ -801,12 +795,6 @@ spec:
801795
- path:
802796
type: Exact
803797
value: /get
804-
filters:
805-
- type: RequestMirror
806-
requestMirror:
807-
backendRef:
808-
name: echo-service
809-
port: 80
810798
backendRefs:
811799
- name: httpbin-service-e2e-test
812800
port: 80

0 commit comments

Comments
 (0)