feat: add kubefirst.konstruct.io annotation to argocd apps (#178)

* feat: add kubefirst.konstruct.io annotation to argocd apps * fix: use ingress in chart * feat: add nginx as ingress class name --------- Co-authored-by: Cristhian Fernández <[email protected]>
konstructio · Oct 23, 2024 · 040370d · 040370d
1 parent 7a4e272
commit 040370d
Show file tree

Hide file tree

Showing 31 changed files with 140 additions and 65 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -25,6 +25,14 @@ To make a new application available for installation, you'll need to:
 - Create a new directory with your new application's name in your fork.
   - Create a `components` folder, and inside, another folder with your application's name.
   - In that latest folder, add, and organize your Argo CD manifest file(s) into it.
+    - Annotate your Argo CD application with the following annotations. The Kubefirst platform uses this information to surface installed application in the UI.
+
+    ```yaml
+    annotations:
+      kubefirst.konstruct.io/application-name: <appName>
+      kubefirst.konstruct.io/source: catalog-templates
+    ```
+
     - Don't forget to look at the [Kubefirst Tokens](#kubefirst-tokens) section as you can dynamically add specific values to your manifests like domain or cluster names.
   - In the root folder of your application create an "App of Apps" YAML file that will point to the component folder.
 - Add a SVG file of the application's logo, named `<appName>.svg` under the [logos folder](https://github.com/kubefirst/gitops-catalog/tree/main/logos).

diff --git a/argo-events/components/argo-events/application.yaml b/argo-events/components/argo-events/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-argo-events
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: argo-events
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/argo-rollouts/components/argo-rollouts/application.yaml b/argo-rollouts/components/argo-rollouts/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-argo-rollouts
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: argo-rollouts
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/cilium/components/cilium/application.yaml b/cilium/components/cilium/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-cilium
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: cilium
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/cluster-autoscaler-civo/components/cluster-autoscaler-civo/application.yaml b/cluster-autoscaler-civo/components/cluster-autoscaler-civo/application.yaml
@@ -6,6 +6,10 @@ metadata:
   namespace: argocd
   annotations:
     argocd.argoproj.io/sync-wave: '20'
+    kubefirst.konstruct.io/application-name: cluster-autoscaler-civo
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: <PROJECT>
   source:

diff --git a/datadog-agent/components/datadog-agent/application.yaml b/datadog-agent/components/datadog-agent/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-datadog
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: datadog-agent
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/flappy-kray/components/flappy-kray/application.yaml b/flappy-kray/components/flappy-kray/application.yaml
@@ -4,10 +4,12 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-flappy-kray
   namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/sync-wave: '0'
+    kubefirst.konstruct.io/application-name: flappy-kray
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: flappy-kray
@@ -20,8 +22,22 @@ spec:
       values: |
         image:
           repository: ghcr.io/konstructio/flappy-kray
+
         ingress:
-          enabled: false
+          enabled: true
+          className: nginx
+          annotations:
+            cert-manager.io/cluster-issuer: letsencrypt-prod
+            argocd.argoproj.io/sync-wave: '1'
+          hosts:
+            - host: flappy-kray.<DOMAIN_NAME>
+              paths:
+                - path: /
+                  pathType: Prefix
+          tls:
+          - secretName: flappy-kray-tls
+            hosts:
+              - flappy-kray.<DOMAIN_NAME>
   project: <PROJECT>
   syncPolicy:
     syncOptions:

diff --git a/flappy-kray/components/flappy-kray/ingress.yaml b/flappy-kray/components/flappy-kray/ingress.yaml
diff --git a/gitlab/components/gitlab/application.yaml b/gitlab/components/gitlab/application.yaml
@@ -100,10 +100,12 @@ kind: Application
 metadata:
   name: gitlab
   namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/sync-wave: '30'
+    kubefirst.konstruct.io/application-name: gitlab
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     name: <CLUSTER_DESTINATION>

diff --git a/goldilocks/components/goldilocks/application.yaml b/goldilocks/components/goldilocks/application.yaml
@@ -6,12 +6,34 @@ metadata:
   namespace: argocd
   annotations:
     argocd.argoproj.io/sync-wave: '10'
+    kubefirst.konstruct.io/application-name: goldilocks
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: <PROJECT>
   source:
     repoURL: 'https://charts.fairwinds.com/stable'
     targetRevision: 6.5.6
     chart: goldilocks
+    values: |
+      dashboard:
+        ingress:
+          enabled: true
+          ingressClassName: nginx
+          annotations:
+            cert-manager.io/cluster-issuer: letsencrypt-prod
+            argocd.argoproj.io/sync-wave: '1'
+          hosts:
+            - host: goldilocks.<DOMAIN_NAME>
+              paths:
+                - path: /
+                  type: ImplementationSpecific
+
+          tls:
+          - secretName: goldilocks-tls
+            hosts:
+              - goldilocks.<DOMAIN_NAME>
   destination:
     name: <CLUSTER_DESTINATION>
     namespace: goldilocks

diff --git a/goldilocks/components/goldilocks/ingress.yaml b/goldilocks/components/goldilocks/ingress.yaml
diff --git a/grafana/components/grafana/grafana.yaml b/grafana/components/grafana/grafana.yaml
@@ -2,10 +2,12 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '20'
   name: <CLUSTER_NAME>-grafana
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
+    kubefirst.konstruct.io/application-name: grafana
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/kafka/components/kafka/application.yaml b/kafka/components/kafka/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-kafka
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: kafka
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/kratix/components/kratix/application.yaml b/kratix/components/kratix/application.yaml
@@ -4,6 +4,11 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-kratix
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: kratix
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: <PROJECT>
   source:

diff --git a/kubedoom/components/kubedoom/application.yaml b/kubedoom/components/kubedoom/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-kubedoom
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: kubedoom
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/kubeinvaders/components/kubeinvaders/application.yaml b/kubeinvaders/components/kubeinvaders/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-kubeinvaders
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: kubeinvaders
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/kubernetes-dashboard/components/kubernetes-dashboard/application.yaml b/kubernetes-dashboard/components/kubernetes-dashboard/application.yaml
@@ -4,6 +4,11 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-kubernetes-dashboard
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: kubernetes-dashboard
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: <PROJECT>
   source:

diff --git a/kubescape-operator/components/kubescape-operator/application.yaml b/kubescape-operator/components/kubescape-operator/application.yaml
@@ -6,6 +6,10 @@ metadata:
   namespace: argocd
   annotations:
     argocd.argoproj.io/sync-wave: '10'
+    kubefirst.konstruct.io/application-name: kubescape-operator
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: <PROJECT>
   source:

diff --git a/kyverno/components/kyverno/kyverno.yaml b/kyverno/components/kyverno/kyverno.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-kyverno
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: kyverno
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/metrics-server/components/metrics-server/application.yaml b/metrics-server/components/metrics-server/application.yaml
@@ -6,6 +6,10 @@ metadata:
   namespace: argocd
   annotations:
     argocd.argoproj.io/sync-wave: '10'
+    kubefirst.konstruct.io/application-name: metrics-server
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: <PROJECT>
   source:

diff --git a/mysql/components/mysql/application.yaml b/mysql/components/mysql/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-mysql
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: mysql
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/opencost/components/opencost/opencost.yaml b/opencost/components/opencost/opencost.yaml
@@ -2,10 +2,12 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '20'
   name: <CLUSTER_NAME>-opencost
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
+    kubefirst.konstruct.io/application-name: opencost
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/polaris/components/polaris/application.yaml b/polaris/components/polaris/application.yaml
@@ -6,6 +6,10 @@ metadata:
   namespace: argocd
   annotations:
     argocd.argoproj.io/sync-wave: '10'
+    kubefirst.konstruct.io/application-name: polaris
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: <PROJECT>
   source:

diff --git a/spinkube-operator/components/spinkube-operator/spinkube-operator.yaml b/spinkube-operator/components/spinkube-operator/spinkube-operator.yaml
@@ -2,10 +2,12 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '60'
   name: <CLUSTER_NAME>-spinkube-operator
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: '60'
+    kubefirst.konstruct.io/application-name: spinkube-operator
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/stormforge-agent/components/stormforge-agent/application.yaml b/stormforge-agent/components/stormforge-agent/application.yaml
@@ -4,10 +4,12 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-stormforge-agent
   namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/sync-wave: '3'
+    kubefirst.konstruct.io/application-name: stormforge-agent
+    kubefirst.konstruct.io/source: catalog-templates
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: stormforge-system

diff --git a/supabase/components/supabase/application.yaml b/supabase/components/supabase/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-supabase
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: supabase
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

diff --git a/testkube/components/testkube/application.yaml b/testkube/components/testkube/application.yaml
@@ -4,6 +4,9 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-testkube
   namespace: argocd
+  annotations:
+    kubefirst.konstruct.io/application-name: testkube
+    kubefirst.konstruct.io/source: catalog-templates
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec: