upgrade go 1.21.5 (#10732)
* upgrade go 1.21.5 Signed-off-by: James Strong <strong.james.e@gmail.com> * update golang gha Signed-off-by: James Strong <strong.james.e@gmail.com> * supgrade golang lint ci to v1.55.2 * sfix all golang lint ci errors * sget a nginx build as well * srevert some e2e changes * srevert some e2e changes --------- Signed-off-by: James Strong <strong.james.e@gmail.com>
This commit is contained in:
parent
6152695c78
commit
6807537a70
26 changed files with 41 additions and 29 deletions
|
|
@ -425,6 +425,7 @@ http {
|
|||
f.EnsureIngress(ing2)
|
||||
|
||||
f.WaitForNginxServer(host, func(server string) bool {
|
||||
//nolint:goconst //server_name is a constant
|
||||
return strings.Contains(server, "server_name "+host)
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
|
|||
return strings.Contains(server, "grpc_pass grpc://upstream_balancer;")
|
||||
})
|
||||
|
||||
//nolint:goconst //string interpolation
|
||||
conn, err := grpc.Dial(f.GetNginxIP()+":443",
|
||||
grpc.WithTransportCredentials(
|
||||
credentials.NewTLS(&tls.Config{
|
||||
|
|
|
|||
|
|
@ -234,6 +234,7 @@ func (r *HTTPResponse) checkContentType(expectedType string, expectedCharset ...
|
|||
}
|
||||
|
||||
if mediaType != expectedType {
|
||||
//nolint:goconst //string interpolation
|
||||
r.chain.fail("\nexpected \"Content-Type\" header with %q media type,"+
|
||||
"\nbut got %q", expectedType, mediaType)
|
||||
return false
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ var _ = framework.IngressNginxDescribe("[Flag] disable-sync-events", func() {
|
|||
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
|
||||
})
|
||||
|
||||
//nolint:goconst //string interpolation
|
||||
events, err := f.KubeClientSet.CoreV1().Events(ing.Namespace).List(context.TODO(), metav1.ListOptions{FieldSelector: "reason=Sync,involvedObject.name=" + host})
|
||||
assert.Nil(ginkgo.GinkgoT(), err, "listing events")
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ var _ = framework.DescribeSetting("enable-real-ip", func() {
|
|||
|
||||
f.WaitForNginxServer(host,
|
||||
func(server string) bool {
|
||||
//nolint:goconst //already a const
|
||||
return strings.Contains(server, "server_name "+host) &&
|
||||
!strings.Contains(server, "proxy_set_header X-Forwarded-Proto $full_x_forwarded_proto;")
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue