From aed8c067307f4d9f5853e74465ea4b51e81d7060 Mon Sep 17 00:00:00 2001 From: Spencer Smith Date: Tue, 27 Aug 2019 17:35:59 -0400 Subject: [PATCH] chore: rename v1 node configs to v1alpha1 This PR moves to using v1alpha1 as the inital node config version, so we can graduate these configs a little more cleanly later on. Signed-off-by: Spencer Smith --- cmd/osctl/cmd/cluster.go | 2 +- cmd/osctl/cmd/cluster/pkg/node/node.go | 2 +- cmd/osctl/cmd/config.go | 28 +++++++-------- .../internal/platform/container/container.go | 2 +- pkg/userdata/download/download_test.go | 12 +++---- pkg/userdata/translate/translate.go | 4 +-- pkg/userdata/translate/translate_test.go | 8 ++--- ...{translate_v1.go => translate_v1alpha1.go} | 34 +++++++++---------- .../{v1 => v1alpha1}/cluster_config.go | 2 +- pkg/userdata/{v1 => v1alpha1}/errors.go | 4 +-- .../{v1 => v1alpha1}/generate/controlplane.go | 18 +++++----- .../{v1 => v1alpha1}/generate/generate.go | 0 .../generate/generate_test.go | 22 ++++++------ .../{v1 => v1alpha1}/generate/init.go | 30 ++++++++-------- .../{v1 => v1alpha1}/generate/join.go | 16 ++++----- .../{v1 => v1alpha1}/generate/talosconfig.go | 0 pkg/userdata/{v1 => v1alpha1}/install.go | 4 +-- .../{v1 => v1alpha1}/machine_config.go | 2 +- pkg/userdata/{v1 => v1alpha1}/networking.go | 4 +-- pkg/userdata/{v1 => v1alpha1}/node_config.go | 2 +- 20 files changed, 98 insertions(+), 98 deletions(-) rename pkg/userdata/translate/{translate_v1.go => translate_v1alpha1.go} (89%) rename pkg/userdata/{v1 => v1alpha1}/cluster_config.go (99%) rename pkg/userdata/{v1 => v1alpha1}/errors.go (94%) rename pkg/userdata/{v1 => v1alpha1}/generate/controlplane.go (66%) rename pkg/userdata/{v1 => v1alpha1}/generate/generate.go (100%) rename pkg/userdata/{v1 => v1alpha1}/generate/generate_test.go (65%) rename pkg/userdata/{v1 => v1alpha1}/generate/init.go (60%) rename pkg/userdata/{v1 => v1alpha1}/generate/join.go (65%) rename pkg/userdata/{v1 => v1alpha1}/generate/talosconfig.go (100%) rename pkg/userdata/{v1 => v1alpha1}/install.go (93%) rename pkg/userdata/{v1 => v1alpha1}/machine_config.go (98%) rename pkg/userdata/{v1 => v1alpha1}/networking.go (97%) rename pkg/userdata/{v1 => v1alpha1}/node_config.go (95%) diff --git a/cmd/osctl/cmd/cluster.go b/cmd/osctl/cmd/cluster.go index 382886608..506262d28 100644 --- a/cmd/osctl/cmd/cluster.go +++ b/cmd/osctl/cmd/cluster.go @@ -24,7 +24,7 @@ import ( "github.com/talos-systems/talos/cmd/osctl/cmd/cluster/pkg/node" "github.com/talos-systems/talos/cmd/osctl/pkg/client/config" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" - "github.com/talos-systems/talos/pkg/userdata/v1/generate" + "github.com/talos-systems/talos/pkg/userdata/v1alpha1/generate" "github.com/talos-systems/talos/pkg/version" ) diff --git a/cmd/osctl/cmd/cluster/pkg/node/node.go b/cmd/osctl/cmd/cluster/pkg/node/node.go index ebfb82ea5..5300eaf44 100644 --- a/cmd/osctl/cmd/cluster/pkg/node/node.go +++ b/cmd/osctl/cmd/cluster/pkg/node/node.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" "github.com/docker/go-connections/nat" - "github.com/talos-systems/talos/pkg/userdata/v1/generate" + "github.com/talos-systems/talos/pkg/userdata/v1alpha1/generate" ) // Request represents the set of options available for configuring a node. diff --git a/cmd/osctl/cmd/config.go b/cmd/osctl/cmd/config.go index 762361c0d..98f26e6aa 100644 --- a/cmd/osctl/cmd/config.go +++ b/cmd/osctl/cmd/config.go @@ -20,7 +20,7 @@ import ( udv0 "github.com/talos-systems/talos/pkg/userdata" udgenv0 "github.com/talos-systems/talos/pkg/userdata/generate" "github.com/talos-systems/talos/pkg/userdata/translate" - udgenv1 "github.com/talos-systems/talos/pkg/userdata/v1/generate" + udgenv1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1/generate" "gopkg.in/yaml.v2" ) @@ -135,8 +135,8 @@ var configGenerateCmd = &cobra.Command{ switch genVersion { case "v0": genV0Userdata(args) - case "v1": - genV1Userdata(args) + case "v1alpha1": + genV1Alpha1Userdata(args) } }, } @@ -205,8 +205,8 @@ func writeV0Userdata(input *udgenv0.Input, t udgenv0.Type, name string) (err err return nil } -func genV1Userdata(args []string) { - input, err := udgenv1.NewInput(args[0], strings.Split(args[1], ",")) +func genV1Alpha1Userdata(args []string) { + input, err := udgenv1alpha1.NewInput(args[0], strings.Split(args[1], ",")) if err != nil { helpers.Fatalf("failed to generate PKI and tokens: %v", err) } @@ -218,29 +218,29 @@ func genV1Userdata(args []string) { helpers.Fatalf("failed to fetch current working dir: %v", err) } - var udType udgenv1.Type + var udType udgenv1alpha1.Type for idx, master := range strings.Split(args[1], ",") { input.Index = idx input.IP = net.ParseIP(master) if input.Index == 0 { - udType = udgenv1.TypeInit + udType = udgenv1alpha1.TypeInit } else { - udType = udgenv1.TypeControlPlane + udType = udgenv1alpha1.TypeControlPlane } - if err = writeV1Userdata(input, udType, "master-"+strconv.Itoa(idx+1)); err != nil { + if err = writeV1Alpha1Userdata(input, udType, "master-"+strconv.Itoa(idx+1)); err != nil { helpers.Fatalf("failed to generate userdata for %s: %v", "master-"+strconv.Itoa(idx+1), err) } fmt.Println("created file", workingDir+"/master-"+strconv.Itoa(idx+1)+".yaml") } input.IP = nil - if err = writeV1Userdata(input, udgenv1.TypeJoin, "worker"); err != nil { + if err = writeV1Alpha1Userdata(input, udgenv1alpha1.TypeJoin, "worker"); err != nil { helpers.Fatalf("failed to generate userdata for %s: %v", "worker", err) } fmt.Println("created file", workingDir+"/worker.yaml") - data, err := udgenv1.Talosconfig(input) + data, err := udgenv1alpha1.Talosconfig(input) if err != nil { helpers.Fatalf("failed to generate talosconfig: %v", err) } @@ -250,14 +250,14 @@ func genV1Userdata(args []string) { fmt.Println("created file", workingDir+"/talosconfig") } -func writeV1Userdata(input *udgenv1.Input, t udgenv1.Type, name string) (err error) { +func writeV1Alpha1Userdata(input *udgenv1alpha1.Input, t udgenv1alpha1.Type, name string) (err error) { var data string - data, err = udgenv1.Userdata(t, input) + data, err = udgenv1alpha1.Userdata(t, input) if err != nil { return err } - trans, err := translate.NewTranslator("v1", data) + trans, err := translate.NewTranslator("v1alpha1", data) if err != nil { return err } diff --git a/internal/app/machined/internal/platform/container/container.go b/internal/app/machined/internal/platform/container/container.go index e062ae960..ae2b28dc3 100644 --- a/internal/app/machined/internal/platform/container/container.go +++ b/internal/app/machined/internal/platform/container/container.go @@ -32,7 +32,7 @@ func (c *Container) UserData() (data *userdata.UserData, err error) { if decoded, err = base64.StdEncoding.DecodeString(s); err != nil { return nil, err } - trans, err := translate.NewTranslator("v1", string(decoded)) + trans, err := translate.NewTranslator("v1alpha1", string(decoded)) if err != nil { return nil, err } diff --git a/pkg/userdata/download/download_test.go b/pkg/userdata/download/download_test.go index 7fdad04d7..39a4ba2c8 100644 --- a/pkg/userdata/download/download_test.go +++ b/pkg/userdata/download/download_test.go @@ -49,7 +49,7 @@ func (suite *downloadSuite) TestV0Download() { } // nolint: dupl -func (suite *downloadSuite) TestV1Download() { +func (suite *downloadSuite) TestV1Alpha1Download() { // Disable logging for test log.SetOutput(ioutil.Discard) ts := testUDServer() @@ -57,14 +57,14 @@ func (suite *downloadSuite) TestV1Download() { var err error - _, err = Download(ts.URL, WithMaxWait(0.1), WithHeaders(map[string]string{"configVersion": "v1"})) + _, err = Download(ts.URL, WithMaxWait(0.1), WithHeaders(map[string]string{"configVersion": "v1alpha1"})) suite.Require().NoError(err) _, err = Download( ts.URL, WithFormat(b64), WithRetries(1), - WithHeaders(map[string]string{"Metadata": "true", "format": b64, "configVersion": "v1"}), + WithHeaders(map[string]string{"Metadata": "true", "format": b64, "configVersion": "v1alpha1"}), ) suite.Require().NoError(err) log.SetOutput(os.Stderr) @@ -74,8 +74,8 @@ func testUDServer() *httptest.Server { var count int testMap := map[string]string{ - "v0": testV0Config, - "v1": testV1Config, + "v0": testV0Config, + "v1alpha1": testV1Alpha1Config, } ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { @@ -98,7 +98,7 @@ func testUDServer() *httptest.Server { } // nolint: lll -const testV1Config = `version: v1 +const testV1Alpha1Config = `version: v1alpha1 machine: type: init token: 57dn7x.k5jc6dum97cotlqb diff --git a/pkg/userdata/translate/translate.go b/pkg/userdata/translate/translate.go index 10c23b70d..a045029f4 100644 --- a/pkg/userdata/translate/translate.go +++ b/pkg/userdata/translate/translate.go @@ -18,8 +18,8 @@ type Translator interface { // NewTranslator returns an instance of the translator depending on version func NewTranslator(apiVersion string, nodeConfig string) (Translator, error) { switch apiVersion { - case "v1": - return &V1Translator{nodeConfig: nodeConfig}, nil + case "v1alpha1": + return &V1Alpha1Translator{nodeConfig: nodeConfig}, nil default: return nil, errors.New("unknown translator") } diff --git a/pkg/userdata/translate/translate_test.go b/pkg/userdata/translate/translate_test.go index cc0e5d107..4e99a87d3 100644 --- a/pkg/userdata/translate/translate_test.go +++ b/pkg/userdata/translate/translate_test.go @@ -19,19 +19,19 @@ func TestTranslatorSuite(t *testing.T) { } func (suite *translatorSuite) TestTranslation() { - tv1, err := NewTranslator("v1", testV1Config) + tv1a1, err := NewTranslator("v1alpha1", testV1Alpha1Config) suite.Require().NoError(err) - ud, err := tv1.Translate() + ud, err := tv1a1.Translate() suite.Require().NoError(err) - suite.Assert().Equal(string(ud.Version), "v1") + suite.Assert().Equal(string(ud.Version), "v1alpha1") err = ud.Validate() suite.Require().NoError(err) } // nolint: lll -const testV1Config = `version: v1 +const testV1Alpha1Config = `version: v1alpha1 machine: type: init token: 57dn7x.k5jc6dum97cotlqb diff --git a/pkg/userdata/translate/translate_v1.go b/pkg/userdata/translate/translate_v1alpha1.go similarity index 89% rename from pkg/userdata/translate/translate_v1.go rename to pkg/userdata/translate/translate_v1alpha1.go index f03a34aa4..fd3d84978 100644 --- a/pkg/userdata/translate/translate_v1.go +++ b/pkg/userdata/translate/translate_v1alpha1.go @@ -12,7 +12,7 @@ import ( "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/crypto/x509" "github.com/talos-systems/talos/pkg/userdata" - v1 "github.com/talos-systems/talos/pkg/userdata/v1" + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" yaml "gopkg.in/yaml.v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeproxyconfig "k8s.io/kube-proxy/config/v1alpha1" @@ -20,23 +20,23 @@ import ( kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" ) -// V1Translator holds info about a v1 machine config translation layer -type V1Translator struct { +// V1Alpha1Translator holds info about a v1alpha1 machine config translation layer +type V1Alpha1Translator struct { nodeConfig string } // Translate takes a v1 NodeConfig and translates it to a UserData struct -func (tv1 *V1Translator) Translate() (*userdata.UserData, error) { - nc := &v1.NodeConfig{} +func (tv1a1 *V1Alpha1Translator) Translate() (*userdata.UserData, error) { + nc := &v1alpha1.NodeConfig{} - err := yaml.Unmarshal([]byte(tv1.nodeConfig), nc) + err := yaml.Unmarshal([]byte(tv1a1.nodeConfig), nc) if err != nil { return nil, err } // Lay down the absolute minimum for all node types ud := &userdata.UserData{ - Version: "v1", + Version: "v1alpha1", Security: &userdata.Security{}, Services: &userdata.Services{ Init: &userdata.Init{ @@ -51,32 +51,32 @@ func (tv1 *V1Translator) Translate() (*userdata.UserData, error) { } if nc.Machine.Network != nil { - translateV1Network(nc, ud) + translateV1Alpha1Network(nc, ud) } if nc.Machine.Install != nil { - translateV1Install(nc, ud) + translateV1Alpha1Install(nc, ud) } switch nc.Machine.Type { case "init": - err = translateV1Init(nc, ud) + err = translateV1Alpha1Init(nc, ud) if err != nil { return nil, err } case "controlplane": - err = translateV1ControlPlane(nc, ud) + err = translateV1Alpha1ControlPlane(nc, ud) if err != nil { return nil, err } case "worker": - translateV1Worker(nc, ud) + translateV1Alpha1Worker(nc, ud) } return ud, nil } -func translateV1Network(nc *v1.NodeConfig, ud *userdata.UserData) { +func translateV1Alpha1Network(nc *v1alpha1.NodeConfig, ud *userdata.UserData) { if ud.Networking == nil { ud.Networking = &userdata.Networking{} } @@ -115,7 +115,7 @@ func translateV1Network(nc *v1.NodeConfig, ud *userdata.UserData) { } -func translateV1Install(nc *v1.NodeConfig, ud *userdata.UserData) { +func translateV1Alpha1Install(nc *v1alpha1.NodeConfig, ud *userdata.UserData) { ud.Install = &userdata.Install{ Disk: nc.Machine.Install.Disk, @@ -149,7 +149,7 @@ func translateV1Install(nc *v1.NodeConfig, ud *userdata.UserData) { } } -func translateV1Init(nc *v1.NodeConfig, ud *userdata.UserData) error { +func translateV1Alpha1Init(nc *v1alpha1.NodeConfig, ud *userdata.UserData) error { // Convert and decode certs back to byte slices osCert, err := base64.StdEncoding.DecodeString(nc.Machine.CA.Crt) if err != nil { @@ -268,7 +268,7 @@ func translateV1Init(nc *v1.NodeConfig, ud *userdata.UserData) error { return nil } -func translateV1ControlPlane(nc *v1.NodeConfig, ud *userdata.UserData) error { +func translateV1Alpha1ControlPlane(nc *v1alpha1.NodeConfig, ud *userdata.UserData) error { // Convert and decode certs back to byte slices osCert, err := base64.StdEncoding.DecodeString(nc.Machine.CA.Crt) if err != nil { @@ -313,7 +313,7 @@ func translateV1ControlPlane(nc *v1.NodeConfig, ud *userdata.UserData) error { return nil } -func translateV1Worker(nc *v1.NodeConfig, ud *userdata.UserData) { +func translateV1Alpha1Worker(nc *v1alpha1.NodeConfig, ud *userdata.UserData) { //Craft a worker kubeadm config workerConfig := &kubeadm.JoinConfiguration{ TypeMeta: metav1.TypeMeta{ diff --git a/pkg/userdata/v1/cluster_config.go b/pkg/userdata/v1alpha1/cluster_config.go similarity index 99% rename from pkg/userdata/v1/cluster_config.go rename to pkg/userdata/v1alpha1/cluster_config.go index 9d4bd36c1..792fb790f 100644 --- a/pkg/userdata/v1/cluster_config.go +++ b/pkg/userdata/v1alpha1/cluster_config.go @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package v1 +package v1alpha1 // ClusterConfig reperesents the cluster-wide config values type ClusterConfig struct { diff --git a/pkg/userdata/v1/errors.go b/pkg/userdata/v1alpha1/errors.go similarity index 94% rename from pkg/userdata/v1/errors.go rename to pkg/userdata/v1alpha1/errors.go index 763e64332..a89988744 100644 --- a/pkg/userdata/v1/errors.go +++ b/pkg/userdata/v1alpha1/errors.go @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// Package v1 provides user-facing v1 machine configs +// Package v1alpha1 provides user-facing v1alpha1 machine configs // nolint: dupl -package v1 +package v1alpha1 import "errors" diff --git a/pkg/userdata/v1/generate/controlplane.go b/pkg/userdata/v1alpha1/generate/controlplane.go similarity index 66% rename from pkg/userdata/v1/generate/controlplane.go rename to pkg/userdata/v1alpha1/generate/controlplane.go index b3640df9e..c72e33e2c 100644 --- a/pkg/userdata/v1/generate/controlplane.go +++ b/pkg/userdata/v1alpha1/generate/controlplane.go @@ -5,33 +5,33 @@ package generate import ( - v1 "github.com/talos-systems/talos/pkg/userdata/v1" + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" yaml "gopkg.in/yaml.v2" ) func controlPlaneUd(in *Input) (string, error) { - machine := &v1.MachineConfig{ + machine := &v1alpha1.MachineConfig{ Type: "controlplane", Token: in.TrustdInfo.Token, - CA: &v1.MachineCAConfig{ + CA: &v1alpha1.MachineCAConfig{ Crt: in.Certs.OsCert, Key: in.Certs.OsKey, }, - Kubelet: &v1.KubeletConfig{}, - Network: &v1.NetworkConfig{}, + Kubelet: &v1alpha1.KubeletConfig{}, + Network: &v1alpha1.NetworkConfig{}, } - cluster := &v1.ClusterConfig{ + cluster := &v1alpha1.ClusterConfig{ Token: in.KubeadmTokens.BootstrapToken, - ControlPlane: &v1.ControlPlaneConfig{ + ControlPlane: &v1alpha1.ControlPlaneConfig{ IPs: in.MasterIPs, Index: in.Index, }, } - ud := v1.NodeConfig{ - Version: "v1", + ud := v1alpha1.NodeConfig{ + Version: "v1alpha1", Machine: machine, Cluster: cluster, } diff --git a/pkg/userdata/v1/generate/generate.go b/pkg/userdata/v1alpha1/generate/generate.go similarity index 100% rename from pkg/userdata/v1/generate/generate.go rename to pkg/userdata/v1alpha1/generate/generate.go diff --git a/pkg/userdata/v1/generate/generate_test.go b/pkg/userdata/v1alpha1/generate/generate_test.go similarity index 65% rename from pkg/userdata/v1/generate/generate_test.go rename to pkg/userdata/v1alpha1/generate/generate_test.go index b0c463405..7226ce471 100644 --- a/pkg/userdata/v1/generate/generate_test.go +++ b/pkg/userdata/v1alpha1/generate/generate_test.go @@ -9,13 +9,13 @@ import ( "testing" "github.com/stretchr/testify/suite" - v1 "github.com/talos-systems/talos/pkg/userdata/v1" - udgenv1 "github.com/talos-systems/talos/pkg/userdata/v1/generate" + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" + udgenv1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1/generate" "gopkg.in/yaml.v2" ) var ( - input *udgenv1.Input + input *udgenv1alpha1.Input ) type GenerateSuite struct { @@ -28,37 +28,37 @@ func TestGenerateSuite(t *testing.T) { func (suite *GenerateSuite) SetupSuite() { var err error - input, err = udgenv1.NewInput("test", []string{"10.0.1.5", "10.0.1.6", "10.0.1.7"}) + input, err = udgenv1alpha1.NewInput("test", []string{"10.0.1.5", "10.0.1.6", "10.0.1.7"}) suite.Require().NoError(err) } func (suite *GenerateSuite) TestGenerateInitSuccess() { input.IP = net.ParseIP("10.0.1.5") - dataString, err := udgenv1.Userdata(udgenv1.TypeInit, input) + dataString, err := udgenv1alpha1.Userdata(udgenv1alpha1.TypeInit, input) suite.Require().NoError(err) - data := &v1.NodeConfig{} + data := &v1alpha1.NodeConfig{} err = yaml.Unmarshal([]byte(dataString), data) suite.Require().NoError(err) } func (suite *GenerateSuite) TestGenerateControlPlaneSuccess() { input.IP = net.ParseIP("10.0.1.6") - dataString, err := udgenv1.Userdata(udgenv1.TypeControlPlane, input) + dataString, err := udgenv1alpha1.Userdata(udgenv1alpha1.TypeControlPlane, input) suite.Require().NoError(err) - data := &v1.NodeConfig{} + data := &v1alpha1.NodeConfig{} err = yaml.Unmarshal([]byte(dataString), data) suite.Require().NoError(err) } func (suite *GenerateSuite) TestGenerateWorkerSuccess() { - dataString, err := udgenv1.Userdata(udgenv1.TypeJoin, input) + dataString, err := udgenv1alpha1.Userdata(udgenv1alpha1.TypeJoin, input) suite.Require().NoError(err) - data := &v1.NodeConfig{} + data := &v1alpha1.NodeConfig{} err = yaml.Unmarshal([]byte(dataString), data) suite.Require().NoError(err) } func (suite *GenerateSuite) TestGenerateTalosconfigSuccess() { - _, err := udgenv1.Talosconfig(input) + _, err := udgenv1alpha1.Talosconfig(input) suite.Require().NoError(err) } diff --git a/pkg/userdata/v1/generate/init.go b/pkg/userdata/v1alpha1/generate/init.go similarity index 60% rename from pkg/userdata/v1/generate/init.go rename to pkg/userdata/v1alpha1/generate/init.go index dae7bb07b..b8ece387e 100644 --- a/pkg/userdata/v1/generate/init.go +++ b/pkg/userdata/v1alpha1/generate/init.go @@ -5,17 +5,17 @@ package generate import ( - v1 "github.com/talos-systems/talos/pkg/userdata/v1" + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" yaml "gopkg.in/yaml.v2" ) func initUd(in *Input) (string, error) { - machine := &v1.MachineConfig{ + machine := &v1alpha1.MachineConfig{ Type: "init", - Kubelet: &v1.KubeletConfig{}, - Network: &v1.NetworkConfig{}, - CA: &v1.MachineCAConfig{ + Kubelet: &v1alpha1.KubeletConfig{}, + Network: &v1alpha1.NetworkConfig{}, + CA: &v1alpha1.MachineCAConfig{ Crt: in.Certs.OsCert, Key: in.Certs.OsKey, }, @@ -24,33 +24,33 @@ func initUd(in *Input) (string, error) { certSANs := in.GetAPIServerSANs() - cluster := &v1.ClusterConfig{ + cluster := &v1alpha1.ClusterConfig{ ClusterName: in.ClusterName, - ControlPlane: &v1.ControlPlaneConfig{ + ControlPlane: &v1alpha1.ControlPlaneConfig{ Endpoint: in.ControlPlaneEndpoint, IPs: in.MasterIPs, Index: in.Index, }, - APIServer: &v1.APIServerConfig{ + APIServer: &v1alpha1.APIServerConfig{ CertSANs: certSANs, }, - ControllerManager: &v1.ControllerManagerConfig{}, - Scheduler: &v1.SchedulerConfig{}, - Etcd: &v1.EtcdConfig{}, - Network: &v1.ClusterNetworkConfig{ + ControllerManager: &v1alpha1.ControllerManagerConfig{}, + Scheduler: &v1alpha1.SchedulerConfig{}, + Etcd: &v1alpha1.EtcdConfig{}, + Network: &v1alpha1.ClusterNetworkConfig{ DNSDomain: in.ServiceDomain, PodSubnet: in.PodNet, ServiceSubnet: in.ServiceNet, }, - CA: &v1.ClusterCAConfig{ + CA: &v1alpha1.ClusterCAConfig{ Crt: in.Certs.K8sCert, Key: in.Certs.K8sKey, }, Token: in.KubeadmTokens.BootstrapToken, } - ud := v1.NodeConfig{ - Version: "v1", + ud := v1alpha1.NodeConfig{ + Version: "v1alpha1", Machine: machine, Cluster: cluster, } diff --git a/pkg/userdata/v1/generate/join.go b/pkg/userdata/v1alpha1/generate/join.go similarity index 65% rename from pkg/userdata/v1/generate/join.go rename to pkg/userdata/v1alpha1/generate/join.go index c466d2970..74ee0d156 100644 --- a/pkg/userdata/v1/generate/join.go +++ b/pkg/userdata/v1alpha1/generate/join.go @@ -5,28 +5,28 @@ package generate import ( - v1 "github.com/talos-systems/talos/pkg/userdata/v1" + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" yaml "gopkg.in/yaml.v2" ) func workerUd(in *Input) (string, error) { - machine := &v1.MachineConfig{ + machine := &v1alpha1.MachineConfig{ Type: "worker", Token: in.TrustdInfo.Token, - Kubelet: &v1.KubeletConfig{}, - Network: &v1.NetworkConfig{}, + Kubelet: &v1alpha1.KubeletConfig{}, + Network: &v1alpha1.NetworkConfig{}, } - cluster := &v1.ClusterConfig{ + cluster := &v1alpha1.ClusterConfig{ Token: in.KubeadmTokens.BootstrapToken, - ControlPlane: &v1.ControlPlaneConfig{ + ControlPlane: &v1alpha1.ControlPlaneConfig{ IPs: in.MasterIPs, }, } - ud := v1.NodeConfig{ - Version: "v1", + ud := v1alpha1.NodeConfig{ + Version: "v1alpha1", Machine: machine, Cluster: cluster, } diff --git a/pkg/userdata/v1/generate/talosconfig.go b/pkg/userdata/v1alpha1/generate/talosconfig.go similarity index 100% rename from pkg/userdata/v1/generate/talosconfig.go rename to pkg/userdata/v1alpha1/generate/talosconfig.go diff --git a/pkg/userdata/v1/install.go b/pkg/userdata/v1alpha1/install.go similarity index 93% rename from pkg/userdata/v1/install.go rename to pkg/userdata/v1alpha1/install.go index d8440561c..8cecc4d2f 100644 --- a/pkg/userdata/v1/install.go +++ b/pkg/userdata/v1alpha1/install.go @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// Package v1 provides user-facing v1 machine configs +// Package v1alpha1 provides user-facing v1alpha1 machine configs //nolint: dupl -package v1 +package v1alpha1 // Install represents the installation options for preparing a node. type Install struct { diff --git a/pkg/userdata/v1/machine_config.go b/pkg/userdata/v1alpha1/machine_config.go similarity index 98% rename from pkg/userdata/v1/machine_config.go rename to pkg/userdata/v1alpha1/machine_config.go index 1b86bb288..b8b2c79b9 100644 --- a/pkg/userdata/v1/machine_config.go +++ b/pkg/userdata/v1alpha1/machine_config.go @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package v1 +package v1alpha1 // MachineConfig reperesents the machine-specific config values type MachineConfig struct { diff --git a/pkg/userdata/v1/networking.go b/pkg/userdata/v1alpha1/networking.go similarity index 97% rename from pkg/userdata/v1/networking.go rename to pkg/userdata/v1alpha1/networking.go index 6b88b8f4d..d7f2e0531 100644 --- a/pkg/userdata/v1/networking.go +++ b/pkg/userdata/v1alpha1/networking.go @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// Package v1 provides user-facing v1 machine configs +// Package v1alpha1 provides user-facing v1alpha1 machine configs // nolint: dupl -package v1 +package v1alpha1 import ( "net" diff --git a/pkg/userdata/v1/node_config.go b/pkg/userdata/v1alpha1/node_config.go similarity index 95% rename from pkg/userdata/v1/node_config.go rename to pkg/userdata/v1alpha1/node_config.go index eea4172b3..72a9c3f30 100644 --- a/pkg/userdata/v1/node_config.go +++ b/pkg/userdata/v1alpha1/node_config.go @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package v1 +package v1alpha1 // NodeConfig holds the full representation of the node config type NodeConfig struct {