Skip to content

Commit 5a947ca

Browse files
author
lijianguo
committed
chore(builder): upgrade go.sum fix conflict
2 parents 6f23881 + 4628777 commit 5a947ca

4 files changed

Lines changed: 5 additions & 3 deletions

File tree

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
[![codecov](https://codecov.io/gh/drycc/builder/branch/master/graph/badge.svg)](https://codecov.io/gh/drycc/builder)
66
[![Go Report Card](https://goreportcard.com/badge/github.com/drycc/builder)](https://goreportcard.com/report/github.com/drycc/builder)
77
[![codebeat badge](https://codebeat.co/badges/0507e5d5-163b-4280-84ea-83bd2e0c8e41)](https://codebeat.co/projects/github-com-drycc-builder-master)
8-
[![Docker Repository on Quay](https://quay.io/repository/drycc/builder/status "Docker Repository on Quay")](https://quay.io/repository/drycc/builder)
98

109
Drycc - A Fork of Drycc Workflow
1110

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ require (
2020
k8s.io/api v0.18.6
2121
k8s.io/apimachinery v0.18.6
2222
k8s.io/client-go v0.18.6
23-
)
23+
)

go.sum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,4 +264,4 @@ sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJ
264264
sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
265265
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
266266
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
267-
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
267+
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

pkg/sshd/server_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ func clientConfig() *ssh.ClientConfig {
4343
Auth: []ssh.AuthMethod{
4444
ssh.Password("password"),
4545
},
46+
HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
47+
return nil
48+
},
4649
}
4750
}
4851

0 commit comments

Comments
 (0)