fix(argocd): create network project

gsuquet · Sep 14, 2024 · faf88bc · faf88bc
1 parent 71585bc
commit faf88bc
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 6 deletions.
diff --git a/ansible/roles/k8s/argocd/tasks/main.yml b/ansible/roles/k8s/argocd/tasks/main.yml
@@ -27,7 +27,24 @@
     wait: yes
     wait_timeout: 300
 
+- name: Update argocd-cmd-params-cm ConfigMap to set server.insecure= "true"
+  kubernetes.core.k8s:
+    state: present
+    definition:
+      apiVersion: v1
+      kind: ConfigMap
+      metadata:
+        name: argocd-cmd-params-cm
+        namespace: argocd
+      data:
+        server.insecure: "true"
+
+- name: Create Network Project
+  kubernetes.core.k8s:
+    state: present
+    definition: "{{ lookup('file', '../../../../argocd/project-network.yml') | from_yaml }}"
+
 - name: Create Ingress Application
   kubernetes.core.k8s:
     state: present
-    definition: "{{ lookup('file', '../../../../argocd/ingress.yml') | from_yaml }}"
+    definition: "{{ lookup('file', '../../../../argocd/application-ingress.yml') | from_yaml }}"
diff --git a/argocd/ingress.yml → argocd/application-ingress.yml b/argocd/ingress.yml → argocd/application-ingress.yml
@@ -1,10 +1,10 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: ingress
+  name: argocd-ingress
   namespace: argocd
 spec:
-  project: argocd
+  project: network
   source:
     repoURL: 'https://github.com/gsuquet/homelab.git'
     targetRevision: HEAD

diff --git a/argocd/project-network.yml b/argocd/project-network.yml
@@ -0,0 +1,15 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: network
+  namespace: argocd
+spec:
+  description: All network related applications
+  sourceRepos:
+    - '*'
+  destinations:
+    - namespace: kube-system
+      server: https://kubernetes.default.svc
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
diff --git a/services/ingress/argocd.yml b/services/ingress/argocd.yml
@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: argocd-server
@@ -8,8 +8,18 @@ spec:
     - web
     - websecure
   routes:
-    - match: PathPrefix(`/argocd`)
-      kind: Rule
+    - kind: Rule
+      match: PathPrefix(`/argocd`)
+      priority: 10
       services:
         - name: argocd-server
           port: 80
+    - kind: Rule
+      match: PathPrefix(`/argocd`) && Header(`Content-Type`, `application/grpc`)
+      priority: 11
+      services:
+        - name: argocd-server
+          port: 80
+          scheme: h2c
+  tls:
+    certResolver: default