From e8e183ddb57d59e7d61723c0cce39b04d8f6162b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 15 Mar 2023 14:07:02 -0400 Subject: [PATCH] fixing up local dev for longhorn --- .vscode/tasks.json | 5 ++++- bin/install-argo.sh | 1 - k3d-default.yaml | 7 ++++++- k8s/argocd/templates/appset-infra.yaml | 2 +- k8s/infra/longhorn/values-dev.yaml | 2 ++ k8s/infra/reverse-proxy/templates/reverse-proxy.yaml | 0 6 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 k8s/infra/reverse-proxy/templates/reverse-proxy.yaml diff --git a/.vscode/tasks.json b/.vscode/tasks.json index d05b304..47a1a27 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -30,7 +30,10 @@ { "label": "Open Local Argo Port", "type": "shell", - "command": "kubectl port-forward svc/argocd-server -n argocd 8080:80" + "command": "kubectl port-forward svc/argocd-server -n argocd 8080:80", + "icon": { + "id": "circuit-board" + } } ] } \ No newline at end of file diff --git a/bin/install-argo.sh b/bin/install-argo.sh index 9aa0071..c31248b 100755 --- a/bin/install-argo.sh +++ b/bin/install-argo.sh @@ -14,7 +14,6 @@ helm install argocd k8s/argocd \ --create-namespace \ --values k8s/argocd/values.yaml \ --values k8s/argocd/values-$DEPLOYMENT.yaml \ - --set selfapp.enabled="true" \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" watch -n1 "kubectl -n argocd get all" diff --git a/k3d-default.yaml b/k3d-default.yaml index 32ddcd7..ee7b7fc 100644 --- a/k3d-default.yaml +++ b/k3d-default.yaml @@ -6,6 +6,11 @@ metadata: servers: 1 agents: 1 image: docker.io/rancher/k3s:v1.25.6-k3s1 +volumes: + - volume: /tmp/longhorn:/var/lib/longhorn:shared + nodeFilters: + - server:* + - agent:* kubeAPI: hostPort: "6443" ports: @@ -18,4 +23,4 @@ ports: options: kubeconfig: updateDefaultKubeconfig: true - switchCurrentContext: true \ No newline at end of file + switchCurrentContext: true diff --git a/k8s/argocd/templates/appset-infra.yaml b/k8s/argocd/templates/appset-infra.yaml index 9f6775a..0246e46 100644 --- a/k8s/argocd/templates/appset-infra.yaml +++ b/k8s/argocd/templates/appset-infra.yaml @@ -15,7 +15,7 @@ spec: metadata: name: '{{ `{{path.basename}}` }}' spec: - project: "default" + project: "infra" source: repoURL: "git@github.com:{{ .Values.selfapp.repo }}.git" targetRevision: "{{ .Values.selfapp.commit }}" diff --git a/k8s/infra/longhorn/values-dev.yaml b/k8s/infra/longhorn/values-dev.yaml index 490a0b7..1995242 100644 --- a/k8s/infra/longhorn/values-dev.yaml +++ b/k8s/infra/longhorn/values-dev.yaml @@ -1 +1,3 @@ global: {} +custom: + useDaemons: true diff --git a/k8s/infra/reverse-proxy/templates/reverse-proxy.yaml b/k8s/infra/reverse-proxy/templates/reverse-proxy.yaml new file mode 100644 index 0000000..e69de29