feat: logging version bump, kubezero git-sync for argocd

charts/kubezero-argocd/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
 name: kubezero-argocd
-version: 0.8.1
+version: 0.8.2
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -17,4 +17,8 @@ dependencies:
   - name: argo-cd
     version: 3.13.1
     repository: https://argoproj.github.io/argo-helm
+  - name: argocd-applicationset
+    version: 1.4.0
+    repository: https://argoproj.github.io/argo-helm
+    condition: argocd-applicationset.enabled
 kubeVersion: ">= 1.18.0"

charts/kubezero-argocd/values.yaml

@@ -101,3 +101,18 @@ argo-cd:
 
   dex:
     enabled: false
+
+
+argocd-applicationset:
+  enabled: false
+
+  rbac:
+    pspEnabled: false
+
+  resources:
+    # limits:
+      # cpu: 500m
+      # memory: 2048Mi
+    requests:
+      cpu: 50m
+      memory: 64Mi

charts/kubezero-logging/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-logging
 description: KubeZero Umbrella Chart for complete EFK stack
 type: application
-version: 0.7.7
+version: 0.7.8
 appVersion: 1.6.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png

charts/kubezero-logging/values.yaml

@@ -46,7 +46,8 @@ fluentd:
   enabled: false
   image:
     repository: fluent/fluentd-kubernetes-daemonset
-    tag: v1-debian-elasticsearch
+    # tag: v1-debian-elasticsearch
+    tag: v1.11.1-debian-elasticsearch7-1.3
   istio:
     enabled: false
 
@@ -123,7 +124,7 @@ fluentd:
         log_level info
         ignore_repeated_log_interval 60s
         ignore_same_log_interval 60s
-        workers 2
+        workers 1
       </system>
     01_sources.conf: |-
       <source>
@@ -165,6 +166,13 @@ fluentd:
           </exclude>
         </filter>
 
+        # Generate Hash ID to break endless loop for already ingested events during retries
+        <filter **>
+          @type elasticsearch_genid
+          use_entire_record true
+        </filter>
+
+        # Route through DISPATCH for Prometheus metrics
         <match **>
           @type relabel
           @label @DISPATCH
@@ -178,8 +186,8 @@ fluentd:
           @type elasticsearch
           # @log_level debug
           include_tag_key true
-          id_key id
+          id_key _hash
-          remove_keys id
+          remove_keys _hash
 
           # KubeZero pipeline incl. GeoIP etc.
           pipeline fluentd
@@ -207,7 +215,7 @@ fluentd:
             @type file
 
             flush_mode interval
-            flush_thread_count 1
+            flush_thread_count 2
             flush_interval 30s
 
             chunk_limit_size 4MB

charts/kubezero/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero - Bootstrap and ArgoCD Root App of Apps chart
 type: application
-version: 1.20.8-3
+version: 1.20.8-4
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:

charts/kubezero/app.yaml

@@ -0,0 +1,30 @@
+# Skeleton template to put into each cluster git folder
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: kubezero
+  namespace: argocd
+spec:
+  project: kubezero
+  source:
+    repoURL: https://zero-down-time.github.io/kubezero
+    chart: kubezero
+    targetRevision: {{ .Values.kubezero.version }}
+
+    helm:
+      parameters:
+      # We use this to detect if we are called from ArgoCD
+      - name: argocdAppName
+        value: $ARGOCD_APP_NAME
+      # This breaks the recursion, otherwise we install another kubezero project and app
+      - name: installKubeZero
+        value: "false"
+      values: |
+        {{- toYaml .Values | nindent 8 }}
+
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: argocd
+  syncPolicy:
+    automated:
+      prune: true

charts/kubezero/applicationSet.yaml

@@ -0,0 +1,41 @@
+kind: ApplicationSet
+metadata:
+  name: kubezero
+  namespace: argocd
+  labels:
+    {{- include "kubezero-lib.labels" . | nindent 4 }}
+spec:
+  generators:
+  - git:
+      repoURL: {{ .Values.kubezero.applicationSet.repoURL }}
+      revision: {{ .Values.kubezero.applicationSet.revision }}
+      files:
+      {{- toYaml .Values.kubezero.applicationSet.files | nindent 6 }}
+  template:
+    metadata:
+      name: kubezero
+    spec:
+      project: kubezero
+      source:
+        repoURL: https://zero-down-time.github.io/kubezero
+        chart: kubezero
+        targetRevision: '{{ "{{" }} kubezero.version {{ "}}" }}'
+        helm:
+          parameters:
+          # We use this to detect if we are called from ArgoCD
+          - name: argocdAppName
+            value: $ARGOCD_APP_NAME
+          # This breaks the recursion, otherwise we install another kubezero project and app
+          # To be removed once we applicationSet is working and AppProject is moved back to ArgoCD chart
+          - name: installKubeZero
+            value: "false"
+          valueFiles:
+          - '{{ "{{" }} kubezero.valuesPath {{ "}}" }}/kubezero.yaml'
+          - '{{ "{{" }} kubezero.valuesPath {{ "}}" }}/values.yaml'
+
+      destination:
+        server: https://kubernetes.default.svc
+        namespace: argocd
+      syncPolicy:
+        automated:
+          prune: true

charts/kubezero/templates/kubezero.yaml

@@ -11,10 +11,11 @@ metadata:
 spec:
   description: KubeZero - ZeroDownTime Kubernetes Platform
 
-  # Allow manifests to deploy from
+  # Add the git repo used for git-sync
-  {{- with .Values.kubezero.sourceRepos }}
   sourceRepos:
-  {{- toYaml . | nindent 2 }}
+  - {{ .Values.kubezero.repoURL }}
+  {{ with .Values.kubezero.gitSync.repoURL }}
+  - {{ . }}
   {{- end }}
 
   # platform namespaces in the local cluster
@@ -44,28 +45,20 @@ spec:
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: kubezero
+  name: kubezero-git-sync
   namespace: argocd
   labels:
     {{- include "kubezero-lib.labels" . | nindent 4 }}
 spec:
   project: kubezero
   source:
-    repoURL: https://zero-down-time.github.io/kubezero
+    repoURL: {{ .Values.kubezero.gitSync.repoURL }}
-    chart: kubezero
+    targetRevision: {{ .Values.kubezero.gitSync.targetRevision }}
-    # targetRevision: '>=1.20.8-0'
+    path: {{ .Values.kubezero.gitSync.path }}
-    targetRevision: '{{ .Chart.Version }}'
 
     helm:
-      parameters:
+      valueFiles:
-      # We use this to detect if we are called from ArgoCD
+      - kubezero.yaml
-      - name: argocdAppName
-        value: $ARGOCD_APP_NAME
-      # This breaks the recursion, otherwise we install another kubezero project and app
-      - name: installKubeZero
-        value: "false"
-      values: |
-        {{- toYaml .Values | nindent 8 }}
 
   destination:
     server: https://kubernetes.default.svc

charts/kubezero/values.yaml

@@ -1,9 +1,8 @@
 kubezero:
   server: https://kubernetes.default.svc
   repoURL: https://zero-down-time.github.io/kubezero
-  targetRevision: '*'
+  defaultTargetRevision: '*'
-  sourceRepos:
+  gitSync: {}
-  - 'https://zero-down-time.github.io/kubezero'
 
 HighAvailableControlplane: false
 
@@ -63,7 +62,7 @@ logging:
   enabled: false
   crds: true
   namespace: logging
-  targetRevision: 0.7.7
+  targetRevision: 0.7.8
 
 argocd:
   enabled: false