adding persistent storage

artifacts/deployment/deployment.yaml

@@ -16,7 +16,14 @@ spec:
         apiserver: "true"
     spec:
       serviceAccountName: apiserver
+      volumes:
+        - name: hykube-provider-storage
+          persistentVolumeClaim:
+            claimName: hykube-provider-pvc
       containers:
       - name: hykube-server
         image: hykube-apiserver:latest
         imagePullPolicy: Never
+        volumeMounts:
+          - mountPath: "/data"
+            name: hykube-provider-storage

artifacts/deployment/pv.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: hykube-provider-pv
+spec:
+  capacity:
+    storage: 5Gi # ensure there's enough space for e.g. terraform providers with many versions
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: "/mnt/hykube-provider-data"
+

artifacts/deployment/pvc.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: hykube-provider-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi

docs/local-development.md

@@ -64,7 +64,9 @@ kubectl create -f artifacts/deployment/auth-reader.yaml -n kube-system
 kubectl create -f artifacts/deployment/rbac.yaml
 kubectl create -f artifacts/deployment/rbac-bind.yaml
 
-# create the service and replication controller
+# create the, PV, PVC, service and replication controller
+kubectl create -f artifacts/deployment/pv.yaml -n hykube
+kubectl create -f artifacts/deployment/pvc.yaml -n hykube
 kubectl create -f artifacts/deployment/deployment.yaml -n hykube
 kubectl create -f artifacts/deployment/service.yaml -n hykube
 
@@ -77,8 +79,8 @@ kubectl create -f artifacts/deployment/apiservice.yaml
 You should now be able to create the resource type `Provider` which is the resource type registered by the API server.
 
 ```shell
-kubectl create -f artifacts/providers/aws-provider.yaml
-# outputs provider "aws-provider" created
+kubectl create -f artifacts/providers/aws.yaml
+# outputs provider "aws" created
 ```
 
 You can then get this resource by running:

pkg/apis/hykube/types.go

@@ -45,11 +45,11 @@ type ProviderSpec struct {
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// TODO add more fields than just spec and stats
 type Provider struct {
 	metav1.TypeMeta
 	metav1.ObjectMeta
 
-	Spec   ProviderSpec
-	Status string
+	Spec     ProviderSpec
+	Status   string
+	Filename string
 }

pkg/apis/hykube/v1alpha1/conversion.go

@@ -13,11 +13,15 @@ package v1alpha1
 import (
 	"hykube.io/apiserver/pkg/apis/hykube"
 	"k8s.io/apimachinery/pkg/conversion"
-	"unsafe"
 )
 
 // Convert_v1alpha1_ProviderSpec_To_hykube_ProviderSpec is an autogenerated conversion function.
 func Convert_v1alpha1_ProviderSpec_To_hykube_ProviderSpec(in *ProviderSpec, out *hykube.ProviderSpec, s conversion.Scope) error {
+	err := autoConvert_v1alpha1_ProviderSpec_To_hykube_ProviderSpec(in, out, s)
+	if err != nil {
+		return err
+	}
+
 	if in.ReferenceType != nil {
 		// assume that ReferenceType is defaulted
 		switch *in.ReferenceType {
@@ -26,26 +30,22 @@ func Convert_v1alpha1_ProviderSpec_To_hykube_ProviderSpec(in *ProviderSpec, out
 			out.ProviderReference = in.Reference
 		}
 	}
-
-	out.DownloadName = in.DownloadName
-	out.Version = (*string)(unsafe.Pointer(in.Version))
-	out.DownloadUrl = (*string)(unsafe.Pointer(in.DownloadUrl))
-
 	return nil
 }
 
 // Convert_hykube_ProviderSpec_To_v1alpha1_ProviderSpec is an autogenerated conversion function.
 func Convert_hykube_ProviderSpec_To_v1alpha1_ProviderSpec(in *hykube.ProviderSpec, out *ProviderSpec, s conversion.Scope) error {
+	err := autoConvert_hykube_ProviderSpec_To_v1alpha1_ProviderSpec(in, out, s)
+	if err != nil {
+		return err
+	}
+
 	switch in.ReferenceType {
 	case hykube.ProviderReferenceType:
 		t := ProviderReferenceType
 		out.ReferenceType = &t
 		out.Reference = in.ProviderReference
 	}
 
-	out.DownloadName = in.DownloadName
-	out.Version = (*string)(unsafe.Pointer(in.Version))
-	out.DownloadUrl = (*string)(unsafe.Pointer(in.DownloadUrl))
-
 	return nil
 }

pkg/apis/hykube/v1alpha1/types.go

@@ -54,6 +54,7 @@ type Provider struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
-	Spec   ProviderSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
-	Status string       `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"`
+	Spec     ProviderSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
+	Status   string       `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"`
+	Filename string       `json:"filename,omitempty" protobuf:"bytes,4,opt,name=filename"`
 }

pkg/registry/hykube/provider/etcd.go

@@ -55,8 +55,8 @@ func NewREST(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*reg
 		return nil, err
 	}
 	providerWatcher := watcher{
-		watch: watch,
-		store: store,
+		watch:             watch,
+		hashicorpProvider: NewHashicorpProvider(store),
 	}
 	providerWatcher.Start()