Skip to content

Commit 1f89310

Browse files
ronethingronething
committed
chore: remove some comment about dashboard
Signed-off-by: ashing <[email protected]>
1 parent 3226d01 commit 1f89310

File tree

4 files changed

+59
-59
lines changed

4 files changed

+59
-59
lines changed

‎internal/provider/adc/translator/gateway.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (t *Translator) translateSecret(tctx *provider.TranslateContext, listener g
102102
Certificate: string(cert),
103103
Key: string(key),
104104
})
105-
// Dashboard doesn't allow wildcard hostname
105+
// we doesn't allow wildcard hostname
106106
if listener.Hostname != nil && *listener.Hostname != "" {
107107
sslObj.Snis = append(sslObj.Snis, string(*listener.Hostname))
108108
} else {
@@ -116,7 +116,7 @@ func (t *Translator) translateSecret(tctx *provider.TranslateContext, listener g
116116
}
117117
sslObj.Snis = append(sslObj.Snis, hosts...)
118118
}
119-
// Note: Dashboard doesn't allow duplicate certificate across ssl objects
119+
// Note: use cert as id to avoid duplicate certificate across ssl objects
120120
sslObj.ID = id.GenID(string(cert))
121121
log.Debugw("generated ssl id", zap.String("ssl id", sslObj.ID), zap.String("secret", secret.Namespace+"/"+secret.Name))
122122
sslObj.Labels = label.GenLabel(obj)

‎test/e2e/framework/api7_consts.go‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -30,59 +30,3 @@ const (
3030
DashboardTLSEndpoint = "https://api7ee3-dashboard.api7-ee-e2e:7443"
3131
DPManagerTLSEndpoint = "https://api7ee3-dp-manager.api7-ee-e2e:7943"
3232
)
33-
34-
var (
35-
//go:embed manifests/cert.pem
36-
TestServerCert string
37-
//go:embed manifests/key.pem
38-
TestServerKey string
39-
)
40-
41-
const (
42-
TestCert = `-----BEGIN CERTIFICATE-----
43-
MIIC1TCCAb2gAwIBAgIJANm/NDY0xwZUMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
44-
BAMTD3d3dy5leGFtcGxlLmNvbTAeFw0yMTEyMjcwNzI0MTNaFw0zMTEyMjUwNzI0
45-
MTNaMBoxGDAWBgNVBAMTD3d3dy5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEB
46-
BQADggEPADCCAQoCggEBAPOeWroWLvnbzmRtvYsyRkFVePoMY3LvZqNaxCQpZHD6
47-
ra/fRDTem01YvJjm5qUwrn9YXKBUgcoTfA3vHGYFHE4lifdfCbxlb0otMCbEdEsX
48-
P8kOMszB5SlxIPiCLVhc1LOKmHDzzw7axrRStbgN/RJUQ9Fp1QXVAnvEMWcLNopD
49-
E7I148dkpHrxmjW8vuB7apWhcVW+QiOYn4rGyqoilhrL4nRCOJiCVqESMgPcu5dO
50-
Dxf6KcAVd/IMMFTQ/X4+e2dUJpYyhCe8ApnCqrumjfXKqIEfyyTCavKeQEfvPgK4
51-
PhP2BFpWrxRWkn4VVTxIxS0/EVJaAaC/4gmVMeYg+wUCAwEAAaMeMBwwGgYDVR0R
52-
BBMwEYIPd3d3LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQAKiJaa1FNC
53-
p9NwoJvGyhK5UO2Tci3H63xZs2tFj5UZGxAIqJSxVo80ExhUXuDAM3evryM193uz
54-
uNxbB/oIWEMNLBnacXQi8Evob14gkIwRmQ/iACSIGTupazBLwiZM6infPE2/OoYR
55-
YihMgeWtW9U4XOkRhm013GgueeWP8v1jtyB2p3hoLK5UcLOAhkAOaJZXLDW0rznx
56-
jkNC6NcjYvMHkm3bZYqGsRmZfNGvm5rM8s9c3n4MPgWlllt6RuMSimzIRQSKu2E4
57-
oGKUqgeOOf5BXunHEgkyOTYittlg6MRwBET6ymHjYvwz87Loot7ji2IomyP08jdS
58-
tYKdaDOJg+su
59-
-----END CERTIFICATE-----`
60-
61-
TestKey = `-----BEGIN RSA PRIVATE KEY-----
62-
MIIEowIBAAKCAQEA855auhYu+dvOZG29izJGQVV4+gxjcu9mo1rEJClkcPqtr99E
63-
NN6bTVi8mObmpTCuf1hcoFSByhN8De8cZgUcTiWJ918JvGVvSi0wJsR0Sxc/yQ4y
64-
zMHlKXEg+IItWFzUs4qYcPPPDtrGtFK1uA39ElRD0WnVBdUCe8QxZws2ikMTsjXj
65-
x2SkevGaNby+4HtqlaFxVb5CI5ifisbKqiKWGsvidEI4mIJWoRIyA9y7l04PF/op
66-
wBV38gwwVND9fj57Z1QmljKEJ7wCmcKqu6aN9cqogR/LJMJq8p5AR+8+Arg+E/YE
67-
WlavFFaSfhVVPEjFLT8RUloBoL/iCZUx5iD7BQIDAQABAoIBAGVBMQZdCANTh5IY
68-
RoqfR7IJ+3E6Su9Pb4J/zDwXdCa9GgmaK3gp+bSJKEII3l5UQIKvUDhXR2ac+Je2
69-
BUCl6SDV22UUfDBwnHPhGj1Ss98t95XyL80I3d1+pqyDNqOeWc2R0lBIFYxgA+yY
70-
3+xy6/d9TH6ylRaKdTDJ15qzf2SxMtR/SiXyILWU7xWiYxINoHh2IVDte/KlNa0q
71-
iCbIiyX1xdYmcD0rCEVxrWlo1XNjmyO/MPTBhJf/DyZhQNHBDJa2fWzbPOr1I+Nb
72-
vh0GiJVwhkENtucnjmt+jCLqTkTNAAv2mJ1DxbY/DcM+TgTxHmAlTpBM0bh3WsS9
73-
De8hefUCgYEA/b9LP0fVXTv1K/whKcgi0AW1GCcUrdWVrdN3/K+yPnEZBtl8VY5t
74-
SvQkJPkQsVFJWdZUdRDpHhqYFa0I6zIiNF7DbIxF+Ag+N7uiZ6xzP0L9k1wmgKR8
75-
PT47fJVuHECxgxexz9FGQwXH7eroJjLPEoxD2Z56COVIJOlYO6e9sXMCgYEA9cgK
76-
WxE2NsYIjrgOqs93GKYY+TmmoSHWiy1bl7p3sUolobPThSd31hdk6ZdMlPPbpr3+
77-
MYgZoFLud+3l+/6+tttGNNVkB6lkVXzd2WWG6xOrErRwYIz57yiWKGLeWg17jXXf
78-
zqjFNTLpd8U9lM8Lf/XNyfs2tU5oxkUD6teCo6cCgYAtwdMl5CQ7ndZGSj8Is8hj
79-
TsQrSNDX0A4fvGSEsoIn9GkY7RsYqohW3dOuvyMddpUNmDK+sX/4J7+JGRzknLPC
80-
UdxXtKvhYEsn7bQJkfVuUPw9GH7w77hfqts7Sg8DFT9tblZoLUrIR0CYTKX0TXE9
81-
3QFXOtayx/XMgi+hAkyYtQKBgQCtgKGO1/+levbfiR8RhZNVWyuWBBSU+wYxCbv2
82-
yDNmfClElWVkQhBemfUq0RvGqr8MXmLrJGCyxNiC4PXRhmurOe+9rEYJApNJpfQW
83-
W416tU+2zJnoDp0BL22Q5PqCJ7JokiWEBa/xdhdJ7XsjaWV811CGnUhphQiBroat
84-
aaVXUQKBgDXHbRmEBo/1fB4Gn7i2bjYOl1Z1e3klNvbdMT/ClNSFy8VsU3HP5XoL
85-
jnzTc80ABlT1PQgrnQxhPpL3wbkSyv0lux5mcM0U89KxpR/SLlvVFAag6UWODt53
86-
hhdq+X/vrgK+uicSx8Q1zL2iCLdfsZ0fPryMdTZrN3ytEBEWMPeX
87-
-----END RSA PRIVATE KEY-----`
88-
)

‎test/e2e/framework/apisix_consts.go‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,62 @@ var (
2525
APISIXStandaloneTpl *template.Template
2626
)
2727

28+
var (
29+
//go:embed manifests/cert.pem
30+
TestServerCert string
31+
//go:embed manifests/key.pem
32+
TestServerKey string
33+
)
34+
35+
const (
36+
TestCert = `-----BEGIN CERTIFICATE-----
37+
MIIC1TCCAb2gAwIBAgIJANm/NDY0xwZUMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
38+
BAMTD3d3dy5leGFtcGxlLmNvbTAeFw0yMTEyMjcwNzI0MTNaFw0zMTEyMjUwNzI0
39+
MTNaMBoxGDAWBgNVBAMTD3d3dy5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEB
40+
BQADggEPADCCAQoCggEBAPOeWroWLvnbzmRtvYsyRkFVePoMY3LvZqNaxCQpZHD6
41+
ra/fRDTem01YvJjm5qUwrn9YXKBUgcoTfA3vHGYFHE4lifdfCbxlb0otMCbEdEsX
42+
P8kOMszB5SlxIPiCLVhc1LOKmHDzzw7axrRStbgN/RJUQ9Fp1QXVAnvEMWcLNopD
43+
E7I148dkpHrxmjW8vuB7apWhcVW+QiOYn4rGyqoilhrL4nRCOJiCVqESMgPcu5dO
44+
Dxf6KcAVd/IMMFTQ/X4+e2dUJpYyhCe8ApnCqrumjfXKqIEfyyTCavKeQEfvPgK4
45+
PhP2BFpWrxRWkn4VVTxIxS0/EVJaAaC/4gmVMeYg+wUCAwEAAaMeMBwwGgYDVR0R
46+
BBMwEYIPd3d3LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQAKiJaa1FNC
47+
p9NwoJvGyhK5UO2Tci3H63xZs2tFj5UZGxAIqJSxVo80ExhUXuDAM3evryM193uz
48+
uNxbB/oIWEMNLBnacXQi8Evob14gkIwRmQ/iACSIGTupazBLwiZM6infPE2/OoYR
49+
YihMgeWtW9U4XOkRhm013GgueeWP8v1jtyB2p3hoLK5UcLOAhkAOaJZXLDW0rznx
50+
jkNC6NcjYvMHkm3bZYqGsRmZfNGvm5rM8s9c3n4MPgWlllt6RuMSimzIRQSKu2E4
51+
oGKUqgeOOf5BXunHEgkyOTYittlg6MRwBET6ymHjYvwz87Loot7ji2IomyP08jdS
52+
tYKdaDOJg+su
53+
-----END CERTIFICATE-----`
54+
55+
TestKey = `-----BEGIN RSA PRIVATE KEY-----
56+
MIIEowIBAAKCAQEA855auhYu+dvOZG29izJGQVV4+gxjcu9mo1rEJClkcPqtr99E
57+
NN6bTVi8mObmpTCuf1hcoFSByhN8De8cZgUcTiWJ918JvGVvSi0wJsR0Sxc/yQ4y
58+
zMHlKXEg+IItWFzUs4qYcPPPDtrGtFK1uA39ElRD0WnVBdUCe8QxZws2ikMTsjXj
59+
x2SkevGaNby+4HtqlaFxVb5CI5ifisbKqiKWGsvidEI4mIJWoRIyA9y7l04PF/op
60+
wBV38gwwVND9fj57Z1QmljKEJ7wCmcKqu6aN9cqogR/LJMJq8p5AR+8+Arg+E/YE
61+
WlavFFaSfhVVPEjFLT8RUloBoL/iCZUx5iD7BQIDAQABAoIBAGVBMQZdCANTh5IY
62+
RoqfR7IJ+3E6Su9Pb4J/zDwXdCa9GgmaK3gp+bSJKEII3l5UQIKvUDhXR2ac+Je2
63+
BUCl6SDV22UUfDBwnHPhGj1Ss98t95XyL80I3d1+pqyDNqOeWc2R0lBIFYxgA+yY
64+
3+xy6/d9TH6ylRaKdTDJ15qzf2SxMtR/SiXyILWU7xWiYxINoHh2IVDte/KlNa0q
65+
iCbIiyX1xdYmcD0rCEVxrWlo1XNjmyO/MPTBhJf/DyZhQNHBDJa2fWzbPOr1I+Nb
66+
vh0GiJVwhkENtucnjmt+jCLqTkTNAAv2mJ1DxbY/DcM+TgTxHmAlTpBM0bh3WsS9
67+
De8hefUCgYEA/b9LP0fVXTv1K/whKcgi0AW1GCcUrdWVrdN3/K+yPnEZBtl8VY5t
68+
SvQkJPkQsVFJWdZUdRDpHhqYFa0I6zIiNF7DbIxF+Ag+N7uiZ6xzP0L9k1wmgKR8
69+
PT47fJVuHECxgxexz9FGQwXH7eroJjLPEoxD2Z56COVIJOlYO6e9sXMCgYEA9cgK
70+
WxE2NsYIjrgOqs93GKYY+TmmoSHWiy1bl7p3sUolobPThSd31hdk6ZdMlPPbpr3+
71+
MYgZoFLud+3l+/6+tttGNNVkB6lkVXzd2WWG6xOrErRwYIz57yiWKGLeWg17jXXf
72+
zqjFNTLpd8U9lM8Lf/XNyfs2tU5oxkUD6teCo6cCgYAtwdMl5CQ7ndZGSj8Is8hj
73+
TsQrSNDX0A4fvGSEsoIn9GkY7RsYqohW3dOuvyMddpUNmDK+sX/4J7+JGRzknLPC
74+
UdxXtKvhYEsn7bQJkfVuUPw9GH7w77hfqts7Sg8DFT9tblZoLUrIR0CYTKX0TXE9
75+
3QFXOtayx/XMgi+hAkyYtQKBgQCtgKGO1/+levbfiR8RhZNVWyuWBBSU+wYxCbv2
76+
yDNmfClElWVkQhBemfUq0RvGqr8MXmLrJGCyxNiC4PXRhmurOe+9rEYJApNJpfQW
77+
W416tU+2zJnoDp0BL22Q5PqCJ7JokiWEBa/xdhdJ7XsjaWV811CGnUhphQiBroat
78+
aaVXUQKBgDXHbRmEBo/1fB4Gn7i2bjYOl1Z1e3klNvbdMT/ClNSFy8VsU3HP5XoL
79+
jnzTc80ABlT1PQgrnQxhPpL3wbkSyv0lux5mcM0U89KxpR/SLlvVFAag6UWODt53
80+
hhdq+X/vrgK+uicSx8Q1zL2iCLdfsZ0fPryMdTZrN3ytEBEWMPeX
81+
-----END RSA PRIVATE KEY-----`
82+
)
83+
2884
func init() {
2985
tpl, err := template.New("apisix-standalone").Funcs(sprig.TxtFuncMap()).Parse(apisixStandaloneTemplate)
3086
if err != nil {

‎test/e2e/gatewayapi/gateway.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ spec:
286286
Expect(err).NotTo(HaveOccurred(), "update secret")
287287
Eventually(func() string {
288288
tls, err := s.DefaultDataplaneResource().SSL().List(context.Background())
289-
Expect(err).NotTo(HaveOccurred(), "list ssl from dashboard")
289+
Expect(err).NotTo(HaveOccurred(), "list ssl")
290290
if len(tls) < 1 {
291291
return ""
292292
}

0 commit comments

Comments
 (0)