From d2547d903be5f7d1b73ec4fe78bc0a031650be0d Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Sun, 17 May 2020 14:20:29 -0400 Subject: [PATCH] add nfs --- docker-compose.yml | 8 +++++--- kustomize/base/ingress-nginx/kustomization.yaml | 4 ++-- .../{nodeport.yaml => nodeport-patch.yaml} | 0 ...{nodeselector.yaml => nodeselector-patch.yaml} | 0 kustomize/base/nextcloud/kustomization.yaml | 3 +++ .../base/nextcloud/nextcloud-deployment.yaml | 2 +- .../base/nfs-provisionner/deployment-patch.yaml | 15 +++++++++++++++ .../base/nfs-provisionner/kustomization.yaml | 10 ++++++++++ .../base/nfs-provisionner/nfs-provisionner.yaml | 9 +++++++++ kustomize/base/nfs-provisionner/storageclass.yaml | 9 +++++++++ .../kustomizeconfig.yaml} | 0 kustomize/environment/dev/kustomization.yaml | 3 ++- 12 files changed, 56 insertions(+), 7 deletions(-) rename kustomize/base/ingress-nginx/{nodeport.yaml => nodeport-patch.yaml} (100%) rename kustomize/base/ingress-nginx/{nodeselector.yaml => nodeselector-patch.yaml} (100%) create mode 100644 kustomize/base/nfs-provisionner/deployment-patch.yaml create mode 100644 kustomize/base/nfs-provisionner/kustomization.yaml create mode 100644 kustomize/base/nfs-provisionner/nfs-provisionner.yaml create mode 100644 kustomize/base/nfs-provisionner/storageclass.yaml rename kustomize/environment/dev/{kustomizeconfig/clusterissuer.yaml => cert-manager/kustomizeconfig.yaml} (100%) diff --git a/docker-compose.yml b/docker-compose.yml index a6b76e6..a93ee0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: server: image: "rancher/k3s" restart: always - command: server --no-deploy traefik --kubelet-arg authentication-token-webhook --kubelet-arg authorization-mode=Webhook + command: server --disable traefik --disable local-storage --kubelet-arg authentication-token-webhook --kubelet-arg authorization-mode=Webhook tmpfs: - /run - /var/run @@ -14,6 +14,7 @@ services: - K3S_KUBECONFIG_MODE=666 volumes: - k3s_data:/var/lib/rancher/k3s + - nfs_data:/srv/nfs - .:/host ports: - 80:30080 @@ -30,8 +31,9 @@ services: environment: - K3S_URL=https://server:6443 - K3S_CLUSTER_SECRET=${K3S_CLUSTER_SECRET:-replaceme} + volumes: + - nfs_data:/srv/nfs volumes: k3s_data: - - + nfs_data: \ No newline at end of file diff --git a/kustomize/base/ingress-nginx/kustomization.yaml b/kustomize/base/ingress-nginx/kustomization.yaml index 7b93f6c..d5bbbad 100644 --- a/kustomize/base/ingress-nginx/kustomization.yaml +++ b/kustomize/base/ingress-nginx/kustomization.yaml @@ -2,8 +2,8 @@ generators: - nginx-ingress-controller.yaml patchesStrategicMerge: - - nodeselector.yaml - - nodeport.yaml + - nodeselector-patch.yaml + - nodeport-patch.yaml namespace: ingress-nginx diff --git a/kustomize/base/ingress-nginx/nodeport.yaml b/kustomize/base/ingress-nginx/nodeport-patch.yaml similarity index 100% rename from kustomize/base/ingress-nginx/nodeport.yaml rename to kustomize/base/ingress-nginx/nodeport-patch.yaml diff --git a/kustomize/base/ingress-nginx/nodeselector.yaml b/kustomize/base/ingress-nginx/nodeselector-patch.yaml similarity index 100% rename from kustomize/base/ingress-nginx/nodeselector.yaml rename to kustomize/base/ingress-nginx/nodeselector-patch.yaml diff --git a/kustomize/base/nextcloud/kustomization.yaml b/kustomize/base/nextcloud/kustomization.yaml index 9b84f1f..c353aca 100644 --- a/kustomize/base/nextcloud/kustomization.yaml +++ b/kustomize/base/nextcloud/kustomization.yaml @@ -16,3 +16,6 @@ secretGenerator: - password=replaceme namespace: nextcloud + +commonlabels: + app: nextcloud \ No newline at end of file diff --git a/kustomize/base/nextcloud/nextcloud-deployment.yaml b/kustomize/base/nextcloud/nextcloud-deployment.yaml index 82acf3f..0ac252d 100644 --- a/kustomize/base/nextcloud/nextcloud-deployment.yaml +++ b/kustomize/base/nextcloud/nextcloud-deployment.yaml @@ -58,7 +58,7 @@ spec: - ReadWriteOnce resources: requests: - storage: 100Gi + storage: 50Gi --- apiVersion: v1 kind: Service diff --git a/kustomize/base/nfs-provisionner/deployment-patch.yaml b/kustomize/base/nfs-provisionner/deployment-patch.yaml new file mode 100644 index 0000000..ec18d2f --- /dev/null +++ b/kustomize/base/nfs-provisionner/deployment-patch.yaml @@ -0,0 +1,15 @@ +kind: Deployment +apiVersion: apps/v1 +metadata: + name: nfs-provisioner +spec: + template: + spec: + containers: + - name: nfs-provisioner + args: + - "-provisioner=badjware.dev/nfs" + volumes: + - name: export-volume + hostPath: + path: /srv/nfs \ No newline at end of file diff --git a/kustomize/base/nfs-provisionner/kustomization.yaml b/kustomize/base/nfs-provisionner/kustomization.yaml new file mode 100644 index 0000000..e195ee9 --- /dev/null +++ b/kustomize/base/nfs-provisionner/kustomization.yaml @@ -0,0 +1,10 @@ +resources: + - storageclass.yaml + +generators: + - nfs-provisionner.yaml + +namespace: kube-system + +patchesStrategicMerge: + - deployment-patch.yaml \ No newline at end of file diff --git a/kustomize/base/nfs-provisionner/nfs-provisionner.yaml b/kustomize/base/nfs-provisionner/nfs-provisionner.yaml new file mode 100644 index 0000000..0ca82aa --- /dev/null +++ b/kustomize/base/nfs-provisionner/nfs-provisionner.yaml @@ -0,0 +1,9 @@ +apiVersion: badjware/v1 +kind: RemoteResources +metadata: + name: nfs-provisionner +resources: + - url: https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs/deploy/kubernetes/deployment.yaml + sha256: fead9be4f0fd1b2e2f9780a47a6f2b3a7a552ea9d9e526654bb0ac1f263718ac + - url: https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs/deploy/kubernetes/rbac.yaml + sha256: cb4075fac2084d477cb2384e39075217bf672627a3edb58c100307b500879846 \ No newline at end of file diff --git a/kustomize/base/nfs-provisionner/storageclass.yaml b/kustomize/base/nfs-provisionner/storageclass.yaml new file mode 100644 index 0000000..4a771f6 --- /dev/null +++ b/kustomize/base/nfs-provisionner/storageclass.yaml @@ -0,0 +1,9 @@ +kind: StorageClass +apiVersion: storage.k8s.io/v1 +metadata: + name: nfs + annotations: + storageclass.beta.kubernetes.io/is-default-class: "true" +provisioner: badjware.dev/nfs +mountOptions: + - vers=4.1 diff --git a/kustomize/environment/dev/kustomizeconfig/clusterissuer.yaml b/kustomize/environment/dev/cert-manager/kustomizeconfig.yaml similarity index 100% rename from kustomize/environment/dev/kustomizeconfig/clusterissuer.yaml rename to kustomize/environment/dev/cert-manager/kustomizeconfig.yaml diff --git a/kustomize/environment/dev/kustomization.yaml b/kustomize/environment/dev/kustomization.yaml index 6ab20d7..8dbd554 100644 --- a/kustomize/environment/dev/kustomization.yaml +++ b/kustomize/environment/dev/kustomization.yaml @@ -1,4 +1,5 @@ bases: + - ../../base/nfs-provisionner - ../../base/ingress-nginx - ../../base/cert-manager - ../../base/kubernetes-dashboard @@ -75,4 +76,4 @@ transformers: - ssm-secrets.yaml configurations: - - kustomizeconfig/clusterissuer.yaml + - cert-manager/kustomizeconfig.yaml