diff --git a/examples/k8s/README.md b/examples/k8s/README.md index 52fb2e0..6094126 100644 --- a/examples/k8s/README.md +++ b/examples/k8s/README.md @@ -7,7 +7,13 @@ using wiki to drive some learning about kubernetes. brew cask install docker brew install k3d - k3d create --publish 80:80 --name wiki + + mkdir -p ~/.wiki-k8s ~/workspace/fedwiki + k3d create \ + --publish 80:80 \ + -v "$HOME/.wiki-k8s:/macos/.wiki-k8s" \ + -v "$HOME/workspace/fedwiki:/macos/fedwiki" \ + --name wiki # Deploy Wiki diff --git a/examples/k8s/wiki.yaml b/examples/k8s/wiki.yaml index b21aef0..81e6ae2 100644 --- a/examples/k8s/wiki.yaml +++ b/examples/k8s/wiki.yaml @@ -1,15 +1,3 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: dot-wiki -spec: - accessModes: - - ReadWriteOnce - volumeMode: Filesystem - resources: - requests: - storage: 4Gi ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -28,17 +16,6 @@ spec: runAsUser: 1000 runAsGroup: 1000 fsGroup: 1000 - initContainers: - - name: wiki-config - image: dobbs/farm:1.0.0 - securityContext: - runAsUser: 0 - runAsGroup: 0 - allowPrivilegeEscalation: false - volumeMounts: - - name: dot-wiki - mountPath: /home/node/.wiki - command: ["chown", "-R", "1000:1000", "/home/node/.wiki"] containers: - name: farm image: dobbs/farm:1.0.1 @@ -48,10 +25,15 @@ spec: volumeMounts: - name: dot-wiki mountPath: /home/node/.wiki + - name: fedwiki + mountPath: /home/node/fedwiki volumes: - name: dot-wiki - persistentVolumeClaim: - claimName: dot-wiki + hostPath: + path: /macos/.wiki-k8s + - name: fedwiki + hostPath: + path: /macos/fedwiki --- apiVersion: v1 kind: Service