public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-29 00:39:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix prints that broke unit tests

Browse Source 
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Vitor Savian
2025-04-28 13:24:35 -03:00
committed by Brad Davidson
parent a4f870e60b
commit 8efef65aaf
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cli/cert/cert.go
View File

@@ -98,13 +98,13 @@ func check(app *cli.Context, cfg *cmds.Server) error {
switch outFmt {
case "text":
for service, files := range fileMap {
logrus.Info("Checking certificates for " + service)
logrus.Infof("Checking certificates for %s", service)
for _, file := range files {
// ignore errors, as some files may not exist, or may not contain certs.
// Only check whatever exists and has certs.
certs, err := certutil.CertsFromFile(file)
if err != nil {
logrus.Debugf(err.Error())
logrus.Debugf("%v", err)
continue
}
for _, cert := range certs {
@@ -130,7 +130,7 @@ func check(app *cli.Context, cfg *cmds.Server) error {
for _, file := range files {
certs, err := certutil.CertsFromFile(file)
if err != nil {
logrus.Debugf(err.Error())
logrus.Debugf("%v", err)
continue
}
for _, cert := range certs {

2
pkg/clientaccess/token.go
View File

@@ -538,7 +538,7 @@ func readBody(resp *http.Response) ([]byte, error) {
warnings, _ := net.ParseWarningHeaders(resp.Header["Warning"])
for _, warning := range warnings {
if warning.Code == 299 && len(warning.Text) != 0 {
logrus.Warnf(warning.Text)
logrus.Warnf("%s", warning.Text)
}
}

2
pkg/cluster/bootstrap.go
View File

@@ -348,7 +348,7 @@ func (c *Cluster) ReconcileBootstrapData(ctx context.Context, buf io.ReadSeeker,
serverTLSDir := filepath.Join(c.config.DataDir, "tls")
tlsBackupDir := filepath.Join(c.config.DataDir, "tls-"+strconv.Itoa(int(time.Now().Unix())))
logrus.Infof("Cluster reset: backing up certificates directory to " + tlsBackupDir)
logrus.Infof("Cluster reset: backing up certificates directory to %s", tlsBackupDir)
if _, err := os.Stat(serverTLSDir); err != nil {
return pkgerrors.WithMessage(err, "cluster reset failed to stat server TLS dir")

2
pkg/node/controller.go
View File

@@ -88,7 +88,7 @@ func (h *handler) updateCoreDNSConfigMap(nodeName, hostName, nodeIPv4, nodeIPv6
nodeIPv4 = ""
nodeIPv6 = ""
} else if nodeIPv4 == "" && nodeIPv6 == "" {
logrus.Errorf("No InternalIP addresses found for node " + nodeName)
logrus.Errorf("No InternalIP addresses found for node %s", nodeName)
return nil
}

2
pkg/util/args_test.go
View File

@@ -37,7 +37,7 @@ func Test_UnitAddFeatureGate(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
got := AddFeatureGate(tt.args.currentArg, tt.args.featureGate)
if got != tt.want {
t.Errorf("error, should be " + tt.want + ", but got " + got)
t.Errorf("error, should be %s, but got %s", tt.want, got)
}
})
}