Merge pull request #1087 from remche/master

Fix namespace and bump to Deployment apps/v1

nfs-client/README.md

@@ -34,7 +34,7 @@ Kubernetes:
 # Set the subject of the RBAC objects to the current namespace where the provisioner is being deployed
 $ NS=$(kubectl config get-contexts|grep -e "^\*" |awk '{print $5}')
 $ NAMESPACE=${NS:-default}
-$ sed -i'' "s/namespace:.*/namespace: $NAMESPACE/g" ./deploy/rbac.yaml
+$ sed -i'' "s/namespace:.*/namespace: $NAMESPACE/g" ./deploy/rbac.yaml ./deploy/deployment.yaml
 $ kubectl create -f deploy/rbac.yaml
 ```
 

nfs-client/deploy/deployment-arm.yaml

@@ -1,14 +1,21 @@
-kind: Deployment
 apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: nfs-client-provisioner
+  labels:
+    app: nfs-client-provisioner
+  # replace with namespace where provisioner is deployed
+  namespace: default
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: nfs-client-provisioner
   strategy:
     type: Recreate
+  selector:
+    matchLabels:
+      app: nfs-client-provisioner
   template:
     metadata:
       labels:

nfs-client/deploy/deployment.yaml

@@ -1,14 +1,21 @@
-kind: Deployment
 apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: nfs-client-provisioner
+  labels:
+    app: nfs-client-provisioner
+  # replace with namespace where provisioner is deployed
+  namespace: default
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: nfs-client-provisioner
   strategy:
     type: Recreate
+  selector:
+    matchLabels:
+      app: nfs-client-provisioner
   template:
     metadata:
       labels:

nfs-client/deploy/rbac.yaml

@@ -1,7 +1,9 @@
-kind: ServiceAccount
 apiVersion: v1
+kind: ServiceAccount
 metadata:
   name: nfs-client-provisioner
+  # replace with namespace where provisioner is deployed
+  namespace: default
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -28,6 +30,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: nfs-client-provisioner
+    # replace with namespace where provisioner is deployed
     namespace: default
 roleRef:
   kind: ClusterRole
@@ -38,6 +41,8 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: leader-locking-nfs-client-provisioner
+    # replace with namespace where provisioner is deployed
+    namespace: default
 rules:
   - apiGroups: [""]
     resources: ["endpoints"]