diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d36977d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.tmp diff --git a/bin/dryrun-argo.sh b/bin/dryrun-argo.sh new file mode 100755 index 0000000..4879fba --- /dev/null +++ b/bin/dryrun-argo.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +mkdir -p .tmp + +helm template argocd k8s/infra/argocd \ + --namespace argocd \ + --create-namespace \ + --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" > .tmp/argocd.yaml \ No newline at end of file diff --git a/bin/upgrade-argo.sh b/bin/upgrade-argo.sh new file mode 100755 index 0000000..e246dce --- /dev/null +++ b/bin/upgrade-argo.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +helm upgrade argocd k8s/infra/argocd \ + --namespace argocd \ + --create-namespace \ + --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ No newline at end of file diff --git a/k8s/infra/argocd/templates/ingress.yaml b/k8s/infra/argocd/templates/ingress.yaml index e69de29..63dcb91 100644 --- a/k8s/infra/argocd/templates/ingress.yaml +++ b/k8s/infra/argocd/templates/ingress.yaml @@ -0,0 +1,24 @@ +apiVersion: traefik.containo.us/v1alpha1 +kind: IngressRoute +metadata: + name: argocd-server + namespace: "{{ .Release.Namespace }}" +spec: + entryPoints: + - websecure + routes: + - kind: Rule + match: {{ .Values.selfapp.traefikRule }} + priority: 10 + services: + - name: argocd-server + port: 80 + - kind: Rule + match: {{ .Values.selfapp.traefikRule }} && Headers(`Content-Type`, `application/grpc`) + priority: 11 + services: + - name: argocd-server + port: 80 + scheme: h2c + tls: + certResolver: default \ No newline at end of file diff --git a/k8s/infra/argocd/templates/repo.yaml b/k8s/infra/argocd/templates/repo.yaml index 1e5499f..fd5830b 100644 --- a/k8s/infra/argocd/templates/repo.yaml +++ b/k8s/infra/argocd/templates/repo.yaml @@ -6,7 +6,9 @@ metadata: namespace: "{{ .Release.Namespace }}" labels: argocd.argoproj.io/secret-type: repository + annotations: + link.argocd.argoproj.io/external-link: "https://github.com/{{ .Values.selfapp.repo }}" stringData: type: git - url: "{{ .Values.selfapp.repo }}" + url: "git@github.com:{{ .Values.selfapp.repo }}.git" sshPrivateKey: {{ .Values.selfapp.sshkey | quote }} \ No newline at end of file diff --git a/k8s/infra/argocd/values.yaml b/k8s/infra/argocd/values.yaml index b7cc104..acd6d0b 100644 --- a/k8s/infra/argocd/values.yaml +++ b/k8s/infra/argocd/values.yaml @@ -5,5 +5,6 @@ argo-cd: selfapp: commit: "stable" - repo: "git@github.com:asosnovsky/homelab.git" + repo: "asosnovsky/homelab" sshkey: "" + traefikRule: Host(`argocd.sosnovsky.ca`)