refactor kubernetes version into provider (#3)

* refactor kubernetes version into provider

* revert bad decrements

* minor refactoring for easier tf doc generation

* allow GetK8sVersion to be called multiple times

* fix up schema in template

Author: scott-the-programmer

README.md

@@ -16,6 +16,7 @@ This requires _admin_ permissions
 
 ```bash
 minikube --vm=true --driver=hyperkit --download-only
+minikube --vm=true --driver=hyperv --download-only
 minikube --driver=docker --download-only
 ```
 
@@ -37,12 +38,13 @@ curl https://raw.githubusercontent.com/scott-the-programmer/terraform-provider-m
 ## Usage
 
 ```terraform
-provider minikube {}
+provider minikube {
+  kubernetes_version = "v1.23.3"
+}
 
 resource "minikube_cluster" "cluster" {
   vm = true
   driver = "hyperkit"
-  kubernetes_version = "v1.23.3"
   addons = [
     "dashboard",
     "default-storageclass",
@@ -65,4 +67,4 @@ You can use `minikube` to verify the cluster is up & running
 
 ## Want to help out?
 
-See [the contributing](./docs/contributing.md) if you wish to get into the details of this terraform minikube provider!
+See [the contributing](./contributing.md) if you wish to get into the details of this terraform minikube provider!

docs/contributing.md renamed to contributing.md

@@ -1,12 +1,10 @@
 ---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "minikube Provider"
-subcategory: ""
 description: |-
-  
+  A terraform provider for [minikube!](https://minikube.sigs.k8s.io/docs/)
 ---
 
-# minikube Provider
+# Minikube Provider
 
 A terraform provider for [minikube!](https://minikube.sigs.k8s.io/docs/)
 
@@ -31,16 +29,24 @@ preferred driver and copy it to your .minikube/bin folder and ensure the current
 ### Living dangerously
 
 ```bash
-#x85_64
-curl https://raw.githubusercontent.com/scott-the-programmer/terraform-provider-minikube/main/bootstrap/install-driver.sh | sudo bash -s "kvm1"
+#x86_64
+curl https://raw.githubusercontent.com/scott-the-programmer/terraform-provider-minikube/main/bootstrap/install-driver.sh | sudo bash -s "kvm2"
 
-#arm63
-curl https://raw.githubusercontent.com/scott-the-programmer/terraform-provider-minikube/main/bootstrap/install-driver.sh | sudo bash -s "kvm1" "arm64"
+#arm62
+curl https://raw.githubusercontent.com/scott-the-programmer/terraform-provider-minikube/main/bootstrap/install-driver.sh | sudo bash -s "kvm2" "arm64"
 ```
 
 ## Example Usage
 
 ```terraform
-provider "minikube" {}
+provider "minikube" { 
+  kubernetes_version = "v1.23.3"
+}
 ```
+<br/><!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `kubernetes_version` (String) The Kubernetes version that the minikube VM will use (ex  v1.2.3, 'stable' for v1.22.3, 'latest' for v1.22.4-rc.0). Defaults to 'stable'.
 

docs/index.md

@@ -8,16 +8,17 @@ description: |-
 
 # minikube_cluster (Resource)
 
-Used to create a minikube cluster on the current host. You'll need to have a docker driver installed first (see the provider docs). 
-
-You'll be able to spin up and manage clusters exclusively with terraform, mimicking the process of using a cloud managed k8s cluster such as AKS / EKS / LKS 
+Used to create a minikube cluster on the current host
 
 ## Example Usage
 
 ```terraform
+provider "minikube" { 
+  kubernetes_version = "v1.23.3"
+}
+
 resource "minikube_cluster" "docker" {
   driver = "docker"
-  kubernetes_version = "v1.23.3"
   cluster_name = "terraform-provider-minikube-acc-docker"
   addons = [
     "default-storageclass",
@@ -28,7 +29,6 @@ resource "minikube_cluster" "hyperkit" {
   vm = true
   driver = "hyperkit"
   cluster_name = "terraform-provider-minikube-acc-hyperkit"
-  kubernetes_version = "v1.23.3"
   nodes = 3
   addons = [
     "dashboard",

docs/resources/cluster.md

@@ -1 +1,3 @@
-provider "minikube" {}
+provider "minikube" { 
+  kubernetes_version = "v1.23.3"
+}

examples/provider/provider.tf

@@ -1,6 +1,9 @@
+provider "minikube" { 
+  kubernetes_version = "v1.23.3"
+}
+
 resource "minikube_cluster" "docker" {
   driver = "docker"
-  kubernetes_version = "v1.23.3"
   cluster_name = "terraform-provider-minikube-acc-docker"
   addons = [
     "default-storageclass",
@@ -11,7 +14,6 @@ resource "minikube_cluster" "hyperkit" {
   vm = true
   driver = "hyperkit"
   cluster_name = "terraform-provider-minikube-acc-hyperkit"
-  kubernetes_version = "v1.23.3"
   nodes = 3
   addons = [
     "dashboard",

examples/resources/minikube_cluster/resource.tf

@@ -19,21 +19,31 @@ func Provider() *schema.Provider {
 
 func NewProvider(providerConfigure schema.ConfigureContextFunc) *schema.Provider {
 	return &schema.Provider{
-		Schema: map[string]*schema.Schema{},
 		ResourcesMap: map[string]*schema.Resource{
 			"minikube_cluster": ResourceCluster(),
 		},
 		DataSourcesMap:       map[string]*schema.Resource{},
 		ConfigureContextFunc: providerConfigure,
+		Schema: map[string]*schema.Schema{
+			"kubernetes_version": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The Kubernetes version that the minikube VM will use (ex  v1.2.3, 'stable' for v1.22.3, 'latest' for v1.22.4-rc.0). Defaults to 'stable'.",
+				Default:     "v1.23.3",
+			},
+		},
 	}
 }
 
 func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
 	mutex := &sync.Mutex{}
+	k8sVersion := d.Get("kubernetes_version").(string)
 	minikubeClientFactory := func() (service.ClusterClient, error) {
-		return &service.MinikubeClient{TfCreationLock: mutex}, nil
+		return &service.MinikubeClient{
+			TfCreationLock: mutex,
+			K8sVersion:     k8sVersion}, nil
 	}
 	return minikubeClientFactory, diags
 }

minikube/provider.go

@@ -227,7 +227,7 @@ func initialiseMinikubeClient(d *schema.ResourceData, m interface{}) (service.Cl
 		ports = []string{}
 	}
 
-	k8sVersion := d.Get("kubernetes_version").(string)
+	k8sVersion := clusterClient.GetK8sVersion()
 	kubernetesConfig := config.KubernetesConfig{
 		KubernetesVersion: k8sVersion,
 		ClusterName:       d.Get("cluster_name").(string),

minikube/resource_cluster.go

@@ -211,6 +211,11 @@ func mockSuccess(t *testing.T, clusterName string) schema.ConfigureContextFunc {
 		Delete().
 		Return(nil)
 
+	mockClusterClient.EXPECT().
+		GetK8sVersion().
+		Return("v1.99.9").
+		AnyTimes()
+
 	configureContext := func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
 		var diags diag.Diagnostics
 		mockClusterClientFactory := func() (service.ClusterClient, error) {

minikube/resource_cluster_test.go

@@ -1,4 +1,4 @@
-//go:generate mockgen -source=$GOFILE -destination=mock_$GOFILE -package=$GOPACKAGE
+//go:generate go run github.com/golang/mock/mockgen -source=$GOFILE -destination=mock_$GOFILE -package=$GOPACKAGE
 package service
 
 import (
@@ -27,6 +27,7 @@ type ClusterClient interface {
 	Start() (*kubeconfig.Settings, error)
 	Delete() error
 	GetClusterConfig() *config.ClusterConfig
+	GetK8sVersion() string
 }
 
 type MinikubeClient struct {
@@ -40,6 +41,7 @@ type MinikubeClient struct {
 	// TfCreationLock is a mutex used to prevent multiple minikube clients from conflicting on Start().
 	// Only set this if you're using MinikubeClient in a concurrent context
 	TfCreationLock *sync.Mutex
+	K8sVersion     string
 
 	nRunner Node
 	dLoader Downloader
@@ -183,6 +185,10 @@ func (e *MinikubeClient) GetClusterConfig() *config.ClusterConfig {
 	return cluster.Config
 }
 
+func (e *MinikubeClient) GetK8sVersion() string {
+	return e.K8sVersion
+}
+
 // downloadIsos retrieve all prerequisite images prior to provisioning
 func (e *MinikubeClient) downloadIsos() (string, error) {
 	url, err := e.dLoader.ISO(e.isoUrls, true)