Skip to content

Commit

Permalink
feat: update to Talos 1.2.0
Browse files Browse the repository at this point in the history 
Update Talos, CAPI core version, pkgs, tools.

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
@smira
smira committed Sep 1, 2022
1 parent 6fdde72 commit b5a5fc6
Show file tree
Hide file tree
Showing 9 changed files with 326 additions and 441 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ ENV GO111MODULE on
ENV GOPROXY https://proxy.golang.org
ENV GOCACHE /.cache/go-build
ENV GOMODCACHE /.cache/mod
RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.23.1
RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.1
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.24.2
WORKDIR /src
COPY ./go.mod ./
COPY ./go.sum ./
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ GO_LDFLAGS += -s -w

ARTIFACTS := _out

TOOLS ?= ghcr.io/siderolabs/tools:v1.1.0-1-g134974c
PKGS ?= v1.1.0-8-gfa9a488
TOOLS ?= ghcr.io/siderolabs/tools:v1.2.0
PKGS ?= v1.2.0

BUILD := docker buildx build
PLATFORM ?= linux/amd64
Expand Down
20 changes: 10 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ This provider's versions are compatible with the following versions of Cluster A

This provider's versions are able to install and manage the following versions of Kubernetes:

| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 |
| ------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
| Control Plane Provider Talos v1alpha3 (v0.2) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
| Control Plane Provider Talos v1alpha3 (v0.4) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 |
| ------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
| Control Plane Provider Talos v1alpha3 (v0.2) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | |
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | |
| Control Plane Provider Talos v1alpha3 (v0.4) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |

This provider's versions are compatible with the following versions of Talos:

| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 |
| -------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- |
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | | | | |
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | ✓ | | | |
| Control Plane Provider Talos v1alpha3 (v0.4) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 | v1.2 |
| -------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- |
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | | | | | |
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | ✓ | | | | |
| Control Plane Provider Talos v1alpha3 (v0.4) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |

## Building and Installing

Expand Down
9 changes: 2 additions & 7 deletions config/crd/bases/controlplane.cluster.x-k8s.io_taloscontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.1
creationTimestamp: null
name: taloscontrolplanes.controlplane.cluster.x-k8s.io
spec:
Expand Down Expand Up @@ -177,6 +177,7 @@ spec:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
x-kubernetes-map-type: atomic
replicas:
description: Number of desired machines. Defaults to 1. When stacked
etcd is used only odd numbers are permitted, as per [etcd best practice](https://etcd.io/docs/v3.3.12/faq/#why-an-odd-number-of-cluster-members).
Expand Down Expand Up @@ -331,9 +332,3 @@ spec:
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
2 changes: 1 addition & 1 deletion controllers/taloscontrolplane_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ func (r *TalosControlPlaneReconciler) bootControlPlane(ctx context.Context, clus
Name: names.SimpleNameGenerator.GenerateName(tcp.Name + "-"),
Namespace: tcp.Namespace,
Labels: map[string]string{
clusterv1.ClusterLabelName: cluster.ClusterName,
clusterv1.ClusterLabelName: cluster.Name,
clusterv1.MachineControlPlaneLabelName: "",
},
OwnerReferences: []metav1.OwnerReference{
Expand Down
125 changes: 67 additions & 58 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
module github.com/talos-systems/cluster-api-control-plane-provider-talos

go 1.17
go 1.19

require (
github.com/coreos/go-semver v0.3.0
github.com/go-logr/logr v1.2.0
github.com/go-logr/zapr v1.2.0 // indirect
github.com/google/uuid v1.3.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.17.0
github.com/onsi/gomega v1.18.1
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.1
github.com/talos-systems/capi-utils v0.0.0-20220330110254-2b207c1f0aff
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.5.4
github.com/siderolabs/capi-utils v0.0.0-20220901184547-9bb8c313ba2e
github.com/stretchr/testify v1.8.0
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.5.5
github.com/talos-systems/go-retry v0.3.1
github.com/talos-systems/talos/pkg/machinery v1.1.1
google.golang.org/grpc v1.46.2
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.23.5
k8s.io/apimachinery v0.23.5
k8s.io/apiserver v0.23.5
k8s.io/client-go v0.23.5
k8s.io/utils v0.0.0-20211116205334-6203023598ed
sigs.k8s.io/cluster-api v1.1.4
sigs.k8s.io/controller-runtime v0.11.2
github.com/talos-systems/talos/pkg/machinery v1.2.0
google.golang.org/grpc v1.48.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.24.2
k8s.io/apimachinery v0.24.2
k8s.io/apiserver v0.24.2
k8s.io/client-go v0.24.2
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
sigs.k8s.io/cluster-api v1.2.1
sigs.k8s.io/controller-runtime v0.12.3
)

require k8s.io/klog/v2 v2.30.0
require k8s.io/klog/v2 v2.60.1

require (
cloud.google.com/go v0.99.0 // indirect
cloud.google.com/go/compute v1.7.0 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
Expand All @@ -41,88 +41,97 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/containerd/go-cni v1.1.5 // indirect
github.com/containernetworking/cni v1.1.0 // indirect
github.com/containerd/go-cni v1.1.7 // indirect
github.com/containernetworking/cni v1.1.2 // indirect
github.com/coredns/caddy v1.1.0 // indirect
github.com/coredns/corefile-migration v1.0.14 // indirect
github.com/cosi-project/runtime v0.0.0-20220527181155-95d06feaf8b5 // indirect
github.com/coredns/corefile-migration v1.0.17 // indirect
github.com/cosi-project/runtime v0.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/gertd/go-pluralize v0.2.1 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gobuffalo/flect v0.2.4 // indirect
github.com/gobuffalo/flect v0.2.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/cel-go v0.9.0 // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/google/go-github/v33 v33.0.0 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/cel-go v0.10.1 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/go-github/v45 v45.2.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // 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/nxadm/tail v1.4.8 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.7.2 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/siderolabs/go-pointer v1.0.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/siderolabs/protoenc v0.1.3 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.10.1 // indirect
github.com/spf13/viper v1.12.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/talos-systems/crypto v0.3.5 // indirect
github.com/talos-systems/net v0.3.2 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
github.com/talos-systems/crypto v0.3.6 // indirect
github.com/valyala/fastjson v1.6.3 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.22.0 // indirect
go4.org/intern v0.0.0-20220617035311-6925f38cc365 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect
golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c // indirect
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220531134929-86cf59382f1b // indirect
google.golang.org/protobuf v1.28.0 // indirect
google.golang.org/genproto v0.0.0-20220812140447-cec7f5303424 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiextensions-apiserver v0.23.5 // indirect
k8s.io/cluster-bootstrap v0.23.0 // indirect
k8s.io/component-base v0.23.5 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
inet.af/netaddr v0.0.0-20220811202034-502d2d690317 // indirect
k8s.io/apiextensions-apiserver v0.24.2 // indirect
k8s.io/cluster-bootstrap v0.24.0 // indirect
k8s.io/component-base v0.24.2 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit b5a5fc6

Please sign in to comment.