diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 573d3ae..72905cc 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -16,6 +16,8 @@ services: # Overrides default command so things don't shut down after the process ends. entrypoint: /usr/local/share/docker-init.sh command: sleep infinity + environment: + - KUBE_EDITOR="code -w" # Uncomment the next four lines if you will use a ptrace-based debuggers like C++, Go, and Rust. # cap_add: # - SYS_PTRACE diff --git a/bin/install-argo.sh b/bin/install-argo.sh index b3a2935..0edda83 100755 --- a/bin/install-argo.sh +++ b/bin/install-argo.sh @@ -11,7 +11,8 @@ helm install argocd k8s/argocd \ --namespace argocd \ --create-namespace \ --values k8s/argocd/values.yaml \ - --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" + --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ + --set selfapp.deployment=dev watch -n1 "kubectl -n argocd get all" @@ -24,4 +25,5 @@ helm upgrade argocd k8s/argocd \ --create-namespace \ --values k8s/argocd/values.yaml \ --set selfapp.enabled="true" \ + --set selfapp.deployment=dev \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" diff --git a/bin/upgrade-argo.sh b/bin/upgrade-argo.sh index 923b620..f285f8b 100755 --- a/bin/upgrade-argo.sh +++ b/bin/upgrade-argo.sh @@ -4,5 +4,6 @@ helm upgrade argocd k8s/argocd \ --namespace argocd \ --create-namespace \ --values k8s/argocd/values.yaml \ + --set selfapp.deployment=dev \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ --set selfapp.enabled="true" \ No newline at end of file diff --git a/k8s/argocd/templates/app-self.yaml b/k8s/argocd/templates/app-self.yaml index bd5909d..470a29e 100644 --- a/k8s/argocd/templates/app-self.yaml +++ b/k8s/argocd/templates/app-self.yaml @@ -12,6 +12,9 @@ spec: targetRevision: "{{ .Values.selfapp.commit }}" path: k8s/argocd helm: + valuesFiles: + - values.yaml + - values-{{ .Values.selfapp.deployment }}.yaml values: | selfapp: {{ .Values.selfapp | toYaml | nindent 10 }} parameters: diff --git a/k8s/argocd/templates/ingress.yaml b/k8s/argocd/templates/ingress.yaml index ef6c6c8..42495b1 100644 --- a/k8s/argocd/templates/ingress.yaml +++ b/k8s/argocd/templates/ingress.yaml @@ -1,25 +1,25 @@ ---- -apiVersion: traefik.containo.us/v1alpha1 -kind: IngressRoute -metadata: - name: argocd-server - namespace: argocd -spec: - entryPoints: - - websecure - routes: - - kind: Rule - match: Host(`argocd.{{ .Values.selfapp.domain }}`) - priority: 10 - services: - - name: argocd-server - port: 80 - - kind: Rule - match: Host(`argocd.{{ .Values.selfapp.domain }}`) && Headers(`Content-Type`, `application/grpc`) - priority: 11 - services: - - name: argocd-server - port: 80 - scheme: h2c - tls: - certResolver: default \ No newline at end of file +# --- +# apiVersion: traefik.containo.us/v1alpha1 +# kind: IngressRoute +# metadata: +# name: argocd-server +# namespace: argocd +# spec: +# entryPoints: +# - websecure +# routes: +# - kind: Rule +# match: Host(`argocd.{{ .Values.selfapp.domain }}`) +# priority: 10 +# services: +# - name: argocd-server +# port: 80 +# - kind: Rule +# match: Host(`argocd.{{ .Values.selfapp.domain }}`) && 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/argocd/values-dev.yaml b/k8s/argocd/values-dev.yaml new file mode 100644 index 0000000..edebe21 --- /dev/null +++ b/k8s/argocd/values-dev.yaml @@ -0,0 +1,3 @@ +selfapp: + deployment: dev + domain: "me.local" diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index f1bc6d2..6c32d93 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -4,9 +4,13 @@ argo-cd: keep: false server: ingress: - enabled: false + https: true + enabled: true + paths: + - "/argocd" + ingressGrpc: + enabled: true selfapp: commit: "stable" repo: "asosnovsky/homelab" sshkey: "" - domain: "sosnovsky.ca"