Skip to content

Bump Go to v1.23 and replace deprecated io/ioutil package #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump Go to v1.23 and replace deprecated io/ioutil package #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97fd528
bump go and pin jsonnet
jakubhajek May 30, 2025
06c05ca
bump go to v1.23
jakubhajek May 30, 2025
be281c7
remove depracecated io/ioutil package
jakubhajek May 30, 2025
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
10 changes: 5 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 AS base
FROM golang:1.23 AS base

ENV GO111MODULE=on
WORKDIR /app
Expand All @@ -17,12 +17,12 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
-ldflags='-s -w -extldflags "-static"' \
-o k8s-gen .

FROM golang:1.20-alpine3.18 AS jsonnet
FROM golang:1.23-alpine AS jsonnet

RUN apk add --no-cache git
RUN go install github.com/google/go-jsonnet/cmd/jsonnet@v0.20.0
RUN go install github.com/google/go-jsonnet/cmd/jsonnet@v0.21.0

FROM alpine:3.18
FROM alpine:3.20

WORKDIR /app

Expand All @@ -37,4 +37,4 @@ COPY scripts .
COPY jsonnet jsonnet
COPY LICENSE .

ENTRYPOINT ["./gen.sh"]
ENTRYPOINT ["./gen.sh"]
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jsonnet-libs/k8s

go 1.20
go 1.23

require (
github.com/fatih/camelcase v1.0.0
Expand Down
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-jsonnet v0.20.0 h1:WG4TTSARuV7bSm4PMB4ohjxe33IHT5WVTrJSU33uT4g=
github.com/google/go-jsonnet v0.20.0/go.mod h1:VbgWF9JX7ztlv770x/TolZNGGFfiHEVx9G6ca2eUmeA=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
Expand Down
9 changes: 4 additions & 5 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package main

import (
"fmt"
"io/ioutil"
"log"
"os"
"path/filepath"
Expand Down Expand Up @@ -101,7 +100,7 @@ func hasStr(slice []string, s string) bool {
}

func loadConfig(file string) Config {
data, err := ioutil.ReadFile(file)
data, err := os.ReadFile(file)
if err != nil {
log.Fatalln(err)
}
Expand Down Expand Up @@ -177,7 +176,7 @@ func writeJsonnet(to, data string) error {
return fmt.Errorf("%s: %s", err, data)
}

return ioutil.WriteFile(to, []byte(s), 0644)
return os.WriteFile(to, []byte(s), 0644)
}

func copyDirLibsonnet(dir, to string) ([]string, error) {
Expand All @@ -199,14 +198,14 @@ func copyDirLibsonnet(dir, to string) ([]string, error) {
})

for _, a := range adds {
content, err := ioutil.ReadFile(a)
content, err := os.ReadFile(a)
if err != nil {
return nil, err
}

a = filepath.Join(to, filepath.Base(a))
os.MkdirAll(filepath.Dir(a), os.ModePerm)
if err := ioutil.WriteFile(a, content, 0644); err != nil {
if err := os.WriteFile(a, content, 0644); err != nil {
return nil, err
}
}
Expand Down