More Xen cleanup

driver/deploy/daemon.yaml

@@ -9,7 +9,7 @@ spec:
         app: hetzner-driver
     spec:
       containers:
-        - image: stevenklar/hetzner-volume-driver:0.1
+        - image: stevenklar/hetzner-cloud-driver:0.1
           name: hetzner-driver
           securityContext:
             privileged: true

driver/deployer

@@ -3,12 +3,12 @@
 set -o errexit
 set -o pipefail
 
-if [ ! -d /kubelet-plugins/spangenberg.io~xenserver ]; then
-  mkdir /kubelet-plugins/spangenberg.io~xenserver
-fi
-
-cp /usr/local/bin/xenserver /kubelet-plugins/spangenberg.io~xenserver/.tmp_xenserver
-mv -f /kubelet-plugins/spangenberg.io~xenserver/.tmp_xenserver /kubelet-plugins/spangenberg.io~xenserver/xenserver
+#if [ ! -d /kubelet-plugins/spangenberg.io~xenserver ]; then
+#  mkdir /kubelet-plugins/spangenberg.io~xenserver
+#fi
+#
+#cp /usr/local/bin/xenserver /kubelet-plugins/spangenberg.io~xenserver/.tmp_xenserver
+#mv -f /kubelet-plugins/spangenberg.io~xenserver/.tmp_xenserver /kubelet-plugins/spangenberg.io~xenserver/xenserver
 
 while : ; do
   sleep 3600

provisioner/README.md

@@ -11,8 +11,8 @@ Credentials will be passed on every node and persisted to disk for every volume.
 Future releases will fix this issue.
 
 ```console
-$ kubectl create secret generic hetzner-token \
---from-literal=api=s0m3l33tt0k3n
+$ kubectl create secret generic hetzner-cloud \
+--from-literal=token=s0m3l33tt0k3n
 ```
 
 ```console

provisioner/delete.go

@@ -1,14 +1,11 @@
 package main
 
 import (
-	"errors"
-	"fmt"
-
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 )
 
-func (p *xenServerProvisioner) Delete(volume *v1.PersistentVolume) error {
+func (p *hetznerProvisioner) Delete(volume *v1.PersistentVolume) error {
 	glog.Infof("Delete called for volume: %s", volume.Name)
 
     // TODO: Delete from hetzner

provisioner/deploy/auth/clusterrole.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: rbac.authorization.k8s.io/v1
 metadata:
-  name: xenserver-provisioner-runner
+  name: hetzner-provisioner-runner
 rules:
   - apiGroups: [""]
     resources: ["events"]

provisioner/deploy/auth/clusterrolebinding.yaml

@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: run-xenserver-provisioner
+  name: run-hetzner-provisioner
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: xenserver-provisioner-runner
+  name: hetzner-provisioner-runner
 subjects:
   - kind: ServiceAccount
-    name: xenserver-provisioner
-    namespace: xenserver-provisioner
+    name: hetzner-provisioner
+    namespace: hetzner-provisioner

provisioner/deploy/auth/openshift-clusterrole.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ClusterRole
 metadata:
-  name: xenserver-provisioner-runner
+  name: hetzner-provisioner-runner
 rules:
   - apiGroups: [""]
     resources: ["events"]

provisioner/deploy/auth/serviceaccount.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: xenserver-provisioner
+  name: hetzner-provisioner

provisioner/deploy/claim.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
+  name: hetzner-cloud-pvc
   annotations:
-    volume.beta.kubernetes.io/storage-class: xenserver-default
-  name: xenserver
+    volume.beta.kubernetes.io/storage-class: hetzner-cloud-default
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 1Mi
+      storage: 10Gi

provisioner/deploy/class.yaml

@@ -1,7 +1,6 @@
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  name: xenserver-default
+  name: hetzner-cloud-default
 parameters:
-  spangenberg.io/xenserver/srName: Default
-provisioner: spangenberg.io/xenserver-provisioner
+provisioner: stevenklar/hetzner-provisioner

provisioner/deploy/deployment.yaml

@@ -1,32 +1,22 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: xenserver-provisioner
+  name: hetzner-provisioner
 spec:
   replicas: 1
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: xenserver-provisioner
+        app: hetzner-provisioner
     spec:
       containers:
-        - env:
-            - name: XENSERVER_HOST
-              valueFrom:
-                configMapKeyRef:
-                  key: host
-                  name: xenserver
-            - name: XENSERVER_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  key: username
-                  name: xenserver
-            - name: XENSERVER_PASSWORD
+        - name: provisioner
+          image: stevenklar/hetzner-provisioner:0.1
+          env:
+            - name: HETZNER_TOKEN
               valueFrom:
                 secretKeyRef:
-                  key: password
-                  name: xenserver
-          image: spangenberg/xenserver-provisioner:0.2
-          name: xenserver-provisioner
+                  key: token
+                  name: hetzner-cloud

provisioner/deploy/secret.yaml

@@ -1,8 +1,7 @@
 apiVersion: v1
 data:
-  password: Zm9v
-  username: cm9vdA==
+  token: Zm9v
 kind: Secret
 metadata:
-  name: xenserver
+  name: hetzner-cloud
 type: Opaque

provisioner/provision.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/golang/glog"
 	"github.com/kubernetes-incubator/external-storage/lib/controller"
 	"k8s.io/api/core/v1"
@@ -11,7 +9,7 @@ import (
 
 const defaultFSType = "ext4"
 
-func (p *xenServerProvisioner) Provision(options controller.VolumeOptions) (*v1.PersistentVolume, error) {
+func (p *hetznerProvisioner) Provision(options controller.VolumeOptions) (*v1.PersistentVolume, error) {
 	glog.Infof("Provision called for volume: %s", options.PVName)
 
     // TODO: Provision on Hetzner Cloud
@@ -27,7 +25,7 @@ func (p *xenServerProvisioner) Provision(options controller.VolumeOptions) (*v1.
 			},
 			PersistentVolumeReclaimPolicy: options.PersistentVolumeReclaimPolicy,
 			PersistentVolumeSource: v1.PersistentVolumeSource{
-				FlexVolume: &v1.FlexVolumeSource{
+				FlexVolume: &v1.FlexPersistentVolumeSource{
 					Driver: driver,
 					FSType: defaultFSType,
 					Options: map[string]string{

provisioner/provisioner.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/kubernetes-incubator/external-storage/lib/controller"