Skip to content

Commit

Permalink
chore: bump Go deps, tools, pkgs, alpine versions
Browse files Browse the repository at this point in the history
Resolves: #596, resolves: #595, resolves: #594,
resolves: #593, resolves: #588, resolves: #587,
resolves: #584, resolves: #581, resolves: #580,
resolves: #577, resolves: #576, resolves: #557

Signed-off-by: Artem Chernyshev <[email protected]>
  • Loading branch information
Unix4ever committed Oct 12, 2021
1 parent bb52e71 commit af646a7
Show file tree
Hide file tree
Showing 12 changed files with 254 additions and 199 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ENV CGO_ENABLED ${CGO_ENABLED}
ENV GOCACHE /.cache/go-build
ENV GOMODCACHE /.cache/mod
RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/[email protected]
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/[email protected].0
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/[email protected].3
RUN --mount=type=cache,target=/.cache go install mvdan.cc/gofumpt/[email protected]
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b /toolchain/bin v1.38.0
WORKDIR /src
Expand Down Expand Up @@ -226,7 +226,7 @@ COPY --from=fmt-build /src /
#
# The markdownlint target performs linting on Markdown files.
#
FROM node:16.6.1-alpine AS lint-markdown
FROM node:16.10.0-alpine AS lint-markdown
RUN apk add --no-cache findutils
RUN npm i -g [email protected]
RUN npm i -g [email protected]
Expand Down
11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,11 @@ MODULE := $(shell head -1 go.mod | cut -d' ' -f2)

ARTIFACTS := _out
TEST_PKGS ?= ./...
TALOS_RELEASE ?= v0.12.3
TALOS_RELEASE ?= v0.13.0
DEFAULT_K8S_VERSION ?= v1.22.2

CONTROLLER_GEN_VERSION ?= v0.6.2
CONVERSION_GEN_VERSION ?= v0.21.3

TOOLS ?= ghcr.io/talos-systems/tools:v0.6.0
PKGS ?= v0.6.0
TOOLS ?= ghcr.io/talos-systems/tools:v0.8.0
PKGS ?= v0.8.0

SFYRA_CLUSTERCTL_CONFIG ?= $(HOME)/.cluster-api/clusterctl.sfyra.yaml

Expand Down Expand Up @@ -52,8 +49,6 @@ COMMON_ARGS += --build-arg=MODULE=$(MODULE)
COMMON_ARGS += --build-arg=TEST_PKGS=$(TEST_PKGS)
COMMON_ARGS += --build-arg=PKGS=$(PKGS)
COMMON_ARGS += --build-arg=TOOLS=$(TOOLS)
COMMON_ARGS += --build-arg=CONTROLLER_GEN_VERSION=$(CONTROLLER_GEN_VERSION)
COMMON_ARGS += --build-arg=CONVERSION_GEN_VERSION=$(CONVERSION_GEN_VERSION)
COMMON_ARGS += --build-arg=TALOS_RELEASE=$(TALOS_RELEASE)
COMMON_ARGS += --build-arg=DEFAULT_K8S_VERSION=$(DEFAULT_K8S_VERSION)
COMMON_ARGS += --build-arg=CGO_ENABLED=$(CGO_ENABLED)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/sidero-controller-manager/internal/api/api.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions app/sidero-controller-manager/internal/api/api_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ require (
github.com/go-logr/logr v0.4.0
github.com/hashicorp/go-multierror v1.1.1
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.15.0
github.com/onsi/gomega v1.16.0
github.com/pensando/goipmi v0.0.0-20200303170213-e858ec1cf0b5
github.com/pin/tftp v2.1.1-0.20200117065540-2f79be2dba4e+incompatible
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.4.0-alpha.0
github.com/talos-systems/cluster-api-control-plane-provider-talos v0.3.0-alpha.0
github.com/talos-systems/go-blockdevice v0.2.3
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.4.0
github.com/talos-systems/cluster-api-control-plane-provider-talos v0.3.0
github.com/talos-systems/go-blockdevice v0.2.4
github.com/talos-systems/go-debug v0.2.1
github.com/talos-systems/go-kmsg v0.1.1
github.com/talos-systems/go-procfs v0.0.0-20210108152626-8cbc42d3dc24
github.com/talos-systems/go-retry v0.3.1
github.com/talos-systems/go-smbios v0.0.0-20210422124317-d3a32bea731a
github.com/talos-systems/net v0.3.0
github.com/talos-systems/talos/pkg/machinery v0.12.3
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
github.com/talos-systems/talos/pkg/machinery v0.13.0
golang.org/x/net v0.0.0-20210716203947-853a461950ff
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
google.golang.org/grpc v1.40.0
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6
google.golang.org/grpc v1.41.0
google.golang.org/protobuf v1.27.1
k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
k8s.io/api v0.22.2
k8s.io/apiextensions-apiserver v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/client-go v0.22.2
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
sigs.k8s.io/cluster-api v0.4.3
sigs.k8s.io/controller-runtime v0.9.7
Expand Down
Loading

0 comments on commit af646a7

Please sign in to comment.