From ed8d02b47b1803b1b33c7ec2fd576ed590981a14 Mon Sep 17 00:00:00 2001
From: Ricardo Rocha <ricardo.rocha@cern.ch>
Date: Wed, 12 Jul 2023 22:47:07 +0200
Subject: [PATCH] Add argo app for argocd
---
app/srv-argocd.yaml | 67 ++++++++++---------
app/srv-thanos.yaml | 2 +-
srv/argocd/templates/argocd-ingress-http.yaml | 43 ++++++------
.../templates/grafana-ingress-http.yaml | 43 ++++++------
srv/argocd/templates/grafana-ingress.yaml | 57 ++++++++--------
5 files changed, 109 insertions(+), 103 deletions(-)
diff --git a/app/srv-argocd.yaml b/app/srv-argocd.yaml
index 04bc0da..404f709 100644
--- a/app/srv-argocd.yaml
+++ b/app/srv-argocd.yaml
@@ -1,32 +1,35 @@
-#---
-#apiVersion: argoproj.io/v1alpha1
-#kind: ApplicationSet
-#metadata:
-# name: argocd
-# namespace: argocd
-#spec:
-# generators:
-# - clusters:
-# selector:
-# matchLabels:
-# central: "true"
-# template:
-# metadata:
-# name: '{{name}}-argocd'
-# spec:
-# project: default
-# source:
-# repoURL: https://gitlab.cern.ch/kubernetes/automation/101/argocd.git
-# targetRevision: master
-# path: srv/argocd
-# plugin: {}
-# destination:
-# server: '{{server}}'
-# namespace: argocd
-# syncPolicy:
-# automated:
-# allowEmpty: true
-# prune: true
-# selfHeal: true
-# syncOptions:
-# - CreateNamespace=true
+---
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+ name: argocd
+ namespace: argocd
+spec:
+ generators:
+ - clusters:
+ selector:
+ matchLabels:
+ central: "true"
+ template:
+ metadata:
+ name: '{{name}}-argocd'
+ labels:
+ area: "infra"
+ type: "service"
+ spec:
+ project: default
+ source:
+ repoURL: https://gitlab.cern.ch/kubernetes/automation/101/argocd.git
+ targetRevision: master
+ path: srv/argocd
+ plugin: {}
+ destination:
+ server: '{{server}}'
+ namespace: argocd
+ syncPolicy:
+ automated:
+ allowEmpty: true
+ prune: true
+ selfHeal: true
+ syncOptions:
+ - CreateNamespace=true
diff --git a/app/srv-thanos.yaml b/app/srv-thanos.yaml
index 5e910c7..c27dc22 100644
--- a/app/srv-thanos.yaml
+++ b/app/srv-thanos.yaml
@@ -14,7 +14,7 @@ spec:
metadata:
name: '{{name}}-thanos'
labels:
- area: "monitoring"
+ area: "infra"
type: "service"
spec:
project: default
diff --git a/srv/argocd/templates/argocd-ingress-http.yaml b/srv/argocd/templates/argocd-ingress-http.yaml
index a0152d2..930695f 100644
--- a/srv/argocd/templates/argocd-ingress-http.yaml
+++ b/srv/argocd/templates/argocd-ingress-http.yaml
@@ -1,21 +1,22 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- annotations:
- kubernetes.io/ingress.class: traefik
- traefik.ingress.kubernetes.io/router.entrypoints: http
- traefik.ingress.kubernetes.io/router.middlewares: kube-system-redirect-scheme@kubernetescrd
- name: argocd-server-http
- namespace: argocd
-spec:
- rules:
- - host: kops101-argocd.cern.ch
- http:
- paths:
- - backend:
- service:
- name: argocd-server
- port:
- number: 2746
- path: /
- pathType: Prefix
+#---
+#apiVersion: networking.k8s.io/v1
+#kind: Ingress
+#metadata:
+# annotations:
+# kubernetes.io/ingress.class: traefik
+# traefik.ingress.kubernetes.io/router.entrypoints: http
+# traefik.ingress.kubernetes.io/router.middlewares: kube-system-redirect-scheme@kubernetescrd
+# name: argocd-server-http
+# namespace: argocd
+#spec:
+# rules:
+# - host: argocd.cern.ch
+# http:
+# paths:
+# - backend:
+# service:
+# name: argocd-server
+# port:
+# number: 2746
+# path: /
+# pathType: Prefix
diff --git a/srv/argocd/templates/grafana-ingress-http.yaml b/srv/argocd/templates/grafana-ingress-http.yaml
index 01edf00..7e04518 100644
--- a/srv/argocd/templates/grafana-ingress-http.yaml
+++ b/srv/argocd/templates/grafana-ingress-http.yaml
@@ -1,21 +1,22 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- annotations:
- kubernetes.io/ingress.class: traefik
- traefik.ingress.kubernetes.io/router.entrypoints: http
- traefik.ingress.kubernetes.io/router.middlewares: kube-system-redirect-scheme@kubernetescrd
- name: grafana-ingress-http
- namespace: kube-system
-spec:
- rules:
- - host: kops101-argocd-mon.cern.ch
- http:
- paths:
- - backend:
- service:
- name: cern-magnum-grafana
- port:
- number: 80
- path: /
- pathType: Prefix
+#---
+#apiVersion: networking.k8s.io/v1
+#kind: Ingress
+#metadata:
+# annotations:
+# kubernetes.io/ingress.class: traefik
+# traefik.ingress.kubernetes.io/router.entrypoints: http
+# traefik.ingress.kubernetes.io/router.middlewares: kube-system-redirect-scheme@kubernetescrd
+# name: grafana-ingress-http
+# namespace: kube-system
+#spec:
+# rules:
+# - host: argocd-mon.cern.ch
+# http:
+# paths:
+# - backend:
+# service:
+# name: cern-magnum-grafana
+# port:
+# number: 80
+# path: /
+# pathType: Prefix
diff --git a/srv/argocd/templates/grafana-ingress.yaml b/srv/argocd/templates/grafana-ingress.yaml
index 613818e..eaee0a0 100644
--- a/srv/argocd/templates/grafana-ingress.yaml
+++ b/srv/argocd/templates/grafana-ingress.yaml
@@ -1,28 +1,29 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- annotations:
- cert-manager.io/cluster-issuer: letsencrypt
- kubernetes.io/ingress.class: traefik
- traefik.ingress.kubernetes.io/router.entrypoints: https, http, web, websecure
- traefik.ingress.kubernetes.io/router.tls: "true"
- traefik.ingress.kubernetes.io/router.tls.certresolver: le
- traefik.ingress.kubernetes.io/router.tls.domains.n.main: kops101-argocd-mon.cern.ch
- name: grafana-ingress
- namespace: kube-system
-spec:
- rules:
- - host: kops101-argocd-mon.cern.ch
- http:
- paths:
- - backend:
- service:
- name: cern-magnum-grafana
- port:
- number: 80
- path: /
- pathType: Prefix
- tls:
- - hosts:
- - kops-mon.cern.ch
- secretName: cert-manager-tls-ingress-secret-grafana
+#---
+#apiVersion: networking.k8s.io/v1
+#kind: Ingress
+#metadata:
+# annotations:
+# cert-manager.io/cluster-issuer: letsencrypt
+# kubernetes.io/ingress.class: traefik
+# traefik.ingress.kubernetes.io/router.entrypoints: https, http, web, websecure
+# traefik.ingress.kubernetes.io/router.tls: "true"
+# traefik.ingress.kubernetes.io/router.tls.certresolver: le
+# traefik.ingress.kubernetes.io/router.tls.domains.n.main: argocd-mon.cern.ch
+# name: grafana-ingress
+# namespace: kube-system
+#spec:
+# rules:
+# - host: argocd-mon.cern.ch
+# http:
+# paths:
+# - backend:
+# service:
+# name: cern-magnum-grafana
+# port:
+# number: 80
+# path: /
+# pathType: Prefix
+# tls:
+# - hosts:
+# - argocd-mon.cern.ch
+# secretName: cert-manager-tls-ingress-secret-grafana
--
GitLab