From 4c66596ea33ca18ee96d75f91927eec1a4d83750 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Thu, 1 May 2025 16:09:17 +0800
Subject: [PATCH 01/31] Add addons datakit

---
 .../GuanceCloud/Datakit/datakit-helm.yaml     | 24 +++++++++++++++++++
 .../GuanceCloud/Datakit/datakit-source.yaml   |  9 +++++++
 .../GuanceCloud/Datakit/external-secret.yaml  | 20 ++++++++++++++++
 .../GuanceCloud/Datakit/namespace.yaml        |  9 +++++++
 4 files changed, 62 insertions(+)
 create mode 100644 eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
 create mode 100644 eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml
 create mode 100644 eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
 create mode 100644 eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
new file mode 100644
index 000000000..fa10f5fe7
--- /dev/null
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -0,0 +1,24 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: datakit
+  namespace: datakit
+spec:
+  chart:
+    spec:
+      chart: datakit
+      reconcileStrategy: ChartVersion
+      sourceRef:
+        kind: HelmRepository
+        name: datakit-charts
+        namespace: flux-system
+      version: 1.60.0
+  interval: 1m0s
+  targetNamespace: datakit
+  valuesFrom:
+  - kind: Secret
+    name: datakit-secret
+    valuesKey: dataway
+    targetPath: datakit.dataway_url
+    
\ No newline at end of file
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml
new file mode 100644
index 000000000..207398a68
--- /dev/null
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: datakit-charts
+  namespace: flux-system
+spec:
+  interval: 1m
+  url: https://pubrepo.guance.com/chartrepo/datakit 
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
new file mode 100644
index 000000000..0acabf874
--- /dev/null
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
@@ -0,0 +1,20 @@
+---
+# 仓库说明的本地测试部分有介绍如何拉取密钥
+# 计划使用密钥存储token，如果集群名称无法在仓库管理，则将它作为configmap，或者将dataway和集群名称均作为configmap存储，总之不能
+#   出现在仓库中
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: datakit-external-secret
+  namespace: datakit
+spec:
+  refreshInterval: 1m
+  secretStoreRef:
+    name: eksa-secret-store # The secret store name we have just created.
+    kind: ClusterSecretStore
+  target:
+    name: datakit-secret # Secret name in k8s
+  data:
+  - secretKey: dataway # which key it's going to be stored
+    remoteRef:
+      key: dataway # Our secret-name goes here
\ No newline at end of file
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
new file mode 100644
index 000000000..b608b705a
--- /dev/null
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: datakit
+  labels:
+      aws.conformance.vendor: guancecloud
+      aws.conformance.vendor-solution: datakit
+      aws.conformance.vendor-solution-version: 1.60.0
\ No newline at end of file

From ef5825d837f4d1e0126b03b82228adc5f3095551 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Thu, 1 May 2025 23:08:30 +0800
Subject: [PATCH 02/31] Update secret config

---
 .../Partner/GuanceCloud/Datakit/external-secret.yaml     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
index 0acabf874..f0612dc7e 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
@@ -1,7 +1,4 @@
 ---
-# 仓库说明的本地测试部分有介绍如何拉取密钥
-# 计划使用密钥存储token，如果集群名称无法在仓库管理，则将它作为configmap，或者将dataway和集群名称均作为configmap存储，总之不能
-#   出现在仓库中
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
@@ -14,7 +11,7 @@ spec:
     kind: ClusterSecretStore
   target:
     name: datakit-secret # Secret name in k8s
-  data:
-  - secretKey: dataway # which key it's going to be stored
+  dataFrom:
+  - secretKey: dataway # Which key it's going to be stored
     remoteRef:
-      key: dataway # Our secret-name goes here
\ No newline at end of file
+      key: aws_service_ready # Our secret-name goes here

From 33762282d6b1281dd17c1639f03ed775d84f1f2c Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Thu, 1 May 2025 23:29:49 +0800
Subject: [PATCH 03/31] Update secret config

---
 .../Addons/Partner/GuanceCloud/Datakit/external-secret.yaml    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
index f0612dc7e..2dd6f5bfb 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
@@ -11,7 +11,8 @@ spec:
     kind: ClusterSecretStore
   target:
     name: datakit-secret # Secret name in k8s
-  dataFrom:
+  data:
   - secretKey: dataway # Which key it's going to be stored
     remoteRef:
       key: aws_service_ready # Our secret-name goes here
+      property: dataway

From c3c54898d843d13d0b5f0a5b381624c3197d5c32 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Thu, 1 May 2025 23:51:04 +0800
Subject: [PATCH 04/31] Update interval

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index fa10f5fe7..1ffb7b025 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -14,7 +14,7 @@ spec:
         name: datakit-charts
         namespace: flux-system
       version: 1.60.0
-  interval: 1m0s
+  interval: 1m
   targetNamespace: datakit
   valuesFrom:
   - kind: Secret

From cb68abebb05f50832b48e46c717da7e28406b85b Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Thu, 1 May 2025 23:52:01 +0800
Subject: [PATCH 05/31] Update version

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml        | 2 +-
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 1ffb7b025..37deb6e20 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,7 +13,7 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.60.0
+      version: 1.70.0
   interval: 1m
   targetNamespace: datakit
   valuesFrom:
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index b608b705a..062d45f7f 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.60.0
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.70.0
\ No newline at end of file

From 54532e3f42795fcceff5b2ffaa210c786c8974bf Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Mon, 2 Jun 2025 22:58:59 +0800
Subject: [PATCH 06/31] Update version and secret

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml  | 8 ++++++--
 .../Partner/GuanceCloud/Datakit/external-secret.yaml      | 8 ++++++--
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml     | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 37deb6e20..e8697553c 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,12 +13,16 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.70.0
+      version: 1.74.0
   interval: 1m
   targetNamespace: datakit
   valuesFrom:
   - kind: Secret
     name: datakit-secret
-    valuesKey: dataway
+    valuesKey: dataway_url
     targetPath: datakit.dataway_url
+  - kind: Secret
+    name: datakit-secret
+    valuesKey: cluster_name_k8s
+    targetPath: datakit.cluster_name_k8s
     
\ No newline at end of file
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
index 2dd6f5bfb..49b904e15 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
@@ -12,7 +12,11 @@ spec:
   target:
     name: datakit-secret # Secret name in k8s
   data:
-  - secretKey: dataway # Which key it's going to be stored
+  - secretKey: dataway_url # Which key it's going to be stored
     remoteRef:
       key: aws_service_ready # Our secret-name goes here
-      property: dataway
+      property: dataway_url
+  - secretKey: cluster_name_k8s # Which key it's going to be stored
+    remoteRef:
+      key: aws_service_ready # Our secret-name goes here
+      property: cluster_name_k8s
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index 062d45f7f..8cc32cc07 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.70.0
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.74.0
\ No newline at end of file

From f9d5766b1f73025aa074be43816f4cd39227ceec Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Mon, 2 Jun 2025 23:42:38 +0800
Subject: [PATCH 07/31] Downgraded version

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml  | 8 ++++----
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index e8697553c..9f9fd4041 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -21,8 +21,8 @@ spec:
     name: datakit-secret
     valuesKey: dataway_url
     targetPath: datakit.dataway_url
-  - kind: Secret
-    name: datakit-secret
-    valuesKey: cluster_name_k8s
-    targetPath: datakit.cluster_name_k8s
+  #- kind: Secret
+  #  name: datakit-secret
+  #  valuesKey: cluster_name_k8s
+  #  targetPath: datakit.cluster_name_k8s
     
\ No newline at end of file
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index 8cc32cc07..33eb2a07b 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.74.0
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.73.0
\ No newline at end of file

From 6056c9a1e61d386240eb71da7be62e4b1cccb160 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Mon, 2 Jun 2025 23:45:22 +0800
Subject: [PATCH 08/31] Downgraded version

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 9f9fd4041..7c2f50bdf 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,7 +13,7 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.74.0
+      version: 1.73.0
   interval: 1m
   targetNamespace: datakit
   valuesFrom:

From 94029a27491aa0528fc600174bcae46df52fa776 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Mon, 2 Jun 2025 23:59:53 +0800
Subject: [PATCH 09/31] Downgraded version

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml        | 2 +-
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 7c2f50bdf..9b7e49c70 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,7 +13,7 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.73.0
+      version: 1.70.0
   interval: 1m
   targetNamespace: datakit
   valuesFrom:
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index 33eb2a07b..062d45f7f 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.73.0
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.70.0
\ No newline at end of file

From e82246a9063ab21e41e09059d93b1f9f49371056 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Tue, 3 Jun 2025 15:17:04 +0800
Subject: [PATCH 10/31] Update version

---
 .../Partner/GuanceCloud/Datakit/datakit-helm.yaml      | 10 +++++-----
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 9b7e49c70..2ebef9b10 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,7 +13,7 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.70.0
+      version: 1.74.1
   interval: 1m
   targetNamespace: datakit
   valuesFrom:
@@ -21,8 +21,8 @@ spec:
     name: datakit-secret
     valuesKey: dataway_url
     targetPath: datakit.dataway_url
-  #- kind: Secret
-  #  name: datakit-secret
-  #  valuesKey: cluster_name_k8s
-  #  targetPath: datakit.cluster_name_k8s
+  - kind: Secret
+    name: datakit-secret
+    valuesKey: cluster_name_k8s
+    targetPath: datakit.cluster_name_k8s
     
\ No newline at end of file
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index 062d45f7f..6e52c8e60 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.70.0
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.74.1
\ No newline at end of file

From 1cdc0e92572e8e1394505acc5073eefe01a4c05c Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Tue, 3 Jun 2025 15:48:16 +0800
Subject: [PATCH 11/31] Downgraded version

---
 .../Partner/GuanceCloud/Datakit/datakit-helm.yaml      | 10 +++++-----
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 2ebef9b10..9b7e49c70 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,7 +13,7 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.74.1
+      version: 1.70.0
   interval: 1m
   targetNamespace: datakit
   valuesFrom:
@@ -21,8 +21,8 @@ spec:
     name: datakit-secret
     valuesKey: dataway_url
     targetPath: datakit.dataway_url
-  - kind: Secret
-    name: datakit-secret
-    valuesKey: cluster_name_k8s
-    targetPath: datakit.cluster_name_k8s
+  #- kind: Secret
+  #  name: datakit-secret
+  #  valuesKey: cluster_name_k8s
+  #  targetPath: datakit.cluster_name_k8s
     
\ No newline at end of file
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index 6e52c8e60..062d45f7f 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.74.1
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.70.0
\ No newline at end of file

From 347a2a14eb50d62f23a0e0f832bd5c9ab32f387d Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Wed, 4 Jun 2025 19:28:15 +0800
Subject: [PATCH 12/31] Update version

---
 .../Partner/GuanceCloud/Datakit/datakit-helm.yaml      | 10 +++++-----
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 9b7e49c70..2ebef9b10 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,7 +13,7 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.70.0
+      version: 1.74.1
   interval: 1m
   targetNamespace: datakit
   valuesFrom:
@@ -21,8 +21,8 @@ spec:
     name: datakit-secret
     valuesKey: dataway_url
     targetPath: datakit.dataway_url
-  #- kind: Secret
-  #  name: datakit-secret
-  #  valuesKey: cluster_name_k8s
-  #  targetPath: datakit.cluster_name_k8s
+  - kind: Secret
+    name: datakit-secret
+    valuesKey: cluster_name_k8s
+    targetPath: datakit.cluster_name_k8s
     
\ No newline at end of file
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index 062d45f7f..6e52c8e60 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.70.0
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.74.1
\ No newline at end of file

From 36e785f49086e817cc71ab4ac2e9a51098550df7 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Wed, 4 Jun 2025 23:42:59 +0800
Subject: [PATCH 13/31] Add tester

---
 .../GuanceCloud/Datakit/test-cronjob.yaml     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
new file mode 100644
index 000000000..726f0b929
--- /dev/null
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -0,0 +1,28 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: datakit-test-cronjob
+  namespace: default
+spec:
+  schedule: "*/10 * * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+            - name: datakit-test-cronjob
+              image: busybox:1.36
+              command: ["/bin/sh", "-c"]
+              args:
+                - |
+                  HTTP_CODE=$(wget -qO- --server-response --timeout=10 "http://datakit-service.datakit.svc.cluster.local:9527/metrics" 2>&1 | awk '/^  HTTP/{print $2}' | tail -1)
+                  if [ "$HTTP_CODE" = "200" ]; then
+                    echo "Datakit metrics endpoint is healthy (HTTP $HTTP_CODE)"
+                    exit 0
+                  else
+                    echo "Datakit metrics endpoint returned HTTP $HTTP_CODE (expected 200)"
+                    exit 1
+                  fi
+          restartPolicy: Never
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 1

From da489a075a79e5c63bb240a518737b8441b58330 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Thu, 5 Jun 2025 10:45:55 +0800
Subject: [PATCH 14/31] Update tester

---
 .../Testers/GuanceCloud/Datakit/test-cronjob.yaml         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index 726f0b929..8d8d94bb0 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -15,12 +15,14 @@ spec:
               command: ["/bin/sh", "-c"]
               args:
                 - |
-                  HTTP_CODE=$(wget -qO- --server-response --timeout=10 "http://datakit-service.datakit.svc.cluster.local:9527/metrics" 2>&1 | awk '/^  HTTP/{print $2}' | tail -1)
+                  RESPONSE=$(wget -qO- --server-response --timeout=10 "http://datakit-service.datakit.svc.cluster.local:9529/v1/ping" 2>&1)
+                  HTTP_CODE=$(echo "$RESPONSE" | awk '/^  HTTP/{print $2}' | tail -1)
+                  BODY="{${RESPONSE##*{}"
                   if [ "$HTTP_CODE" = "200" ]; then
-                    echo "Datakit metrics endpoint is healthy (HTTP $HTTP_CODE)"
+                    echo "Datakit is available, info: ${BODY}"
                     exit 0
                   else
-                    echo "Datakit metrics endpoint returned HTTP $HTTP_CODE (expected 200)"
+                    echo "Datakit is unavailable, v1/ping endpoint http response code: ${HTTP_CODE}, please check the pod status and security policies"
                     exit 1
                   fi
           restartPolicy: Never

From 55f64c43910f93aeb89e11511c9af6a5a338747c Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Fri, 18 Jul 2025 16:47:54 +0800
Subject: [PATCH 15/31] Update tester

---
 .../Testers/GuanceCloud/Datakit/test-cronjob.yaml             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index 8d8d94bb0..8def6ad4c 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -2,9 +2,9 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: datakit-test-cronjob
-  namespace: default
+  namespace: datakit
 spec:
-  schedule: "*/10 * * * *"
+  schedule: "*/3 * * * *"
   jobTemplate:
     spec:
       template:

From 682ec8c21824d0c5a66d937b8805de2653eb946d Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Fri, 18 Jul 2025 17:13:47 +0800
Subject: [PATCH 16/31] Update version

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml        | 2 +-
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 2ebef9b10..75fd7d327 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,7 +13,7 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.74.1
+      version: 1.77.1
   interval: 1m
   targetNamespace: datakit
   valuesFrom:
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index 6e52c8e60..66d54180a 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.74.1
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.77.1
\ No newline at end of file

From 53ee75638f1d45c8cd77e0567377d00b4cfe79e2 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Sun, 3 Aug 2025 22:56:50 +0800
Subject: [PATCH 17/31] Update tester

---
 .../GuanceCloud/Datakit/test-cronjob.yaml     | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index 8def6ad4c..887eae5c8 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -4,7 +4,7 @@ metadata:
   name: datakit-test-cronjob
   namespace: datakit
 spec:
-  schedule: "*/3 * * * *"
+  schedule: "* * * * *"
   jobTemplate:
     spec:
       template:
@@ -15,15 +15,18 @@ spec:
               command: ["/bin/sh", "-c"]
               args:
                 - |
-                  RESPONSE=$(wget -qO- --server-response --timeout=10 "http://datakit-service.datakit.svc.cluster.local:9529/v1/ping" 2>&1)
-                  HTTP_CODE=$(echo "$RESPONSE" | awk '/^  HTTP/{print $2}' | tail -1)
-                  BODY="{${RESPONSE##*{}"
-                  if [ "$HTTP_CODE" = "200" ]; then
-                    echo "Datakit is available, info: ${BODY}"
-                    exit 0
+                  response=$(curl -s -w "%{http_code}" -X POST \
+                    -H "Content-Type: application/json" \
+                    -d '[{"measurement":"test_log","tags":{"foo":"bar"},"fields":{"message":"This log from aws service ready tester."}}]' \
+                    http://localhost:9529/v1/write/logging)
+
+                  http_code=${response: -3}
+
+                  if [ $http_code -ge 200 ] && [ $http_code -lt 300 ]; then
+                      echo "Write log success."
                   else
-                    echo "Datakit is unavailable, v1/ping endpoint http response code: ${HTTP_CODE}, please check the pod status and security policies"
-                    exit 1
+                      echo "Write log failed."
+                      exit 1
                   fi
           restartPolicy: Never
   successfulJobsHistoryLimit: 3

From e434fa764d3b982172dbb1c1cb3e3aac1bc77bec Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Sun, 3 Aug 2025 23:00:48 +0800
Subject: [PATCH 18/31] Update tester

---
 .../Testers/GuanceCloud/Datakit/test-cronjob.yaml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index 887eae5c8..3b4f66716 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -18,7 +18,7 @@ spec:
                   response=$(curl -s -w "%{http_code}" -X POST \
                     -H "Content-Type: application/json" \
                     -d '[{"measurement":"test_log","tags":{"foo":"bar"},"fields":{"message":"This log from aws service ready tester."}}]' \
-                    http://localhost:9529/v1/write/logging)
+                    http://datakit-service.datakit.svc.cluster.local:9529/v1/write/logging)
 
                   http_code=${response: -3}
 

From d443fa9727aa24bc7c0ccc737d879722a26897a4 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Sun, 3 Aug 2025 23:25:36 +0800
Subject: [PATCH 19/31] Update tester

---
 .../Testers/GuanceCloud/Datakit/test-cronjob.yaml   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index 3b4f66716..bc9a2a9ef 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -15,14 +15,15 @@ spec:
               command: ["/bin/sh", "-c"]
               args:
                 - |
-                  response=$(curl -s -w "%{http_code}" -X POST \
-                    -H "Content-Type: application/json" \
-                    -d '[{"measurement":"test_log","tags":{"foo":"bar"},"fields":{"message":"This log from aws service ready tester."}}]' \
-                    http://datakit-service.datakit.svc.cluster.local:9529/v1/write/logging)
+                  URL="http://datakit-service.datakit.svc.cluster.local:9529/v1/write/logging"
+                  DATA='[{"measurement":"test_log","tags":{"foo":"bar"},"fields":{"message":"This log from aws service ready tester."}}]'
 
-                  http_code=${response: -3}
+                  response=$(wget -q -O /dev/null --server-response --post-data "$DATA" \
+                    --header "Content-Type: application/json" "$URL" 2>&1)
 
-                  if [ $http_code -ge 200 ] && [ $http_code -lt 300 ]; then
+                  http_code=$(echo "$response" | awk '/^  HTTP/{print $2}' | head -n 1)
+
+                  if [ -n "$http_code" ] && [ "$http_code" -ge 200 ] && [ "$http_code" -lt 300 ]; then
                       echo "Write log success."
                   else
                       echo "Write log failed."

From 481fee51db42df5b9de2b9b34f71d002835f5299 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Sun, 10 Aug 2025 22:52:49 +0800
Subject: [PATCH 20/31] Update remote secret name

---
 .../Addons/Partner/GuanceCloud/Datakit/external-secret.yaml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
index 49b904e15..48f91832a 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
@@ -14,9 +14,9 @@ spec:
   data:
   - secretKey: dataway_url # Which key it's going to be stored
     remoteRef:
-      key: aws_service_ready # Our secret-name goes here
+      key: datakit-secrets # Our secret-name goes here
       property: dataway_url
   - secretKey: cluster_name_k8s # Which key it's going to be stored
     remoteRef:
-      key: aws_service_ready # Our secret-name goes here
+      key: datakit-secrets # Our secret-name goes here
       property: cluster_name_k8s

From 41fd93fec2c5d96006fbfe01f27b562074cf455b Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Sun, 10 Aug 2025 22:54:55 +0800
Subject: [PATCH 21/31] Update external-secrets api version

---
 .../Addons/Partner/GuanceCloud/Datakit/external-secret.yaml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
index 48f91832a..48c078319 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/external-secret.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: external-secrets.io/v1beta1
+apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: datakit-external-secret

From 1f249f762769508f6968ffcd9d59fd98c6ead385 Mon Sep 17 00:00:00 2001
From: Zach Jacobson <72418868+zjaco13@users.noreply.github.com>
Date: Wed, 13 Aug 2025 16:06:25 -0700
Subject: [PATCH 22/31] fix conjob to stop running every minute

---
 .../Testers/GuanceCloud/Datakit/test-cronjob.yaml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index bc9a2a9ef..250e8de4e 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -4,7 +4,7 @@ metadata:
   name: datakit-test-cronjob
   namespace: datakit
 spec:
-  schedule: "* * * * *"
+  schedule: "* */12 * * *"
   jobTemplate:
     spec:
       template:

From e2e6b856d81ddd5dec977c16a703fd272787dac8 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Thu, 14 Aug 2025 12:23:17 +0800
Subject: [PATCH 23/31] Update test job schedule

---
 .../Testers/GuanceCloud/Datakit/test-cronjob.yaml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index bc9a2a9ef..250e8de4e 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -4,7 +4,7 @@ metadata:
   name: datakit-test-cronjob
   namespace: datakit
 spec:
-  schedule: "* * * * *"
+  schedule: "* */12 * * *"
   jobTemplate:
     spec:
       template:

From a559ef1abbde31c5d5ff7338987d26cce900d8d9 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Thu, 14 Aug 2025 12:59:09 +0800
Subject: [PATCH 24/31] Update test job add debug info

---
 .../Testers/GuanceCloud/Datakit/test-cronjob.yaml            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index 250e8de4e..17aec0343 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -18,15 +18,16 @@ spec:
                   URL="http://datakit-service.datakit.svc.cluster.local:9529/v1/write/logging"
                   DATA='[{"measurement":"test_log","tags":{"foo":"bar"},"fields":{"message":"This log from aws service ready tester."}}]'
 
-                  response=$(wget -q -O /dev/null --server-response --post-data "$DATA" \
+                  response=$(wget -O /dev/null --server-response --post-data "$DATA" \
                     --header "Content-Type: application/json" "$URL" 2>&1)
 
                   http_code=$(echo "$response" | awk '/^  HTTP/{print $2}' | head -n 1)
 
-                  if [ -n "$http_code" ] && [ "$http_code" -ge 200 ] && [ "$http_code" -lt 300 ]; then
+                  if [ $? -ne 0 ] && [ -n "$http_code" ] && [ "$http_code" -ge 200 ] && [ "$http_code" -lt 300 ]; then
                       echo "Write log success."
                   else
                       echo "Write log failed."
+                      echo "$response"
                       exit 1
                   fi
           restartPolicy: Never

From ffd06aa0a426cc114d11110baa68e828673ed542 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Sun, 17 Aug 2025 19:56:39 +0800
Subject: [PATCH 25/31] Update datakit version

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml        | 2 +-
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 75fd7d327..9f8a9ce16 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,7 +13,7 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.77.1
+      version: 1.80.0
   interval: 1m
   targetNamespace: datakit
   valuesFrom:
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index 66d54180a..a2e02ee36 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.77.1
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.80.0
\ No newline at end of file

From 7a22727629b497daa14a5679c18caf6fd51435a1 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Tue, 11 Nov 2025 18:35:16 +0800
Subject: [PATCH 26/31] Update datakit version

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml        | 2 +-
 .../Addons/Partner/GuanceCloud/Datakit/namespace.yaml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index 9f8a9ce16..d3183b309 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -13,7 +13,7 @@ spec:
         kind: HelmRepository
         name: datakit-charts
         namespace: flux-system
-      version: 1.80.0
+      version: 1.85.0
   interval: 1m
   targetNamespace: datakit
   valuesFrom:
diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
index a2e02ee36..f115269e0 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/namespace.yaml
@@ -6,4 +6,4 @@ metadata:
   labels:
       aws.conformance.vendor: guancecloud
       aws.conformance.vendor-solution: datakit
-      aws.conformance.vendor-solution-version: 1.80.0
\ No newline at end of file
+      aws.conformance.vendor-solution-version: 1.85.0
\ No newline at end of file

From 480a5d6259759d0536e6b95a024536aebc849d0e Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Tue, 11 Nov 2025 18:43:46 +0800
Subject: [PATCH 27/31] Update heml repo url

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml
index 207398a68..622e343c1 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-source.yaml
@@ -6,4 +6,4 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1m
-  url: https://pubrepo.guance.com/chartrepo/datakit 
+  url: https://pubrepo.jiagouyun.com/chartrepo/datakit

From e74b74a327636f8b287f4819f14619cd75db8439 Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Fri, 14 Nov 2025 09:47:25 +0800
Subject: [PATCH 28/31] Update test job

---
 .../Testers/GuanceCloud/Datakit/test-cronjob.yaml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index 17aec0343..0a459f76a 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -4,7 +4,7 @@ metadata:
   name: datakit-test-cronjob
   namespace: datakit
 spec:
-  schedule: "* */12 * * *"
+  schedule: "0 */12 * * *"
   jobTemplate:
     spec:
       template:

From 24cac59b07822ef9373459d990a788134b531c3a Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Mon, 17 Nov 2025 14:12:13 +0800
Subject: [PATCH 29/31] Update test job

---
 .../Testers/GuanceCloud/Datakit/test-cronjob.yaml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
index 0a459f76a..8ab961fd9 100644
--- a/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
+++ b/eks-anywhere-common/Testers/GuanceCloud/Datakit/test-cronjob.yaml
@@ -23,7 +23,7 @@ spec:
 
                   http_code=$(echo "$response" | awk '/^  HTTP/{print $2}' | head -n 1)
 
-                  if [ $? -ne 0 ] && [ -n "$http_code" ] && [ "$http_code" -ge 200 ] && [ "$http_code" -lt 300 ]; then
+                  if [ $? -eq 0 ] && [ -n "$http_code" ] && [ "$http_code" -ge 200 ] && [ "$http_code" -lt 300 ]; then
                       echo "Write log success."
                   else
                       echo "Write log failed."

From 0f95cfe2ab77d657f6da01fee315bde79ff53f3a Mon Sep 17 00:00:00 2001
From: baihongru <45928086+baihongru@users.noreply.github.com>
Date: Tue, 25 Nov 2025 08:51:51 +0800
Subject: [PATCH 30/31] Modify cache path

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index d3183b309..f585e2d58 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -16,6 +16,9 @@ spec:
       version: 1.85.0
   interval: 1m
   targetNamespace: datakit
+  values:
+    datakit:
+      cache: /var/datakit_cache
   valuesFrom:
   - kind: Secret
     name: datakit-secret

From cc574de88744b65b231c55186e946dea1bb34a9d Mon Sep 17 00:00:00 2001
From: Zach Jacobson <72418868+zjaco13@users.noreply.github.com>
Date: Tue, 25 Nov 2025 15:04:50 -0800
Subject: [PATCH 31/31] Update datakit cache configuration in Helm chart

---
 .../Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
index f585e2d58..12cc931d9 100644
--- a/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
+++ b/eks-anywhere-common/Addons/Partner/GuanceCloud/Datakit/datakit-helm.yaml
@@ -18,7 +18,8 @@ spec:
   targetNamespace: datakit
   values:
     datakit:
-      cache: /var/datakit_cache
+      cache: 
+        mountPath: /var/datakit_cache
   valuesFrom:
   - kind: Secret
     name: datakit-secret
@@ -28,4 +29,4 @@ spec:
     name: datakit-secret
     valuesKey: cluster_name_k8s
     targetPath: datakit.cluster_name_k8s
-    
\ No newline at end of file
+