6767 Context ("Ingress TLS" , func () {
6868 It ("Check if SSL resource was created" , func () {
6969 By ("create GatewayProxy" )
70- gatewayProxy := fmt .Sprintf (gatewayProxyYaml , framework . DashboardTLSEndpoint , s .AdminKey ())
70+ gatewayProxy := fmt .Sprintf (gatewayProxyYaml , s . Deployer . GetAdminEndpoint () , s .AdminKey ())
7171
7272 By ("create GatewayProxy" )
7373 err := s .CreateResourceFromStringWithNamespace (gatewayProxy , "default" )
@@ -131,7 +131,8 @@ spec:
131131 tls , err := s .DefaultDataplaneResource ().SSL ().List (context .Background ())
132132 assert .Nil (GinkgoT (), err , "list tls error" )
133133 assert .Len (GinkgoT (), tls , 1 , "tls number not expect" )
134- assert .Equal (GinkgoT (), Cert , tls [0 ].Cert , "tls cert not expect" )
134+ assert .Len (GinkgoT (), tls [0 ].Certificates , 1 , "length of certificates not expect" )
135+ assert .Equal (GinkgoT (), Cert , tls [0 ].Certificates [0 ].Certificate , "tls cert not expect" )
135136 assert .ElementsMatch (GinkgoT (), []string {host }, tls [0 ].Snis )
136137 })
137138 })
@@ -202,7 +203,7 @@ spec:
202203
203204 It ("Test IngressClass Selection" , func () {
204205 By ("create GatewayProxy" )
205- gatewayProxy := fmt .Sprintf (gatewayProxyYaml , framework . DashboardTLSEndpoint , s .AdminKey ())
206+ gatewayProxy := fmt .Sprintf (gatewayProxyYaml , s . Deployer . GetAdminEndpoint () , s .AdminKey ())
206207 err := s .CreateResourceFromStringWithNamespace (gatewayProxy , "default" )
207208 Expect (err ).NotTo (HaveOccurred (), "creating GatewayProxy" )
208209 time .Sleep (5 * time .Second )
@@ -227,7 +228,7 @@ spec:
227228
228229 It ("Proxy External Service" , func () {
229230 By ("create GatewayProxy" )
230- gatewayProxy := fmt .Sprintf (gatewayProxyYaml , framework . DashboardTLSEndpoint , s .AdminKey ())
231+ gatewayProxy := fmt .Sprintf (gatewayProxyYaml , s . Deployer . GetAdminEndpoint () , s .AdminKey ())
231232 err := s .CreateResourceFromStringWithNamespace (gatewayProxy , "default" )
232233 Expect (err ).NotTo (HaveOccurred (), "creating GatewayProxy" )
233234 time .Sleep (5 * time .Second )
@@ -252,7 +253,7 @@ spec:
252253
253254 It ("Delete Ingress during restart" , func () {
254255 By ("create GatewayProxy" )
255- gatewayProxy := fmt .Sprintf (gatewayProxyYaml , framework . DashboardTLSEndpoint , s .AdminKey ())
256+ gatewayProxy := fmt .Sprintf (gatewayProxyYaml , s . Deployer . GetAdminEndpoint () , s .AdminKey ())
256257 err := s .CreateResourceFromStringWithNamespace (gatewayProxy , "default" )
257258 Expect (err ).NotTo (HaveOccurred (), "creating GatewayProxy" )
258259 time .Sleep (5 * time .Second )
@@ -434,7 +435,7 @@ spec:
434435
435436 It ("Test IngressClass with GatewayProxy" , func () {
436437 By ("create GatewayProxy" )
437- gatewayProxy := fmt .Sprintf (gatewayProxyYaml , framework . DashboardTLSEndpoint , s .AdminKey ())
438+ gatewayProxy := fmt .Sprintf (gatewayProxyYaml , s . Deployer . GetAdminEndpoint () , s .AdminKey ())
438439
439440 By ("create GatewayProxy" )
440441 err := s .CreateResourceFromStringWithNamespace (gatewayProxy , "default" )
@@ -477,7 +478,7 @@ stringData:
477478 time .Sleep (5 * time .Second )
478479
479480 By ("create GatewayProxy with Secret reference" )
480- gatewayProxy := fmt .Sprintf (gatewayProxyWithSecretYaml , framework . DashboardTLSEndpoint )
481+ gatewayProxy := fmt .Sprintf (gatewayProxyWithSecretYaml , s . Deployer . GetAdminEndpoint () )
481482 err = s .CreateResourceFromStringWithNamespace (gatewayProxy , "default" )
482483 Expect (err ).NotTo (HaveOccurred (), "creating GatewayProxy with Secret" )
483484 time .Sleep (5 * time .Second )
@@ -520,7 +521,7 @@ spec:
520521 type: AdminKey
521522 adminKey:
522523 value: "%s"
523- ` , framework . DashboardTLSEndpoint , s .AdminKey ())
524+ ` , s . Deployer . GetAdminEndpoint () , s .AdminKey ())
524525 }
525526
526527 const ingressClassSpec = `
@@ -806,7 +807,7 @@ spec:
806807
807808 BeforeEach (func () {
808809 By ("create GatewayProxy" )
809- gatewayProxy := fmt .Sprintf (gatewayProxyYaml , framework . DashboardTLSEndpoint , s .AdminKey ())
810+ gatewayProxy := fmt .Sprintf (gatewayProxyYaml , s . Deployer . GetAdminEndpoint () , s .AdminKey ())
810811 err := s .CreateResourceFromStringWithNamespace (gatewayProxy , "default" )
811812 Expect (err ).NotTo (HaveOccurred (), "creating GatewayProxy" )
812813 time .Sleep (5 * time .Second )
@@ -848,7 +849,7 @@ spec:
848849 Expect (exists ).To (BeTrue (), "additional gateway group should exist" )
849850
850851 By ("update GatewayProxy with new admin key" )
851- updatedProxy := fmt .Sprintf (updatedGatewayProxy , framework . DashboardTLSEndpoint , resources .AdminAPIKey )
852+ updatedProxy := fmt .Sprintf (updatedGatewayProxy , s . Deployer . GetAdminEndpoint ( resources . DataplaneService ) , resources .AdminAPIKey )
852853 err = s .CreateResourceFromStringWithNamespace (updatedProxy , "default" )
853854 Expect (err ).NotTo (HaveOccurred (), "updating GatewayProxy" )
854855 time .Sleep (5 * time .Second )
@@ -940,7 +941,7 @@ spec:
940941 Expect (err ).NotTo (HaveOccurred (), "creating secret" )
941942
942943 By ("create GatewayProxy" )
943- err = s .CreateResourceFromStringWithNamespace (fmt .Sprintf (gatewayProxySpec , framework . DashboardTLSEndpoint ), s .Namespace ())
944+ err = s .CreateResourceFromStringWithNamespace (fmt .Sprintf (gatewayProxySpec , s . Deployer . GetAdminEndpoint () ), s .Namespace ())
944945 Expect (err ).NotTo (HaveOccurred (), "creating gateway proxy" )
945946
946947 By ("create IngressClass" )
0 commit comments