Merge pull request #86 from andyzhangx/use-quay

doc: use quay images
This commit is contained in:
Andy Zhang 2020-11-17 11:49:38 +08:00 committed by GitHub
commit b7e62d5eac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions

View File

@ -25,12 +25,11 @@ spec:
effect: "NoSchedule" effect: "NoSchedule"
containers: containers:
- name: csi-provisioner - name: csi-provisioner
image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v1.4.0 image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4
args: args:
- "-v=5" - "-v=5"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--enable-leader-election" - "--leader-election"
- "--leader-election-type=leases"
env: env:
- name: ADDRESS - name: ADDRESS
value: /csi/csi.sock value: /csi/csi.sock
@ -45,7 +44,7 @@ spec:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi
- name: liveness-probe - name: liveness-probe
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.0.0 image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0
args: args:
- --csi-address=/csi/csi.sock - --csi-address=/csi/csi.sock
- --probe-timeout=3s - --probe-timeout=3s
@ -62,7 +61,7 @@ spec:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi
- name: nfs - name: nfs
image: quay.io/k8scsi/nfsplugin:v2.0.0 image: gcr.io/k8s-staging-sig-storage/nfsplugin:amd64-linux-canary
securityContext: securityContext:
privileged: true privileged: true
capabilities: capabilities:

View File

@ -18,7 +18,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
containers: containers:
- name: node-driver-registrar - name: node-driver-registrar
image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2 image: quay.io/k8scsi/csi-node-driver-registrar:v2.0.1
lifecycle: lifecycle:
preStop: preStop:
exec: exec:
@ -43,7 +43,7 @@ spec:
capabilities: capabilities:
add: ["SYS_ADMIN"] add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true allowPrivilegeEscalation: true
image: quay.io/k8scsi/nfsplugin:v2.0.0 image: gcr.io/k8s-staging-sig-storage/nfsplugin:amd64-linux-canary
args : args :
- "-v=5" - "-v=5"
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"

View File

@ -21,11 +21,11 @@ if [[ "$#" -gt 0 ]]; then
ver="$1" ver="$1"
fi fi
repo="https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/$ver/deploy/kubernetes" repo="https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/$ver/deploy"
if [[ "$#" -gt 1 ]]; then if [[ "$#" -gt 1 ]]; then
if [[ "$2" == *"local"* ]]; then if [[ "$2" == *"local"* ]]; then
echo "use local deploy" echo "use local deploy"
repo="./deploy/kubernetes" repo="./deploy"
fi fi
fi fi