Skip to content

Commit dc03cb4

Browse files
authored
Update k8s version to 1.33
* Update to 1.33 Signed-off-by: Vitor Savian <[email protected]> * Fix prints that broke unit tests Signed-off-by: Vitor Savian <[email protected]> * Change binary max size to 75 Signed-off-by: Vitor Savian <[email protected]> * Change containerd version to fix misspelling Signed-off-by: Vitor Savian <[email protected]> * Address binary size comment Signed-off-by: Vitor Savian <[email protected]> * Update Dependencies Signed-off-by: Vitor Savian <[email protected]> * Remove dependencie not used anymore Signed-off-by: Vitor Savian <[email protected]> --------- Signed-off-by: Vitor Savian <[email protected]>
1 parent eba91ff commit dc03cb4

File tree

12 files changed

+237
-226
lines changed

12 files changed

+237
-226
lines changed

Dockerfile.dapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG=golang:1.23.6-alpine3.21
1+
ARG GOLANG=golang:1.24.2-alpine3.21
22
FROM ${GOLANG}
33

44
# Set proxy environment variables

Dockerfile.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG=golang:1.23.6-alpine3.20
1+
ARG GOLANG=golang:1.24.2-alpine3.21
22
FROM ${GOLANG} AS infra
33

44
ARG http_proxy

Dockerfile.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG=golang:1.23.6-alpine3.21
1+
ARG GOLANG=golang:1.24.2-alpine3.21
22
FROM ${GOLANG}
33

44
COPY --from=plugins/manifest:1.2.3 /bin/* /bin/

Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG=golang:1.23.6-alpine3.21
1+
ARG GOLANG=golang:1.24.2-alpine3.21
22
FROM ${GOLANG} AS test-base
33

44
RUN apk -U --no-cache add bash jq

go.mod

Lines changed: 77 additions & 76 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 147 additions & 137 deletions
Large diffs are not rendered by default.

pkg/cli/cert/cert.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ func check(app *cli.Context, cfg *cmds.Server) error {
9898
switch outFmt {
9999
case "text":
100100
for service, files := range fileMap {
101-
logrus.Info("Checking certificates for " + service)
101+
logrus.Infof("Checking certificates for %s", service)
102102
for _, file := range files {
103103
// ignore errors, as some files may not exist, or may not contain certs.
104104
// Only check whatever exists and has certs.
105105
certs, err := certutil.CertsFromFile(file)
106106
if err != nil {
107-
logrus.Debugf(err.Error())
107+
logrus.Debugf("%v", err)
108108
continue
109109
}
110110
for _, cert := range certs {
@@ -130,7 +130,7 @@ func check(app *cli.Context, cfg *cmds.Server) error {
130130
for _, file := range files {
131131
certs, err := certutil.CertsFromFile(file)
132132
if err != nil {
133-
logrus.Debugf(err.Error())
133+
logrus.Debugf("%v", err)
134134
continue
135135
}
136136
for _, cert := range certs {

pkg/clientaccess/token.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ func readBody(resp *http.Response) ([]byte, error) {
538538
warnings, _ := net.ParseWarningHeaders(resp.Header["Warning"])
539539
for _, warning := range warnings {
540540
if warning.Code == 299 && len(warning.Text) != 0 {
541-
logrus.Warnf(warning.Text)
541+
logrus.Warnf("%s", warning.Text)
542542
}
543543
}
544544

pkg/cluster/bootstrap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ func (c *Cluster) ReconcileBootstrapData(ctx context.Context, buf io.ReadSeeker,
348348
serverTLSDir := filepath.Join(c.config.DataDir, "tls")
349349
tlsBackupDir := filepath.Join(c.config.DataDir, "tls-"+strconv.Itoa(int(time.Now().Unix())))
350350

351-
logrus.Infof("Cluster reset: backing up certificates directory to " + tlsBackupDir)
351+
logrus.Infof("Cluster reset: backing up certificates directory to %s", tlsBackupDir)
352352

353353
if _, err := os.Stat(serverTLSDir); err != nil {
354354
return pkgerrors.WithMessage(err, "cluster reset failed to stat server TLS dir")

pkg/node/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (h *handler) updateCoreDNSConfigMap(nodeName, hostName, nodeIPv4, nodeIPv6
8888
nodeIPv4 = ""
8989
nodeIPv6 = ""
9090
} else if nodeIPv4 == "" && nodeIPv6 == "" {
91-
logrus.Errorf("No InternalIP addresses found for node " + nodeName)
91+
logrus.Errorf("No InternalIP addresses found for node %s", nodeName)
9292
return nil
9393
}
9494

0 commit comments

Comments
 (0)