Skip to content

Commit ff4501d

Browse files
smirasmira
committed
feat: update to Talos 1.0
This updates machinery to 1.0.0, Cluter API core to 1.1.3. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit ff9d1e8)
1 parent 47c85bd commit ff4501d

File tree

9 files changed

+263
-216
lines changed

9 files changed

+263
-216
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ TEST_RUN ?= ./...
1111

1212
TOOLS ?= ghcr.io/siderolabs/tools:v1.0.0
1313
PKGS ?= v1.0.0
14-
TALOS_VERSION ?= v0.14.0
15-
K8S_VERSION ?= 1.23.1
14+
TALOS_VERSION ?= v1.0.0
15+
K8S_VERSION ?= 1.23.5
1616

17-
CONTROLLER_GEN_VERSION ?= v0.7.0
18-
CONVERSION_GEN_VERSION ?= v0.22.2
17+
CONTROLLER_GEN_VERSION ?= v0.8.0
18+
CONVERSION_GEN_VERSION ?= v0.23.1
1919

2020
BUILD := docker buildx build
2121
PLATFORM ?= linux/amd64

‎config/crd/bases/bootstrap.cluster.x-k8s.io_talosconfigs.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: talosconfigs.bootstrap.cluster.x-k8s.io
109
spec:

‎config/crd/bases/bootstrap.cluster.x-k8s.io_talosconfigtemplates.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: talosconfigtemplates.bootstrap.cluster.x-k8s.io
109
spec:

‎config/rbac/role.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole

‎config/webhook/manifests.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: admissionregistration.k8s.io/v1
43
kind: ValidatingWebhookConfiguration

‎controllers/talosconfig_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ func (r *TalosConfigReconciler) userConfigs(ctx context.Context, scope *TalosCon
412412
}
413413
}
414414

415-
userConfigStr, err := userConfig.String()
415+
userConfigStr, err := userConfig.EncodeString()
416416
if err != nil {
417417
return retBundle, err
418418
}
@@ -532,7 +532,7 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
532532
data.MachineConfig.MachineNetwork.NetworkHostname = scope.ConfigOwner.GetName()
533533
}
534534

535-
dataOut, err := data.String()
535+
dataOut, err := data.EncodeString()
536536
if err != nil {
537537
return retBundle, err
538538
}

‎go.mod‎

Lines changed: 63 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,56 @@ go 1.17
55
require (
66
github.com/AlekSi/pointer v1.2.0
77
github.com/evanphx/json-patch v5.6.0+incompatible
8-
github.com/go-logr/logr v0.4.0
8+
github.com/go-logr/logr v1.2.0
99
github.com/spf13/pflag v1.0.5
1010
github.com/stretchr/testify v1.7.0
11-
github.com/talos-systems/crypto v0.3.4
12-
github.com/talos-systems/talos/pkg/machinery v0.14.0
13-
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881
11+
github.com/talos-systems/crypto v0.3.5
12+
github.com/talos-systems/talos/pkg/machinery v1.0.0
13+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158
1414
gopkg.in/yaml.v2 v2.4.0
1515
inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
16-
k8s.io/api v0.22.2
17-
k8s.io/apiextensions-apiserver v0.22.2
18-
k8s.io/apimachinery v0.22.2
19-
k8s.io/client-go v0.22.2
20-
sigs.k8s.io/cluster-api v1.0.4
21-
sigs.k8s.io/controller-runtime v0.10.3
16+
k8s.io/api v0.23.0
17+
k8s.io/apiextensions-apiserver v0.23.0
18+
k8s.io/apimachinery v0.23.0
19+
k8s.io/client-go v0.23.0
20+
sigs.k8s.io/cluster-api v1.1.3
21+
sigs.k8s.io/controller-runtime v0.11.1
2222
)
2323

2424
require (
25-
github.com/BurntSushi/toml v0.4.1 // indirect
2625
github.com/MakeNowJust/heredoc v1.0.0 // indirect
26+
github.com/Masterminds/goutils v1.1.1 // indirect
27+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
28+
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
29+
github.com/PuerkitoBio/purell v1.1.1 // indirect
30+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
31+
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
2732
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
2833
github.com/beorn7/perks v1.0.1 // indirect
2934
github.com/blang/semver v3.5.1+incompatible // indirect
3035
github.com/cespare/xxhash/v2 v2.1.1 // indirect
31-
github.com/containerd/go-cni v1.1.0 // indirect
36+
github.com/containerd/go-cni v1.1.3 // indirect
3237
github.com/containernetworking/cni v1.0.1 // indirect
3338
github.com/coredns/caddy v1.1.0 // indirect
34-
github.com/coredns/corefile-migration v1.0.13 // indirect
39+
github.com/coredns/corefile-migration v1.0.14 // indirect
3540
github.com/cosi-project/runtime v0.0.0-20211216175730-264f8fcd1a4f // indirect
3641
github.com/davecgh/go-spew v1.1.1 // indirect
3742
github.com/docker/distribution v2.7.1+incompatible // indirect
38-
github.com/drone/envsubst/v2 v2.0.0-20210615175204-7bf45dbf5372 // indirect
43+
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
3944
github.com/dustin/go-humanize v1.0.0 // indirect
45+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4046
github.com/fsnotify/fsnotify v1.5.1 // indirect
4147
github.com/ghodss/yaml v1.0.0 // indirect
42-
github.com/go-logr/zapr v0.4.0 // indirect
43-
github.com/gobuffalo/flect v0.2.3 // indirect
48+
github.com/go-logr/zapr v1.2.0 // indirect
49+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
50+
github.com/go-openapi/jsonreference v0.19.5 // indirect
51+
github.com/go-openapi/swag v0.19.14 // indirect
52+
github.com/gobuffalo/flect v0.2.4 // indirect
4453
github.com/gogo/protobuf v1.3.2 // indirect
4554
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4655
github.com/golang/protobuf v1.5.2 // indirect
47-
github.com/google/go-cmp v0.5.6 // indirect
56+
github.com/google/cel-go v0.9.0 // indirect
57+
github.com/google/go-cmp v0.5.7 // indirect
4858
github.com/google/go-github/v33 v33.0.0 // indirect
4959
github.com/google/go-querystring v1.0.0 // indirect
5060
github.com/google/gofuzz v1.2.0 // indirect
@@ -53,67 +63,74 @@ require (
5363
github.com/hashicorp/errwrap v1.0.0 // indirect
5464
github.com/hashicorp/go-multierror v1.1.1 // indirect
5565
github.com/hashicorp/hcl v1.0.0 // indirect
66+
github.com/huandu/xstrings v1.3.2 // indirect
5667
github.com/imdario/mergo v0.3.12 // indirect
57-
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
58-
github.com/jsimonetti/rtnetlink v0.0.0-20211203074127-fd9a11f42291 // indirect
59-
github.com/json-iterator/go v1.1.11 // indirect
68+
github.com/josharian/intern v1.0.0 // indirect
69+
github.com/josharian/native v1.0.0 // indirect
70+
github.com/jsimonetti/rtnetlink v1.1.0 // indirect
71+
github.com/json-iterator/go v1.1.12 // indirect
6072
github.com/magiconair/properties v1.8.5 // indirect
73+
github.com/mailru/easyjson v0.7.6 // indirect
6174
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
62-
github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60 // indirect
63-
github.com/mdlayher/genetlink v1.0.0 // indirect
64-
github.com/mdlayher/netlink v1.4.2 // indirect
65-
github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb // indirect
75+
github.com/mdlayher/ethtool v0.0.0-20220213132912-856bd6cb8a38 // indirect
76+
github.com/mdlayher/genetlink v1.2.0 // indirect
77+
github.com/mdlayher/netlink v1.6.0 // indirect
78+
github.com/mdlayher/socket v0.2.1 // indirect
79+
github.com/mitchellh/copystructure v1.2.0 // indirect
6680
github.com/mitchellh/mapstructure v1.4.2 // indirect
81+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6782
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
68-
github.com/modern-go/reflect2 v1.0.1 // indirect
69-
github.com/onsi/gomega v1.16.0 // indirect
83+
github.com/modern-go/reflect2 v1.0.2 // indirect
84+
github.com/onsi/gomega v1.17.0 // indirect
7085
github.com/opencontainers/go-digest v1.0.0 // indirect
7186
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d // indirect
7287
github.com/pelletier/go-toml v1.9.4 // indirect
7388
github.com/pkg/errors v0.9.1 // indirect
7489
github.com/pmezard/go-difflib v1.0.0 // indirect
7590
github.com/prometheus/client_golang v1.11.0 // indirect
7691
github.com/prometheus/client_model v0.2.0 // indirect
77-
github.com/prometheus/common v0.26.0 // indirect
92+
github.com/prometheus/common v0.28.0 // indirect
7893
github.com/prometheus/procfs v0.6.0 // indirect
7994
github.com/ryanuber/go-glob v1.0.0 // indirect
95+
github.com/shopspring/decimal v1.2.0 // indirect
8096
github.com/spf13/afero v1.6.0 // indirect
8197
github.com/spf13/cast v1.4.1 // indirect
8298
github.com/spf13/jwalterweatherman v1.1.0 // indirect
8399
github.com/spf13/viper v1.9.0 // indirect
100+
github.com/stoewer/go-strcase v1.2.0 // indirect
101+
github.com/stretchr/objx v0.2.0 // indirect
84102
github.com/subosito/gotenv v1.2.0 // indirect
85-
github.com/talos-systems/go-blockdevice v0.2.5 // indirect
103+
github.com/talos-systems/go-blockdevice v0.3.1 // indirect
86104
github.com/talos-systems/go-debug v0.2.1 // indirect
87-
github.com/talos-systems/net v0.3.1 // indirect
105+
github.com/talos-systems/net v0.3.2 // indirect
106+
github.com/valyala/fastjson v1.6.3 // indirect
88107
go.uber.org/atomic v1.7.0 // indirect
89108
go.uber.org/multierr v1.7.0 // indirect
90-
go.uber.org/zap v1.19.0 // indirect
109+
go.uber.org/zap v1.19.1 // indirect
91110
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
92111
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
93112
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
94-
golang.org/x/mod v0.5.1 // indirect
95-
golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c // indirect
96-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
97-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
98-
golang.org/x/text v0.3.6 // indirect
113+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
114+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
115+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
116+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
117+
golang.org/x/text v0.3.7 // indirect
99118
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
100-
golang.org/x/tools v0.1.7 // indirect
101-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
102119
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
103120
google.golang.org/appengine v1.6.7 // indirect
104-
google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9 // indirect
105-
google.golang.org/grpc v1.42.0 // indirect
121+
google.golang.org/genproto v0.0.0-20220228155957-1da8797a5878 // indirect
122+
google.golang.org/grpc v1.44.0 // indirect
106123
google.golang.org/protobuf v1.27.1 // indirect
107124
gopkg.in/inf.v0 v0.9.1 // indirect
108125
gopkg.in/ini.v1 v1.63.2 // indirect
109126
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
110-
honnef.co/go/tools v0.2.2 // indirect
111-
k8s.io/apiserver v0.22.2 // indirect
112-
k8s.io/cluster-bootstrap v0.22.2 // indirect
113-
k8s.io/component-base v0.22.2 // indirect
114-
k8s.io/klog/v2 v2.9.0 // indirect
115-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
127+
k8s.io/apiserver v0.23.0 // indirect
128+
k8s.io/cluster-bootstrap v0.23.0 // indirect
129+
k8s.io/component-base v0.23.0 // indirect
130+
k8s.io/klog/v2 v2.30.0 // indirect
131+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
116132
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
117-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
133+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
134+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
118135
sigs.k8s.io/yaml v1.3.0 // indirect
119136
)

0 commit comments

Comments
 (0)