Skip to content

Commit

Permalink
chore: bump Talos to 0.11.5
Browse files Browse the repository at this point in the history 
This PR also fixes some variables passed in the tests to be based on
Makefile variables, so they are always in sync with the Talos version we
are testing with.

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
@smira @talos-bot
smira authored and talos-bot committed Aug 13, 2021
1 parent 8695371 commit f1c1608
Show file tree
Hide file tree
Showing 13 changed files with 72 additions and 54 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,11 @@ RUN --mount=type=cache,target=/.cache FILES="$(gofumports -l -local ${MODULE} .)
FROM sfyra-base AS sfyra-build
WORKDIR /src/sfyra/cmd/sfyra
ARG TALOS_RELEASE
ARG DEFAULT_K8S_VERSION
ARG SFYRA_CMD_PKG=github.com/talos-systems/sidero/sfyra/cmd/sfyra/cmd
ARG GO_BUILDFLAGS
ARG GO_LDFLAGS
RUN --mount=type=cache,target=/.cache GOOS=linux go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${SFYRA_CMD_PKG}.TalosRelease=${TALOS_RELEASE}" -o /sfyra
RUN --mount=type=cache,target=/.cache GOOS=linux go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${SFYRA_CMD_PKG}.TalosRelease=${TALOS_RELEASE} -X ${SFYRA_CMD_PKG}.KubernetesVersion=${DEFAULT_K8S_VERSION}" -o /sfyra
RUN chmod +x /sfyra

FROM scratch AS sfyra
Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ MODULE := $(shell head -1 go.mod | cut -d' ' -f2)

ARTIFACTS := _out
TEST_PKGS ?= ./...
TALOS_RELEASE ?= v0.11.0-beta.3
TALOS_RELEASE ?= v0.11.5
DEFAULT_K8S_VERSION ?= v1.21.3

TOOLS ?= ghcr.io/talos-systems/tools:v0.6.0
PKGS ?= v0.6.0
Expand Down Expand Up @@ -49,6 +50,7 @@ COMMON_ARGS += --build-arg=TEST_PKGS=$(TEST_PKGS)
COMMON_ARGS += --build-arg=PKGS=$(PKGS)
COMMON_ARGS += --build-arg=TOOLS=$(TOOLS)
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)
COMMON_ARGS += --build-arg=GO_BUILDFLAGS="$(GO_BUILDFLAGS)"
COMMON_ARGS += --build-arg=GO_LDFLAGS="$(GO_LDFLAGS)"
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ require (
github.com/stretchr/testify v1.7.0
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.2.0
github.com/talos-systems/cluster-api-control-plane-provider-talos v0.1.0
github.com/talos-systems/go-blockdevice v0.2.1
github.com/talos-systems/go-blockdevice v0.2.2
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.11.0-beta.3
github.com/talos-systems/talos/pkg/machinery v0.11.5
golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 // indirect
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,8 @@ github.com/talos-systems/crypto v0.2.1-0.20210427105118-4f80b976b640/go.mod h1:O
github.com/talos-systems/crypto v0.3.1 h1:TSUfwrN3+sAunR/e78pU8JMbBo9VDfS3fJtpMg7xQ6k=
github.com/talos-systems/crypto v0.3.1/go.mod h1:xaNCB2/Bxaj+qrkdeodhRv5eKQVvKOGBBMj58MrIPY8=
github.com/talos-systems/go-blockdevice v0.2.1-0.20210407132431-1d830a25f64f/go.mod h1:qnn/zDc09I1DA2BUDDCOSA2D0P8pIDjN8pGiRoRaQig=
github.com/talos-systems/go-blockdevice v0.2.1 h1:swoY5NcssuMgdCf/dlMngNDgEAasGp2jviPqAz9Epss=
github.com/talos-systems/go-blockdevice v0.2.1/go.mod h1:qnn/zDc09I1DA2BUDDCOSA2D0P8pIDjN8pGiRoRaQig=
github.com/talos-systems/go-blockdevice v0.2.2 h1:UHXN93Aj86uKjXJ5F6w/NgBbdzcAMhatRCgsRIgbJQ8=
github.com/talos-systems/go-blockdevice v0.2.2/go.mod h1:qnn/zDc09I1DA2BUDDCOSA2D0P8pIDjN8pGiRoRaQig=
github.com/talos-systems/go-cmd v0.0.0-20210216164758-68eb0067e0f0/go.mod h1:kf+rZzTEmlDiYQ6ulslvRONnKLQH8x83TowltGMhO+k=
github.com/talos-systems/go-debug v0.2.1 h1:VSN8P1zXWeHWgUBZn4cVT3keBcecCAJBG9Up+F6N2KM=
github.com/talos-systems/go-debug v0.2.1/go.mod h1:pR4NjsZQNFqGx3n4qkD4MIj1F2CxyIF8DCiO1+05JO0=
Expand All @@ -536,8 +536,8 @@ github.com/talos-systems/net v0.2.1-0.20210212213224-05190541b0fa/go.mod h1:VreS
github.com/talos-systems/net v0.3.0 h1:TG6PoiNdg9NmSeSjyecSgguUXzoJ8wp5a8RYlIdkq3Y=
github.com/talos-systems/net v0.3.0/go.mod h1:VreSAyRmxMtqussAHSKMKkJQa1YwBTSVfkmE4Jydam4=
github.com/talos-systems/talos/pkg/machinery v0.0.0-20210520203624-828772cec9a3/go.mod h1:aFEgwo1bYcfADnnUCndIb8hT00WYHYCy77pq9tYocF4=
github.com/talos-systems/talos/pkg/machinery v0.11.0-beta.3 h1:FcuM39G7NxrO7iPsIOfS/vgDWbCRhrzkdS+aGLU9aIk=
github.com/talos-systems/talos/pkg/machinery v0.11.0-beta.3/go.mod h1:TH99lX6IMJys9kgBJ6MNIOV0UsxmTVS0fUr7rP5KTac=
github.com/talos-systems/talos/pkg/machinery v0.11.5 h1:gCY6PLGykY7jjipUbgKTXF68pGs1J1KAiA75qbcxh6k=
github.com/talos-systems/talos/pkg/machinery v0.11.5/go.mod h1:9PBe4kF3ATr/3ORtrN/c+FQoNds+D0U6yol1gH7J/yE=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
Expand Down
7 changes: 5 additions & 2 deletions sfyra/cmd/sfyra/cmd/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@ type Options struct {
PowerSimulatedSilentFailureProb float64
}

// TalosRelease is set as build argument.
var TalosRelease string
// TalosRelease and KubernetesVersion are set as build arguments.
var (
TalosRelease string
KubernetesVersion string
)

// DefaultOptions returns default settings.
func DefaultOptions() Options {
Expand Down
3 changes: 3 additions & 0 deletions sfyra/cmd/sfyra/cmd/test_integration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ var testIntegrationCmd = &cobra.Command{
RegistryMirrors: options.RegistryMirrors,

RunTestPattern: runTestPattern,

TalosRelease: TalosRelease,
KubernetesVersion: KubernetesVersion,
}); !ok {
return fmt.Errorf("test failure")
}
Expand Down
18 changes: 9 additions & 9 deletions sfyra/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ go 1.16
replace (
github.com/talos-systems/sidero => ../

github.com/talos-systems/talos/pkg/machinery => github.com/talos-systems/talos/pkg/machinery v0.11.0-beta.3
github.com/talos-systems/talos/pkg/machinery => github.com/talos-systems/talos/pkg/machinery v0.11.5

// See https://github.com/talos-systems/go-loadbalancer/pull/4
// `go get github.com/smira/tcpproxy@combined-fixes`, then copy pseudo-version there
inet.af/tcpproxy => github.com/smira/tcpproxy v0.0.0-20201015133617-de5f7797b95b

// keep older versions of k8s.io packages to keep compatiblity with cluster-api
k8s.io/api v0.21.2 => k8s.io/api v0.20.5
k8s.io/apimachinery v0.21.2 => k8s.io/apimachinery v0.20.5
k8s.io/client-go v0.21.2 => k8s.io/client-go v0.20.5
k8s.io/api v0.21.3 => k8s.io/api v0.20.5
k8s.io/apimachinery v0.21.3 => k8s.io/apimachinery v0.20.5
k8s.io/client-go v0.21.3 => k8s.io/client-go v0.20.5

sigs.k8s.io/cluster-api v0.3.20 => sigs.k8s.io/cluster-api v0.3.9
)
Expand All @@ -30,14 +30,14 @@ require (
github.com/talos-systems/go-retry v0.3.1
github.com/talos-systems/net v0.3.0
github.com/talos-systems/sidero v0.0.0-00010101000000-000000000000
github.com/talos-systems/talos v0.11.0-beta.3
github.com/talos-systems/talos/pkg/machinery v0.11.0-beta.3
github.com/talos-systems/talos v0.11.5
github.com/talos-systems/talos/pkg/machinery v0.11.5
google.golang.org/grpc v1.39.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.21.2
k8s.io/api v0.21.3
k8s.io/apiextensions-apiserver v0.18.6
k8s.io/apimachinery v0.21.2
k8s.io/client-go v0.21.2
k8s.io/apimachinery v0.21.3
k8s.io/client-go v0.21.3
sigs.k8s.io/cluster-api v0.3.20
sigs.k8s.io/controller-runtime v0.6.3
)
Loading

0 comments on commit f1c1608

Please sign in to comment.