Skip to content

Commit

Permalink
chore: bump dependencies
Browse files Browse the repository at this point in the history
dependabot + go-mo-outdate - dependencies we should hold.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
  • Loading branch information
smira committed Jan 18, 2022
1 parent b30fbe4 commit 194e870
Show file tree
Hide file tree
Showing 7 changed files with 205 additions and 108 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ COPY --from=generate-build /src/app/caps-controller-manager/api ./app/caps-contr
COPY --from=generate-build /src/app/sidero-controller-manager/api ./app/sidero-controller-manager/api
COPY --from=generate-build /src/app/sidero-controller-manager/internal/api ./app/sidero-controller-manager/internal/api

FROM --platform=${BUILDPLATFORM} alpine:3.14 AS release-build
FROM --platform=${BUILDPLATFORM} alpine:3.15.0 AS release-build
ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.1.0/kustomize_v4.1.0_linux_amd64.tar.gz .
RUN tar -xf kustomize_v4.1.0_linux_amd64.tar.gz -C /usr/local/bin && rm kustomize_v4.1.0_linux_amd64.tar.gz
COPY ./config ./config
Expand Down Expand Up @@ -253,7 +253,7 @@ COPY --from=fmt-build /src /
#
# The markdownlint target performs linting on Markdown files.
#
FROM node:17.1.0-alpine AS lint-markdown
FROM node:17.3.1-alpine AS lint-markdown
RUN apk add --no-cache findutils
RUN npm i -g markdownlint-cli@0.23.2
RUN npm i -g textlint@11.7.6
Expand Down
6 changes: 5 additions & 1 deletion app/sidero-controller-manager/cmd/agent/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"golang.org/x/sync/errgroup"
"golang.org/x/sys/unix"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
"github.com/talos-systems/sidero/app/sidero-controller-manager/internal/api"
Expand Down Expand Up @@ -208,7 +209,10 @@ func connect(ctx context.Context, endpoint string) (*grpc.ClientConn, error) {
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()

return grpc.DialContext(ctx, endpoint, grpc.WithInsecure())
return grpc.DialContext(ctx,
endpoint,
grpc.WithTransportCredentials(insecure.NewCredentials()),
)
}

func mainFunc() error {
Expand Down
3 changes: 2 additions & 1 deletion app/sidero-controller-manager/internal/server/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/talos-systems/grpc-proxy/proxy"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"

Expand Down Expand Up @@ -57,7 +58,7 @@ func (b *backend) GetConnection(ctx context.Context) (context.Context, *grpc.Cli
b.conn, err = grpc.DialContext(
ctx,
b.target,
grpc.WithInsecure(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithCodec(proxy.Codec()), //nolint:staticcheck
)

Expand Down
24 changes: 12 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.5.1
github.com/talos-systems/cluster-api-control-plane-provider-talos v0.4.1
github.com/talos-systems/cluster-api-control-plane-provider-talos v0.4.3
github.com/talos-systems/go-blockdevice v0.2.5
github.com/talos-systems/go-debug v0.2.1
github.com/talos-systems/go-kmsg v0.1.1
Expand All @@ -28,12 +28,12 @@ require (
github.com/talos-systems/net v0.3.1
github.com/talos-systems/siderolink v0.1.1-0.20211130121818-9902ad2774f0
github.com/talos-systems/talos/pkg/machinery v0.14.0
go.uber.org/zap v1.19.0
golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c
go.uber.org/zap v1.20.0
golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211109202428-0073765f69ba
google.golang.org/grpc v1.42.0
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211230205640-daad0b7ba671
google.golang.org/grpc v1.43.0
google.golang.org/protobuf v1.27.1
inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
k8s.io/api v0.22.2
Expand Down Expand Up @@ -77,7 +77,7 @@ require (
github.com/json-iterator/go v1.1.11 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60 // indirect
github.com/mdlayher/genetlink v1.0.0 // indirect
github.com/mdlayher/genetlink v1.1.0 // indirect
github.com/mdlayher/netlink v1.4.2 // indirect
github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -97,17 +97,17 @@ require (
go.uber.org/multierr v1.7.0 // indirect
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/tools v0.1.7 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.zx2c4.com/go118/netip v0.0.0-20211106132939-9d41d90554dd // indirect
golang.zx2c4.com/go118/netip v0.0.0-20211111135330-a4a02eeacf9d // indirect
golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect
golang.zx2c4.com/wireguard v0.0.0-20211109020618-685490f568cf // indirect
golang.zx2c4.com/wireguard v0.0.0-20211129173154-2dd424e2d808 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9 // indirect
Expand Down

0 comments on commit 194e870

Please sign in to comment.