Skip to content

Commit e339d9c

Browse files
ronethingronething
committed
fix: r
Signed-off-by: Ashing Zheng <[email protected]>
1 parent fb5054b commit e339d9c

File tree

2 files changed

+74
-50
lines changed

2 files changed

+74
-50
lines changed

‎test/e2e/crds/v2/status.go‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -171,22 +171,28 @@ spec:
171171
Check: scaffold.WithExpectedStatus(200),
172172
})
173173

174-
By("get yaml from service")
175-
serviceYaml, err := s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
176-
Expect(err).NotTo(HaveOccurred(), "getting service yaml")
177-
By("update service to type ExternalName with invalid host")
178-
var k8sservice corev1.Service
179-
err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
180-
Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
181-
oldSpec := k8sservice.Spec
182-
k8sservice.Spec = corev1.ServiceSpec{
183-
Type: corev1.ServiceTypeExternalName,
184-
ExternalName: "invalid.host",
174+
var oldSpec corev1.ServiceSpec
175+
if framework.ProviderType == adc.BackendModeAPISIXStandalone {
176+
By("get yaml from service")
177+
serviceYaml, err := s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
178+
Expect(err).NotTo(HaveOccurred(), "getting service yaml")
179+
By("update service to type ExternalName with invalid host")
180+
var k8sservice corev1.Service
181+
err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
182+
Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
183+
oldSpec = k8sservice.Spec
184+
k8sservice.Spec = corev1.ServiceSpec{
185+
Type: corev1.ServiceTypeExternalName,
186+
ExternalName: "invalid.host",
187+
}
188+
newServiceYaml, err := yaml.Marshal(k8sservice)
189+
Expect(err).NotTo(HaveOccurred(), "marshalling service")
190+
err = s.CreateResourceFromString(string(newServiceYaml))
191+
Expect(err).NotTo(HaveOccurred(), "creating service")
192+
} else {
193+
By("scale down dataplane")
194+
s.Deployer.ScaleDataplane(0)
185195
}
186-
newServiceYaml, err := yaml.Marshal(k8sservice)
187-
Expect(err).NotTo(HaveOccurred(), "marshalling service")
188-
err = s.CreateResourceFromString(string(newServiceYaml))
189-
Expect(err).NotTo(HaveOccurred(), "creating service")
190196

191197
By("check ApisixRoute status")
192198
s.RetryAssertion(func() string {
@@ -200,16 +206,22 @@ spec:
200206
),
201207
)
202208

203-
By("update service to original spec")
204-
serviceYaml, err = s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
205-
Expect(err).NotTo(HaveOccurred(), "getting service yaml")
206-
err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
207-
Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
208-
k8sservice.Spec = oldSpec
209-
newServiceYaml, err = yaml.Marshal(k8sservice)
210-
Expect(err).NotTo(HaveOccurred(), "marshalling service")
211-
err = s.CreateResourceFromString(string(newServiceYaml))
212-
Expect(err).NotTo(HaveOccurred(), "creating service")
209+
if framework.ProviderType == adc.BackendModeAPISIXStandalone {
210+
By("update service to original spec")
211+
serviceYaml, err := s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
212+
Expect(err).NotTo(HaveOccurred(), "getting service yaml")
213+
var k8sservice corev1.Service
214+
err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
215+
Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
216+
k8sservice.Spec = oldSpec
217+
newServiceYaml, err := yaml.Marshal(k8sservice)
218+
Expect(err).NotTo(HaveOccurred(), "marshalling service")
219+
err = s.CreateResourceFromString(string(newServiceYaml))
220+
Expect(err).NotTo(HaveOccurred(), "creating service")
221+
} else {
222+
By("scale up dataplane")
223+
s.Deployer.ScaleDataplane(1)
224+
}
213225

214226
By("check ApisixRoute status after scaling up")
215227
s.RetryAssertion(func() string {

‎test/e2e/gatewayapi/status.go‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,28 @@ spec:
127127
Check: scaffold.WithExpectedStatus(200),
128128
})
129129

130-
By("get yaml from service")
131-
serviceYaml, err := s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
132-
Expect(err).NotTo(HaveOccurred(), "getting service yaml")
133-
By("update service to type ExternalName with invalid host")
134-
var k8sservice corev1.Service
135-
err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
136-
Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
137-
oldSpec := k8sservice.Spec
138-
k8sservice.Spec = corev1.ServiceSpec{
139-
Type: corev1.ServiceTypeExternalName,
140-
ExternalName: "invalid.host",
130+
var oldSpec corev1.ServiceSpec
131+
if framework.ProviderType == adc.BackendModeAPISIXStandalone {
132+
By("get yaml from service")
133+
serviceYaml, err := s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
134+
Expect(err).NotTo(HaveOccurred(), "getting service yaml")
135+
By("update service to type ExternalName with invalid host")
136+
var k8sservice corev1.Service
137+
err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
138+
Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
139+
oldSpec = k8sservice.Spec
140+
k8sservice.Spec = corev1.ServiceSpec{
141+
Type: corev1.ServiceTypeExternalName,
142+
ExternalName: "invalid.host",
143+
}
144+
newServiceYaml, err := yaml.Marshal(k8sservice)
145+
Expect(err).NotTo(HaveOccurred(), "marshalling service")
146+
err = s.CreateResourceFromString(string(newServiceYaml))
147+
Expect(err).NotTo(HaveOccurred(), "creating service")
148+
} else {
149+
By("scale down dataplane")
150+
s.Deployer.ScaleDataplane(0)
141151
}
142-
newServiceYaml, err := yaml.Marshal(k8sservice)
143-
Expect(err).NotTo(HaveOccurred(), "marshalling service")
144-
err = s.CreateResourceFromString(string(newServiceYaml))
145-
Expect(err).NotTo(HaveOccurred(), "creating service")
146152

147153
By("check ApisixRoute status")
148154
s.RetryAssertion(func() string {
@@ -156,16 +162,22 @@ spec:
156162
),
157163
)
158164

159-
By("update service to original spec")
160-
serviceYaml, err = s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
161-
Expect(err).NotTo(HaveOccurred(), "getting service yaml")
162-
err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
163-
Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
164-
k8sservice.Spec = oldSpec
165-
newServiceYaml, err = yaml.Marshal(k8sservice)
166-
Expect(err).NotTo(HaveOccurred(), "marshalling service")
167-
err = s.CreateResourceFromString(string(newServiceYaml))
168-
Expect(err).NotTo(HaveOccurred(), "creating service")
165+
if framework.ProviderType == adc.BackendModeAPISIXStandalone {
166+
By("update service to original spec")
167+
serviceYaml, err := s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
168+
Expect(err).NotTo(HaveOccurred(), "getting service yaml")
169+
var k8sservice corev1.Service
170+
err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
171+
Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
172+
k8sservice.Spec = oldSpec
173+
newServiceYaml, err := yaml.Marshal(k8sservice)
174+
Expect(err).NotTo(HaveOccurred(), "marshalling service")
175+
err = s.CreateResourceFromString(string(newServiceYaml))
176+
Expect(err).NotTo(HaveOccurred(), "creating service")
177+
} else {
178+
By("scale up dataplane")
179+
s.Deployer.ScaleDataplane(1)
180+
}
169181

170182
By("check ApisixRoute status after scaling up")
171183
s.RetryAssertion(func() string {

0 commit comments

Comments
 (0)