Skip to content

Commit

Permalink
Upgrade Golang to 1.22 and all dependencies to their latest state
Browse files Browse the repository at this point in the history
  • Loading branch information
markusthoemmes committed Mar 5, 2024
1 parent d8353e7 commit c96bfc1
Show file tree
Hide file tree
Showing 13 changed files with 329 additions and 1,006 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /go/src/github.com/digitalocean/flipop
COPY . /go/src/github.com/digitalocean/flipop
RUN go build -ldflags "-s -w -X github.com/digitalocean/flipop/pkg/version.Version=$FLIPOP_VERSION" ./cmd/flipop

FROM debian:buster-slim
FROM debian:bookworm-slim
WORKDIR /app
COPY --from=flipopbuilder /go/src/github.com/digitalocean/flipop/flipop /app/flipop
RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_IMAGE=docker.io/golang:1.13-buster
ARG GO_IMAGE=golang:1.22.0

FROM ${GO_IMAGE}

Expand All @@ -11,6 +11,4 @@ RUN go mod download

# k8s.io/code-generator
RUN cd /go && \
(GO111MODULE=off go get k8s.io/code-generator || true) && \
cd /go/src/k8s.io/code-generator && \
git checkout v0.20.5
go install k8s.io/code-generator@v0.20.5
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GO_VERSION := 1.16
GO_VERSION := 1.22
COMMIT ?= $(shell git rev-parse --short HEAD)
SHELL=/bin/bash -o pipefail

Expand All @@ -12,12 +12,12 @@ endif
# for local development.
dev-image:
docker build --no-cache -t flipop-dev -f Dockerfile.dev \
--build-arg=GO_IMAGE=docker.io/golang:$(GO_VERSION)-buster .
--build-arg=GO_IMAGE=golang:$(GO_VERSION) .

generate-k8s:
docker run -v $$(pwd):/go/src/github.com/digitalocean/flipop/ \
flipop-dev:latest \
/go/src/k8s.io/code-generator/generate-groups.sh \
"/go/pkg/mod/k8s.io/code-generator@v0.20.5/generate-groups.sh" \
all \
github.com/digitalocean/flipop/pkg/apis/flipop/generated \
github.com/digitalocean/flipop/pkg/apis \
Expand Down
105 changes: 85 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,25 +1,90 @@
module github.com/digitalocean/flipop

go 1.16
go 1.22

require (
github.com/cloudflare/cloudflare-go v0.15.0
github.com/digitalocean/godo v1.65.0
github.com/golang/mock v1.4.1
github.com/imdario/mergo v0.3.6 // indirect
github.com/mattn/go-isatty v0.0.10
github.com/onsi/gomega v1.8.1 // indirect
github.com/prometheus/client_golang v1.10.0
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.23.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v0.0.5
github.com/spf13/viper v1.6.1
github.com/stretchr/testify v1.7.0
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/api v0.20.5
k8s.io/apimachinery v0.20.5
k8s.io/client-go v0.20.5
github.com/cloudflare/cloudflare-go v0.89.0
github.com/digitalocean/godo v1.109.0
github.com/golang/mock v1.6.0
github.com/mattn/go-isatty v0.0.20
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_model v0.6.0
github.com/prometheus/common v0.49.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.9.0
golang.org/x/oauth2 v0.18.0
k8s.io/api v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.2
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo/v2 v2.15.0 // indirect
github.com/onsi/gomega v1.31.1 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.12
Loading

0 comments on commit c96bfc1

Please sign in to comment.