From decfc00b5dfaf7595a0c6b64e7dc7064da42b74f Mon Sep 17 00:00:00 2001 From: Changjian Gao Date: Mon, 31 May 2021 15:15:44 +0800 Subject: [PATCH] Update value of resource name in examples (#94) --- .../README.md | 4 ++-- .../patches.yaml | 2 +- .../static-provisioning-permissions/README.md | 18 +++++++++--------- .../kustomization.yaml | 2 +- .../resources.yaml | 4 ++-- examples/static-provisioning-rwx/README.md | 6 +++--- .../static-provisioning-rwx/kustomization.yaml | 2 +- .../static-provisioning-rwx/resources.yaml | 4 ++-- examples/static-provisioning-subpath/README.md | 8 ++++---- .../kustomization.yaml | 2 +- .../static-provisioning-subpath/patches.yaml | 2 +- examples/static-provisioning/README.md | 2 +- .../static-provisioning/kustomization.yaml | 2 +- examples/static-provisioning/resources.yaml | 12 ++++++------ 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/examples/static-provisioning-mount-options/README.md b/examples/static-provisioning-mount-options/README.md index 1bf758b205..4f25c2cc6d 100644 --- a/examples/static-provisioning-mount-options/README.md +++ b/examples/static-provisioning-mount-options/README.md @@ -20,7 +20,7 @@ Patch the persistent volume spec with `csi/volumeAttributes/mountOptions`. apiVersion: v1 kind: PersistentVolume metadata: - name: juicefs-aws-us-east-1 + name: juicefs-pv spec: csi: volumeAttributes: @@ -42,7 +42,7 @@ kustomize build | kubectl apply -f - After the configuration is applied, verify that pod is running: ```sh -kubectl get pods +kubectl get pods juicefs-app-mount-options ``` Also you can verify that mount options are customized in the mounted JuiceFS file system: diff --git a/examples/static-provisioning-mount-options/patches.yaml b/examples/static-provisioning-mount-options/patches.yaml index f30c3fadcb..491cad0785 100644 --- a/examples/static-provisioning-mount-options/patches.yaml +++ b/examples/static-provisioning-mount-options/patches.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: juicefs-aws-us-east-1 + name: juicefs-pv spec: csi: volumeAttributes: diff --git a/examples/static-provisioning-permissions/README.md b/examples/static-provisioning-permissions/README.md index 4104e8f244..57b9b515d2 100644 --- a/examples/static-provisioning-permissions/README.md +++ b/examples/static-provisioning-permissions/README.md @@ -30,21 +30,21 @@ The `owner` container is run as user `1000` and group `3000`. Check the file it umask is `0022` ```sh ->> kubectl exec -it app-perms-7c6c95b68-76g8g -c owner -- id +>> kubectl exec -it juicefs-app-perms-7c6c95b68-76g8g -c owner -- id uid=1000 gid=3000 groups=3000 ->> kubectl exec -it app-perms-7c6c95b68-76g8g -c owner -- umask +>> kubectl exec -it juicefs-app-perms-7c6c95b68-76g8g -c owner -- umask 0022 ->> kubectl exec -it app-perms-7c6c95b68-76g8g -c owner -- ls -l /data +>> kubectl exec -it juicefs-app-perms-7c6c95b68-76g8g -c owner -- ls -l /data total 707088 --rw-r--r-- 1 1000 3000 3780 Aug 9 11:23 out-app-perms-7c6c95b68-76g8g.txtkubectl get pods +-rw-r--r-- 1 1000 3000 3780 Aug 9 11:23 out-juicefs-app-perms-7c6c95b68-76g8g.txtkubectl get pods ``` The `group` container is run as user `2000` and group `3000`. Check the file is readable by other user in the group. ```sh ->> kubectl exec -it app-perms-7c6c95b68-76g8g -c group -- id +>> kubectl exec -it juicefs-app-perms-7c6c95b68-76g8g -c group -- id uid=2000 gid=3000 groups=3000 ->> kubectl logs app-perms-7c6c95b68-76g8g group +>> kubectl logs juicefs-app-perms-7c6c95b68-76g8g group Fri Aug 9 10:08:32 UTC 2019 Fri Aug 9 10:08:37 UTC 2019 ... @@ -53,9 +53,9 @@ Fri Aug 9 10:08:37 UTC 2019 The `other` container is run as user `3000` and group `4000`. Check the file is not writable for users not in the group. ```sh ->> kubectl exec -it app-perms-7c6c95b68-76g8g -c other -- id +>> kubectl exec -it juicefs-app-perms-7c6c95b68-76g8g -c other -- id uid=3000 gid=4000 groups=4000 ->> kubectl logs app-perms-7c6c95b68-76g8g -c other -/bin/sh: /data/out-app-perms-7c6c95b68-76g8g.txt: Permission denied +>> kubectl logs juicefs-app-perms-7c6c95b68-76g8g -c other +/bin/sh: /data/out-juicefs-app-perms-7c6c95b68-76g8g.txt: Permission denied ... ``` diff --git a/examples/static-provisioning-permissions/kustomization.yaml b/examples/static-provisioning-permissions/kustomization.yaml index 902cdee505..dba7062619 100644 --- a/examples/static-provisioning-permissions/kustomization.yaml +++ b/examples/static-provisioning-permissions/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization namespace: default nameSuffix: -perms commonLabels: - app: perms + app: juicefs-perms bases: - ../static-provisioning resources: diff --git a/examples/static-provisioning-permissions/resources.yaml b/examples/static-provisioning-permissions/resources.yaml index ba3637b3e8..27d61f1559 100644 --- a/examples/static-provisioning-permissions/resources.yaml +++ b/examples/static-provisioning-permissions/resources.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: app + name: juicefs-app spec: template: spec: @@ -67,4 +67,4 @@ spec: volumes: - name: data persistentVolumeClaim: - claimName: ten-pb-fs + claimName: juicefs-pvc diff --git a/examples/static-provisioning-rwx/README.md b/examples/static-provisioning-rwx/README.md index 1505a32e12..26966f2b7b 100644 --- a/examples/static-provisioning-rwx/README.md +++ b/examples/static-provisioning-rwx/README.md @@ -27,13 +27,13 @@ kubectl apply -k . Scale up ```s -kubectl scale -n default deployment scaling-app-rwx --replicas=64 +kubectl scale -n default deployment juicefs-app-rwx --replicas=64 ``` Scale down ```s -kubectl scale -n default deployment scaling-app-rwx --replicas=1 +kubectl scale -n default deployment juicefs-app-rwx --replicas=1 ``` ## Check JuiceFS file system is used @@ -41,7 +41,7 @@ kubectl scale -n default deployment scaling-app-rwx --replicas=1 After the configuration is applied, verify that pod is running: ```sh ->> kubectl get pods +>> kubectl get pods -l app=juicefs-pv-rwx ``` Also you can verify that data is written onto JuiceFS file system: diff --git a/examples/static-provisioning-rwx/kustomization.yaml b/examples/static-provisioning-rwx/kustomization.yaml index 53de757198..d41b7129a6 100644 --- a/examples/static-provisioning-rwx/kustomization.yaml +++ b/examples/static-provisioning-rwx/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization namespace: default nameSuffix: -rwx commonLabels: - app: pv-rwx + app: juicefs-pv-rwx bases: - ../static-provisioning resources: diff --git a/examples/static-provisioning-rwx/resources.yaml b/examples/static-provisioning-rwx/resources.yaml index 859cee825f..497147ad3e 100644 --- a/examples/static-provisioning-rwx/resources.yaml +++ b/examples/static-provisioning-rwx/resources.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: scaling-app + name: juicefs-app spec: template: spec: @@ -42,4 +42,4 @@ spec: volumes: - name: data persistentVolumeClaim: - claimName: ten-pb-fs + claimName: juicefs-pvc diff --git a/examples/static-provisioning-subpath/README.md b/examples/static-provisioning-subpath/README.md index 9fedaa954a..be27ff60f8 100644 --- a/examples/static-provisioning-subpath/README.md +++ b/examples/static-provisioning-subpath/README.md @@ -6,13 +6,13 @@ Persisten volume can be provisioned as a subpath in juicefs file system. Ensure you have already get familiar with [static-provisioning](../static-provisioning/README.md) example. -Patch the persistent volume spec with `csi/volumeAttributes/subPath`. The subPath must pre-exist. +Patch the persistent volume spec with `csi/volumeAttributes/subPath`. The `subPath` must pre-exist. ```yaml apiVersion: v1 kind: PersistentVolume metadata: - name: juicefs-aws-us-east-1 + name: juicefs-pv spec: csi: volumeAttributes: @@ -38,11 +38,11 @@ kubectl apply -k . After the objects are created, verify that pod is running: ```sh ->> kubectl get pods +>> kubectl get pods juicefs-app-subpath ``` Also you can verify that data is written onto JuiceFS file system: ```sh ->> kubectl exec -ti juicefs-app -- tail -f /data/out.txt +>> kubectl exec -ti juicefs-app-subpath -- tail -f /data/out.txt ``` diff --git a/examples/static-provisioning-subpath/kustomization.yaml b/examples/static-provisioning-subpath/kustomization.yaml index 80cd2d1e0b..f2fd50c046 100644 --- a/examples/static-provisioning-subpath/kustomization.yaml +++ b/examples/static-provisioning-subpath/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: default -nameSuffix: -fluentd +nameSuffix: -subpath bases: - ../static-provisioning patchesStrategicMerge: diff --git a/examples/static-provisioning-subpath/patches.yaml b/examples/static-provisioning-subpath/patches.yaml index e5947aad08..905f777259 100644 --- a/examples/static-provisioning-subpath/patches.yaml +++ b/examples/static-provisioning-subpath/patches.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: juicefs-aws-us-east-1 + name: juicefs-pv spec: csi: volumeAttributes: diff --git a/examples/static-provisioning/README.md b/examples/static-provisioning/README.md index a7f43d583e..179ad84c71 100644 --- a/examples/static-provisioning/README.md +++ b/examples/static-provisioning/README.md @@ -34,7 +34,7 @@ kubectl apply -k . After the objects are created, verify that pod is running: ```sh -kubectl get pods +kubectl get pods juicefs-app ``` Also you can verify that data is written onto JuiceFS file system: diff --git a/examples/static-provisioning/kustomization.yaml b/examples/static-provisioning/kustomization.yaml index 35f73d825d..67edb3e23e 100644 --- a/examples/static-provisioning/kustomization.yaml +++ b/examples/static-provisioning/kustomization.yaml @@ -6,6 +6,6 @@ configurations: resources: - resources.yaml secretGenerator: -- name: juicefs-aws-us-east-1 +- name: juicefs-secret envs: - secrets.env diff --git a/examples/static-provisioning/resources.yaml b/examples/static-provisioning/resources.yaml index c98f84cb78..3382584fa3 100644 --- a/examples/static-provisioning/resources.yaml +++ b/examples/static-provisioning/resources.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: juicefs-aws-us-east-1 + name: juicefs-pv spec: capacity: storage: 10Pi @@ -12,16 +12,16 @@ spec: persistentVolumeReclaimPolicy: Retain csi: driver: csi.juicefs.com - volumeHandle: aws-us-east-1 + volumeHandle: test-bucket fsType: juicefs nodePublishSecretRef: - name: juicefs-aws-us-east-1 + name: juicefs-secret namespace: default --- apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: ten-pb-fs + name: juicefs-pvc namespace: default spec: accessModes: @@ -35,7 +35,7 @@ spec: apiVersion: v1 kind: Pod metadata: - name: app + name: juicefs-app namespace: default spec: containers: @@ -55,4 +55,4 @@ spec: volumes: - name: data persistentVolumeClaim: - claimName: ten-pb-fs + claimName: juicefs-pvc