Merge branch 'master' into master
This commit is contained in:
		
						commit
						18cd31b4d8
					
				| 
						 | 
					@ -58,11 +58,14 @@ Next you must edit the provisioner's deployment file to add connection informati
 | 
				
			||||||
 | 
					
 | 
				
			||||||
```yaml
 | 
					```yaml
 | 
				
			||||||
kind: Deployment
 | 
					kind: Deployment
 | 
				
			||||||
apiVersion: extensions/v1beta1
 | 
					apiVersion: apps/v1
 | 
				
			||||||
metadata:
 | 
					metadata:
 | 
				
			||||||
  name: nfs-client-provisioner
 | 
					  name: nfs-client-provisioner
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
  replicas: 1
 | 
					  replicas: 1
 | 
				
			||||||
 | 
					  selector:
 | 
				
			||||||
 | 
					    matchLabels:
 | 
				
			||||||
 | 
					      app: nfs-client-provisioner
 | 
				
			||||||
  strategy:
 | 
					  strategy:
 | 
				
			||||||
    type: Recreate
 | 
					    type: Recreate
 | 
				
			||||||
  template:
 | 
					  template:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,6 +8,9 @@ metadata:
 | 
				
			||||||
  namespace: default
 | 
					  namespace: default
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
  replicas: 1
 | 
					  replicas: 1
 | 
				
			||||||
 | 
					  selector:
 | 
				
			||||||
 | 
					    matchLabels:
 | 
				
			||||||
 | 
					      app: nfs-client-provisioner
 | 
				
			||||||
  strategy:
 | 
					  strategy:
 | 
				
			||||||
    type: Recreate
 | 
					    type: Recreate
 | 
				
			||||||
  selector:
 | 
					  selector:
 | 
				
			||||||
| 
						 | 
					@ -29,11 +32,11 @@ spec:
 | 
				
			||||||
            - name: PROVISIONER_NAME
 | 
					            - name: PROVISIONER_NAME
 | 
				
			||||||
              value: fuseim.pri/ifs
 | 
					              value: fuseim.pri/ifs
 | 
				
			||||||
            - name: NFS_SERVER
 | 
					            - name: NFS_SERVER
 | 
				
			||||||
              value: 192.168.1.20
 | 
					              value: 10.10.10.60
 | 
				
			||||||
            - name: NFS_PATH
 | 
					            - name: NFS_PATH
 | 
				
			||||||
              value: /mnt/kube_nfs
 | 
					              value: /ifs/kubernetes
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - name: nfs-client-root
 | 
					        - name: nfs-client-root
 | 
				
			||||||
          nfs:
 | 
					          nfs:
 | 
				
			||||||
            server: 192.168.1.20
 | 
					            server: 10.10.10.60
 | 
				
			||||||
            path: /mnt/kube_nfs
 | 
					            path: /ifs/kubernetes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,6 +8,9 @@ metadata:
 | 
				
			||||||
  namespace: default
 | 
					  namespace: default
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
  replicas: 1
 | 
					  replicas: 1
 | 
				
			||||||
 | 
					  selector:
 | 
				
			||||||
 | 
					    matchLabels:
 | 
				
			||||||
 | 
					      app: nfs-client-provisioner
 | 
				
			||||||
  strategy:
 | 
					  strategy:
 | 
				
			||||||
    type: Recreate
 | 
					    type: Recreate
 | 
				
			||||||
  selector:
 | 
					  selector:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,7 +11,7 @@ spec:
 | 
				
			||||||
      labels:
 | 
					      labels:
 | 
				
			||||||
        app: nfs-client-provisioner
 | 
					        app: nfs-client-provisioner
 | 
				
			||||||
    spec:
 | 
					    spec:
 | 
				
			||||||
      serviceAccount: nfs-client-provisioner
 | 
					      serviceAccountName: nfs-client-provisioner
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
        - name: nfs-client-provisioner
 | 
					        - name: nfs-client-provisioner
 | 
				
			||||||
          image: quay.io/external_storage/nfs-client-provisioner-arm:latest
 | 
					          image: quay.io/external_storage/nfs-client-provisioner-arm:latest
 | 
				
			||||||
| 
						 | 
					@ -22,11 +22,11 @@ spec:
 | 
				
			||||||
            - name: PROVISIONER_NAME
 | 
					            - name: PROVISIONER_NAME
 | 
				
			||||||
              value: fuseim.pri/ifs
 | 
					              value: fuseim.pri/ifs
 | 
				
			||||||
            - name: NFS_SERVER
 | 
					            - name: NFS_SERVER
 | 
				
			||||||
              value: 192.168.1.20
 | 
					              value: 10.10.10.60
 | 
				
			||||||
            - name: NFS_PATH
 | 
					            - name: NFS_PATH
 | 
				
			||||||
              value: /mnt/kube_nfs
 | 
					              value: /ifs/kubernetes
 | 
				
			||||||
      volumes:
 | 
					      volumes:
 | 
				
			||||||
        - name: nfs-client-root
 | 
					        - name: nfs-client-root
 | 
				
			||||||
          nfs:
 | 
					          nfs:
 | 
				
			||||||
            server: 192.168.1.20
 | 
					            server: 10.10.10.60
 | 
				
			||||||
            path: /mnt/kube_nfs
 | 
					            path: /ifs/kubernetes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue