Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GOLANG=golang:1.23.6-alpine3.21
ARG GOLANG=golang:1.24.2-alpine3.21
FROM ${GOLANG}

# Set proxy environment variables
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.local
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GOLANG=golang:1.23.6-alpine3.20
ARG GOLANG=golang:1.24.2-alpine3.21
FROM ${GOLANG} AS infra

ARG http_proxy
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GOLANG=golang:1.23.6-alpine3.21
ARG GOLANG=golang:1.24.2-alpine3.21
FROM ${GOLANG}

COPY --from=plugins/manifest:1.2.3 /bin/* /bin/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GOLANG=golang:1.23.6-alpine3.21
ARG GOLANG=golang:1.24.2-alpine3.21
FROM ${GOLANG} AS test-base

RUN apk -U --no-cache add bash jq
Expand Down
136 changes: 69 additions & 67 deletions go.mod

Large diffs are not rendered by default.

197 changes: 100 additions & 97 deletions go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pkg/cli/cert/cert.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/clientaccess/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion pkg/node/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/util/args_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
})
}
Expand Down
4 changes: 2 additions & 2 deletions scripts/binary_size_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ if [ "${DEBUG}" = 1 ]; then
set -x
fi

# Try to keep the K3s binary under 70 megabytes.
# Try to keep the K3s binary under 80 megabytes.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

75 or 80?

# "64M ought to be enough for anybody"
MAX_BINARY_MB=70
MAX_BINARY_MB=75
MAX_BINARY_SIZE=$((MAX_BINARY_MB * 1024 * 1024))
BIN_SUFFIX="-${ARCH}"
if [ ${ARCH} = amd64 ]; then
Expand Down
Loading