Skip to content

Commit 8c3d094

Browse files
bump go to v1.23, fix the metrics port hardcoding, fix the lint error in conditions.go
(cherry picked from commit 362eeeb)
1 parent ba86238 commit 8c3d094

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

Dockerfile.dapper

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.7
1+
FROM golang:1.23
22

33
ARG DAPPER_HOST_ARCH
44
ENV ARCH $DAPPER_HOST_ARCH
@@ -15,7 +15,7 @@ RUN apt update && \
1515
apt install -y bash git gcc docker.io vim less file curl wget ca-certificates qemu-utils
1616

1717
## install golangci
18-
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.59.1
18+
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.63.4
1919

2020
# The docker version in dapper is too old to have buildx. Install it manually.
2121
RUN curl -sSfL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-${ARCH} -o buildx-v0.13.1.linux-${ARCH} && \

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/harvester/seeder
22

3-
go 1.22.7
3+
go 1.23.4
44

55
require (
66
github.com/go-bindata/go-bindata/v3 v3.1.3

pkg/controllers/setup.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s *Server) Start(ctx context.Context) error {
6262
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
6363
Scheme: scheme,
6464
Metrics: server.Options{
65-
BindAddress: ":9080",
65+
BindAddress: s.MetricsAddress,
6666
},
6767
HealthProbeBindAddress: s.ProbeAddress,
6868
LeaderElection: s.EnableLeaderElection,

pkg/data/data.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/util/conditions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func CreateOrUpdateCondition(i *seederv1alpha1.Inventory, cond condition.Cond, m
2929

3030
func SetErrorCondition(i *seederv1alpha1.Inventory, cond condition.Cond, message string) {
3131
now := time.Now().UTC().Format(time.RFC3339)
32-
cond.SetError(i, "", fmt.Errorf(message))
32+
cond.SetError(i, "", fmt.Errorf("%s", message))
3333
cond.True(i)
3434
cond.LastUpdated(i, now)
3535
}

0 commit comments

Comments
 (0)