From 95cdb664bd66384b5b077bc003f6ee0056c11db2 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Sat, 29 Dec 2018 20:22:59 -0600 Subject: [PATCH 1/4] Make nfs-client ARM deployment consistent with regular deployment. --- deploy/deployment-arm.yaml | 10 +++++----- deploy/objects/deployment-arm.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deploy/deployment-arm.yaml b/deploy/deployment-arm.yaml index 785302bd..feef4efc 100644 --- a/deploy/deployment-arm.yaml +++ b/deploy/deployment-arm.yaml @@ -16,7 +16,7 @@ spec: labels: app: nfs-client-provisioner spec: - serviceAccount: nfs-client-provisioner + serviceAccountName: nfs-client-provisioner containers: - name: nfs-client-provisioner image: quay.io/external_storage/nfs-client-provisioner-arm:latest @@ -27,11 +27,11 @@ spec: - name: PROVISIONER_NAME value: fuseim.pri/ifs - name: NFS_SERVER - value: 192.168.1.20 + value: 10.10.10.60 - name: NFS_PATH - value: /mnt/kube_nfs + value: /ifs/kubernetes volumes: - name: nfs-client-root nfs: - server: 192.168.1.20 - path: /mnt/kube_nfs + server: 10.10.10.60 + path: /ifs/kubernetes diff --git a/deploy/objects/deployment-arm.yaml b/deploy/objects/deployment-arm.yaml index 9f09acca..9cced7e5 100644 --- a/deploy/objects/deployment-arm.yaml +++ b/deploy/objects/deployment-arm.yaml @@ -11,7 +11,7 @@ spec: labels: app: nfs-client-provisioner spec: - serviceAccount: nfs-client-provisioner + serviceAccountName: nfs-client-provisioner containers: - name: nfs-client-provisioner image: quay.io/external_storage/nfs-client-provisioner-arm:latest @@ -22,11 +22,11 @@ spec: - name: PROVISIONER_NAME value: fuseim.pri/ifs - name: NFS_SERVER - value: 192.168.1.20 + value: 10.10.10.60 - name: NFS_PATH - value: /mnt/kube_nfs + value: /ifs/kubernetes volumes: - name: nfs-client-root nfs: - server: 192.168.1.20 - path: /mnt/kube_nfs + server: 10.10.10.60 + path: /ifs/kubernetes From 8419bd8f64c9472009a488717f033a78b5d6eebe Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Tekuri Date: Fri, 7 Jun 2019 13:16:14 +0530 Subject: [PATCH 2/4] Remove ServiceAccount from deployment yaml files ServiceAccount is already defined in rbac.yaml --- deploy/deployment-arm.yaml | 5 ----- deploy/deployment.yaml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/deploy/deployment-arm.yaml b/deploy/deployment-arm.yaml index feef4efc..9cced7e5 100644 --- a/deploy/deployment-arm.yaml +++ b/deploy/deployment-arm.yaml @@ -1,8 +1,3 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: nfs-client-provisioner ---- kind: Deployment apiVersion: extensions/v1beta1 metadata: diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml index 271ca060..1b793676 100644 --- a/deploy/deployment.yaml +++ b/deploy/deployment.yaml @@ -1,8 +1,3 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: nfs-client-provisioner ---- kind: Deployment apiVersion: extensions/v1beta1 metadata: From c6853e0440ec5383610337703f169a09ce955ec9 Mon Sep 17 00:00:00 2001 From: TJ Zimmerman Date: Mon, 30 Sep 2019 17:18:52 -0700 Subject: [PATCH 3/4] Updated API Version, Added selector field. --- deploy/deployment-arm.yaml | 5 ++++- deploy/deployment.yaml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/deploy/deployment-arm.yaml b/deploy/deployment-arm.yaml index feef4efc..8fce2842 100644 --- a/deploy/deployment-arm.yaml +++ b/deploy/deployment-arm.yaml @@ -4,11 +4,14 @@ metadata: name: nfs-client-provisioner --- kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 metadata: name: nfs-client-provisioner spec: replicas: 1 + selector: + matchLabels: + app: nfs-client-provisioner strategy: type: Recreate template: diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml index 271ca060..911618fb 100644 --- a/deploy/deployment.yaml +++ b/deploy/deployment.yaml @@ -4,11 +4,14 @@ metadata: name: nfs-client-provisioner --- kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 metadata: name: nfs-client-provisioner spec: replicas: 1 + selector: + matchLabels: + app: nfs-client-provisioner strategy: type: Recreate template: From 39c59187641ad4aa8cd6b816f810b0f2383d02c4 Mon Sep 17 00:00:00 2001 From: TJ Zimmerman Date: Mon, 30 Sep 2019 22:15:10 -0700 Subject: [PATCH 4/4] Updated API Version & Added selector. --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8da4d14f..6f9bcbb3 100644 --- a/README.md +++ b/README.md @@ -58,11 +58,14 @@ Next you must edit the provisioner's deployment file to add connection informati ```yaml kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 metadata: name: nfs-client-provisioner spec: replicas: 1 + selector: + matchLabels: + app: nfs-client-provisioner strategy: type: Recreate template: