alt-orchestra/talos
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: update pkgs/tools (Go 1.19.4, containerd 1.6.11)

Browse Source 
Update to the latest pkgs/tools to fix the build due to vulncheck.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
This commit is contained in:
Andrey Smirnov 2022-12-09 16:38:14 +04:00
parent cf7adc51c9
commit f7a9a90db2
No known key found for this signature in database
GPG Key ID: 7B26396447AB6DFD
40 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -118,7 +118,8 @@ RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/deepc
ARG VTPROTOBUF_VERSION
RUN --mount=type=cache,target=/.cache go install github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto@${VTPROTOBUF_VERSION} \
&& mv /go/bin/protoc-gen-go-vtproto /toolchain/go/bin/protoc-gen-go-vtproto
RUN --mount=type=cache,target=/.cache go install golang.org/x/vuln/cmd/govulncheck@latest \
# fix vulncheck at a previous version, as it seems to break in the latest commits
RUN --mount=type=cache,target=/.cache go install golang.org/x/vuln/cmd/govulncheck@05fb7250142cc6010c39968839f2f3710afdd918 \
&& mv /go/bin/govulncheck /toolchain/go/bin/govulncheck
RUN --mount=type=cache,target=/.cache go install github.com/uber/prototool/cmd/prototool@v1.10.0 \
&& mv /go/bin/prototool /toolchain/go/bin/prototool

4
Makefile
View File

@ -13,8 +13,8 @@ DOCKER_LOGIN_ENABLED ?= true
NAME = Talos
ARTIFACTS := _out
TOOLS ?= ghcr.io/siderolabs/tools:v1.3.0
PKGS ?= v1.4.0-alpha.0
TOOLS ?= ghcr.io/siderolabs/tools:v1.4.0-alpha.0
PKGS ?= v1.4.0-alpha.0-2-g268ea7c
EXTRAS ?= v1.3.0
GO_VERSION ?= 1.19
GOIMPORTS_VERSION ?= v0.1.11

4
go.mod
View File

@ -34,7 +34,7 @@ require (
github.com/beevik/ntp v0.3.0
github.com/cenkalti/backoff/v4 v4.2.0
github.com/containerd/cgroups v1.0.4
github.com/containerd/containerd v1.6.10
github.com/containerd/containerd v1.6.11
github.com/containerd/typeurl v1.0.2
github.com/containernetworking/cni v1.1.2
github.com/containernetworking/plugins v1.1.1
@ -220,7 +220,7 @@ require (
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 // indirect
github.com/mdlayher/packet v1.1.0 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect

8
go.sum
View File

@ -228,8 +228,8 @@ github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09Zvgq
github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
github.com/containerd/containerd v1.6.10 h1:8aiav7I2ZyQLbTlNMcBXyAU1FtFvp6VuyuW13qSd6Hk=
github.com/containerd/containerd v1.6.10/go.mod h1:CVqfxdJ95PDgORwA219AwwLrREZgrTFybXu2HfMKRG0=
github.com/containerd/containerd v1.6.11 h1:uIn0uKrRhETIPyAb0lz6WY2xhYBObUOF1bBi5rqZ5x4=
github.com/containerd/containerd v1.6.11/go.mod h1:K4Bw7gjgh4TnkmQY+py/PYQGp4e7xgnHAeg87VeWb3A=
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
@ -752,8 +752,8 @@ github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vq
github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM=
github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
github.com/mdlayher/arp v0.0.0-20220512170110-6706a2966875 h1:ql8x//rJsHMjS+qqEag8n3i4azw1QneKh5PieH9UEbY=
github.com/mdlayher/arp v0.0.0-20220512170110-6706a2966875/go.mod h1:kfOoFJuHWp76v1RgZCb9/gVUc7XdY877S2uVYbNliGc=

2
pkg/machinery/api/cluster/cluster.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: cluster/cluster.proto
package cluster

2
pkg/machinery/api/cluster/cluster_grpc.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.21.9
// - protoc v3.21.10
// source: cluster/cluster.proto
package cluster

2
pkg/machinery/api/common/common.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: common/common.proto
package common

2
pkg/machinery/api/inspect/inspect.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: inspect/inspect.proto
package inspect

2
pkg/machinery/api/inspect/inspect_grpc.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.21.9
// - protoc v3.21.10
// source: inspect/inspect.proto
package inspect

2
pkg/machinery/api/machine/machine.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: machine/machine.proto
package machine

2
pkg/machinery/api/machine/machine_grpc.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.21.9
// - protoc v3.21.10
// source: machine/machine.proto
package machine

2
pkg/machinery/api/resource/config/config.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/config/config.proto
package config

2
pkg/machinery/api/resource/definitions/cluster/cluster.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/cluster/cluster.proto
package cluster

2
pkg/machinery/api/resource/definitions/cri/cri.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/cri/cri.proto
package cri

2
pkg/machinery/api/resource/definitions/enums/enums.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/enums/enums.proto
package enums

2
pkg/machinery/api/resource/definitions/etcd/etcd.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/etcd/etcd.proto
package etcd

2
pkg/machinery/api/resource/definitions/extensions/extensions.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/extensions/extensions.proto
package extensions

2
pkg/machinery/api/resource/definitions/files/files.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/files/files.proto
package files

2
pkg/machinery/api/resource/definitions/hardware/hardware.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/hardware/hardware.proto
package hardware

2
pkg/machinery/api/resource/definitions/k8s/k8s.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/k8s/k8s.proto
package k8s

2
pkg/machinery/api/resource/definitions/kubeaccess/kubeaccess.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/kubeaccess/kubeaccess.proto
package kubeaccess

2
pkg/machinery/api/resource/definitions/kubespan/kubespan.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/kubespan/kubespan.proto
package kubespan

2
pkg/machinery/api/resource/definitions/network/network.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/network/network.proto
package network

2
pkg/machinery/api/resource/definitions/perf/perf.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/perf/perf.proto
package perf

2
pkg/machinery/api/resource/definitions/proto/proto.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/proto/proto.proto
package proto

2
pkg/machinery/api/resource/definitions/runtime/runtime.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/runtime/runtime.proto
package runtime

2
pkg/machinery/api/resource/definitions/secrets/secrets.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/secrets/secrets.proto
package secrets

2
pkg/machinery/api/resource/definitions/time/time.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/time/time.proto
package time

2
pkg/machinery/api/resource/definitions/v1alpha1/v1alpha1.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/definitions/v1alpha1/v1alpha1.proto
package v1alpha1

2
pkg/machinery/api/resource/network/device_config.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/network/device_config.proto
package network

2
pkg/machinery/api/resource/resource.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: resource/resource.proto
package resource

2
pkg/machinery/api/resource/resource_grpc.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.21.9
// - protoc v3.21.10
// source: resource/resource.proto
package resource

2
pkg/machinery/api/security/security.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: security/security.proto
package security

2
pkg/machinery/api/security/security_grpc.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.21.9
// - protoc v3.21.10
// source: security/security.proto
package security

2
pkg/machinery/api/storage/storage.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: storage/storage.proto
package storage

2
pkg/machinery/api/storage/storage_grpc.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.21.9
// - protoc v3.21.10
// source: storage/storage.proto
package storage

2
pkg/machinery/api/time/time.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
// protoc v3.21.9
// protoc v3.21.10
// source: time/time.proto
package time

2
pkg/machinery/api/time/time_grpc.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.21.9
// - protoc v3.21.10
// source: time/time.proto
package time

6
pkg/machinery/constants/constants.go
View File

@ -13,7 +13,7 @@ import (
const (
// DefaultKernelVersion is the default Linux kernel version.
DefaultKernelVersion = "5.15.81-talos"
DefaultKernelVersion = "5.15.82-talos"
// KernelParamConfig is the kernel parameter name for specifying the URL.
// to the config.
@ -423,7 +423,7 @@ const (
TrustdUserID = 51
// DefaultContainerdVersion is the default container runtime version.
DefaultContainerdVersion = "1.6.10"
DefaultContainerdVersion = "1.6.11"
// SystemContainerdNamespace is the Containerd namespace for Talos services.
SystemContainerdNamespace = "system"
@ -722,7 +722,7 @@ const (
DBusClientSocketPath = "/run/dbus/system_bus_socket"
// GoVersion is the version of Go compiler this release was built with.
GoVersion = "go1.19.3"
GoVersion = "go1.19.4"
// KubernetesTalosAPIServiceName is the name of the Kubernetes service to access Talos API.
KubernetesTalosAPIServiceName = "talos"

2
pkg/machinery/gendata/data/pkgs
View File

@ -1 +1 @@
v1.4.0-alpha.0
v1.4.0-alpha.0-2-g268ea7c