[networking] minor improvements to tailscale-related network resources

gruberdev · Feb 2, 2024 · de9aacd · de9aacd
1 parent 7734316
commit de9aacd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/apps/argocd/base/networking/tailscale-operator.yaml b/apps/argocd/base/networking/tailscale-operator.yaml
@@ -2,40 +2,44 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: tailscale-operator
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: networking
   source:
-    repoURL: 'https://github.com/gruberdev/homelab.git'
+    repoURL: "https://github.com/gruberdev/homelab.git"
     path: apps/networking/tailscale/operator
     targetRevision: main
+    kustomize:
+      commonLabels:
+        app.kubernetes.io/app: tailscale-operator
+        app.kubernetes.io/category: networking
   destination:
     namespace: tailscale
     name: in-cluster
-  info:
-    - name: 'Github Repository:'
-      value: >-
-        https://github.com/tailscale/tailscale
-    - name: 'Github feature issue:'
-      value: >-
-        https://github.com/tailscale/tailscale/issues/502
-    - name: 'Documentation:'
-      value: >-
-        https://tailscale.com/kb/1236/kubernetes-operator/
   syncPolicy:
     automated:
       prune: true
       selfHeal: true
-      allowEmpty: false
     managedNamespaceMetadata:
       labels:
         prometheus: enabled
     syncOptions:
-    - Validate=false
-    - CreateNamespace=true
-    - PrunePropagationPolicy=foreground
+      - Prune=true
+      - ServerSideApply=true
     retry:
-      limit: 5
+      limit: 3
       backoff:
         duration: 20s
         factor: 2
         maxDuration: 15m
+  info:
+    - name: "Github Repository:"
+      value: >-
+        https://github.com/tailscale/tailscale
+    - name: "Github feature issue:"
+      value: >-
+        https://github.com/tailscale/tailscale/issues/502
+    - name: "Documentation:"
+      value: >-
+        https://tailscale.com/kb/1236/kubernetes-operator/
diff --git a/apps/argocd/base/networking/tailscale.yaml b/apps/argocd/base/networking/tailscale.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   project: networking
   source:
-    repoURL: 'https://github.com/gruberdev/homelab.git'
+    repoURL: "https://github.com/gruberdev/homelab.git"
     path: apps/networking/tailscale
     targetRevision: main
   destination:
@@ -17,12 +17,12 @@ spec:
       selfHeal: true
       allowEmpty: true
     syncOptions:
-    - Validate=false
-    - CreateNamespace=false
-    - PrunePropagationPolicy=foreground
-    - PruneLast=false
-    - ApplyOutOfSyncOnly=false
-    - Prune=false
+      - Validate=false
+      - CreateNamespace=false
+      - PrunePropagationPolicy=foreground
+      - PruneLast=false
+      - ApplyOutOfSyncOnly=false
+      - Prune=false
     retry:
       limit: 5
       backoff: