Skip to content

Commit 7ac5b4e

Browse files
committed
bump golang, redis
1 parent aa6bdd4 commit 7ac5b4e

8 files changed

Lines changed: 74 additions & 513 deletions

File tree

charts/inventor/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
22
name: inventor
3-
version: 0.1.1
3+
version: 0.2.0
44
sources:
55
- https://github.com/shcherbak/inventor

charts/inventor/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ secret:
1313
SD_TOKEN: 'ChangeMe'
1414

1515
main:
16-
image: "ghcr.io/code-tool/inventor/inventor:0.1.1"
16+
image: "ghcr.io/code-tool/inventor/inventor:0.2.0"
1717
pullPolicy: "IfNotPresent"
1818

1919
redis:
2020
enabled: true
21-
image: "redis:7.2.12"
21+
image: "redis:8.2.3"
2222
pullPolicy: "IfNotPresent"
2323

2424
service:

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM golang:1.23.12-bookworm AS builder
2-
ARG BUILD_VERSION='1.2.3'
1+
FROM golang:1.25.5-trixie AS builder
2+
ARG BUILD_VERSION='0.2.0'
33
ENV LISTEN_PORT=9101
44
WORKDIR /opt/inventor/
55
COPY go.mod ./
@@ -8,7 +8,7 @@ COPY src ./src
88
RUN go mod download
99
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-X main.buildVersion=${BUILD_VERSION}" -a -installsuffix cgo -o inventor src/main.go
1010

11-
FROM debian:bookworm
11+
FROM debian:trixie
1212
WORKDIR /opt/inventor/
1313
RUN apt-get update \
1414
&& apt-get install -y --no-install-recommends \

go.mod

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
module inventor
22

3-
go 1.23
3+
go 1.25
44

55
require (
6-
github.com/go-redis/redis/v9 v9.0.0-beta.2
7-
github.com/google/uuid v1.0.0
8-
github.com/joho/godotenv v1.4.0
9-
github.com/prometheus/client_golang v1.13.0
6+
github.com/google/uuid v1.6.0
7+
github.com/joho/godotenv v1.5.1
8+
github.com/prometheus/client_golang v1.23.2
9+
github.com/redis/go-redis/v9 v9.17.2
10+
github.com/golang/protobuf v1.5.4
1011
)
1112

1213
require (
1314
github.com/beorn7/perks v1.0.1 // indirect
14-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
15+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1516
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
16-
github.com/golang/protobuf v1.5.2 // indirect
17-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
18-
github.com/prometheus/client_model v0.2.0 // indirect
19-
github.com/prometheus/common v0.37.0 // indirect
20-
github.com/prometheus/procfs v0.8.0 // indirect
21-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
22-
google.golang.org/protobuf v1.28.1 // indirect
17+
github.com/kr/text v0.2.0 // indirect
18+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
19+
github.com/prometheus/client_model v0.6.2 // indirect
20+
github.com/prometheus/common v0.67.5 // indirect
21+
github.com/prometheus/procfs v0.19.2 // indirect
22+
go.yaml.in/yaml/v2 v2.4.3 // indirect
23+
golang.org/x/sys v0.40.0 // indirect
24+
google.golang.org/protobuf v1.36.11 // indirect
2325
)

go.sum

Lines changed: 49 additions & 491 deletions
Large diffs are not rendered by default.

src/handler/middleware.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010
"sync"
1111

12-
"github.com/go-redis/redis/v9"
1312
"github.com/google/uuid"
13+
"github.com/redis/go-redis/v9"
1414
)
1515

1616
type SDTargetsMiddleware struct {
@@ -23,6 +23,7 @@ type SDTargetsMiddleware struct {
2323
TTL int
2424
}
2525

26+
2627
type HttpSD struct {
2728
Targets []string `json:"targets"`
2829
Labels map[string]string `json:"labels"`

src/handler/targets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/go-redis/redis/v9"
1312
"github.com/google/uuid"
13+
"github.com/redis/go-redis/v9"
1414
)
1515

1616
type StaticConfig struct {

src/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/prometheus/client_golang/prometheus"
1919
"github.com/prometheus/client_golang/prometheus/promhttp"
2020

21-
"github.com/go-redis/redis/v9"
21+
"github.com/redis/go-redis/v9"
2222
)
2323

2424
var (

0 commit comments

Comments
 (0)