feat: support talosVersion in talosconfig CRD

This PR pulls in a newer version of the talos config machinery, as well
as allows users to specify a "talosVersion" as part of the talosConfig
struct. This enables backward compatibility for generating multiple
machine config types.

Signed-off-by: Spencer Smith <[email protected]>

Author: rsmitty

api/v1alpha2/zz_generated.conversion.go

@@ -26,7 +26,8 @@ const (
 
 // TalosConfigSpec defines the desired state of TalosConfig
 type TalosConfigSpec struct {
-	GenerateType  string          `json:"generateType"` //none,init,controlplane,worker mutually exclusive w/ data
+	TalosVersion  string          `json:"talosVersion,omitempty"` //talos version formatted like v0.8. used for backwards compatibility
+	GenerateType  string          `json:"generateType"`           //none,init,controlplane,worker mutually exclusive w/ data
 	Data          string          `json:"data,omitempty"`
 	ConfigPatches []ConfigPatches `json:"configPatches,omitempty"`
 	// Important: Run "make" to regenerate code after modifying this file

api/v1alpha3/talosconfig_types.go

@@ -110,6 +110,8 @@ spec:
                 type: string
               generateType:
                 type: string
+              talosVersion:
+                type: string
             required:
             - generateType
             type: object

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

@@ -104,6 +104,8 @@ spec:
                         type: string
                       generateType:
                         type: string
+                      talosVersion:
+                        type: string
                     required:
                     - generateType
                     type: object

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

@@ -27,6 +27,7 @@ import (
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
 	bootstrapv1alpha3 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"
+	"github.com/talos-systems/talos/pkg/machinery/config"
 	"github.com/talos-systems/talos/pkg/machinery/config/configpatcher"
 	"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1"
 	"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/generate"
@@ -56,6 +57,10 @@ const (
 	controllerName = "cabpt-controller"
 )
 
+var (
+	defaultVersionContract = config.TalosVersion0_8
+)
+
 // TalosConfigReconciler reconciles a TalosConfig object
 type TalosConfigReconciler struct {
 	client.Client
@@ -383,7 +388,20 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
 
 	genOptions := []generate.GenOption{generate.WithDNSDomain(clusterDNS)}
 
-	secretBundle, err := generate.NewSecretsBundle()
+	// default version contract to v0.8 unless user specifies something different.
+	versionContract := defaultVersionContract
+
+	if scope.Config.Spec.TalosVersion != "" {
+		var err error
+		versionContract, err = config.ParseContractFromVersion(scope.Config.Spec.TalosVersion)
+		if err != nil {
+			return retBundle, fmt.Errorf("invalid talos-version: %w", err)
+		}
+	}
+
+	genOptions = append(genOptions, generate.WithVersionContract(versionContract))
+
+	secretBundle, err := generate.NewSecretsBundle(generate.NewClock(), genOptions...)
 	if err != nil {
 		return retBundle, err
 	}

controllers/talosconfig_controller.go

@@ -10,8 +10,8 @@ require (
 	github.com/onsi/ginkgo v1.12.1
 	github.com/onsi/gomega v1.10.1
 	github.com/spf13/pflag v1.0.5
-	github.com/talos-systems/crypto v0.2.0
-	github.com/talos-systems/talos/pkg/machinery v0.0.0-20201203014938-ed31056d91d0
+	github.com/talos-systems/crypto v0.2.1-0.20210202170911-39584f1b6e54
+	github.com/talos-systems/talos/pkg/machinery v0.0.0-20210216142802-8d7a36cc0cc2
 	gopkg.in/yaml.v2 v2.3.0
 	k8s.io/api v0.17.9
 	k8s.io/apiextensions-apiserver v0.17.9