regenerates k8s manifests

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Jul 15, 2024 · 761b35f · 761b35f
1 parent 19c72ca
commit 761b35f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/kubernetes/common/grafana/kustomization.yaml b/kubernetes/common/grafana/kustomization.yaml
@@ -4,15 +4,15 @@ namespace: monitoring-system
 helmCharts:
 - name: grafana
   repo: https://grafana.github.io/helm-charts
-  version: 8.3.3
+  version: 8.3.4
   releaseName: grafana
   namespace: monitoring-system
   includeCRDs: false
   skipTests: true
   valuesFile: values-k3d-k3s.yaml
 images:
 - name: docker.io/grafana/grafana
-  newTag: 11.0.0
+  newTag: 11.1.0
 - name: quay.io/kiwigrid/k8s-sidecar
   newTag: 1.26.1
 resources:

diff --git a/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml b/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml
@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana
   namespace: monitoring-system
 ---
@@ -24,7 +24,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana
   namespace: monitoring-system
 rules: []
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana-clusterrole
 rules:
 - apiGroups:
@@ -58,7 +58,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana
   namespace: monitoring-system
 roleRef:
@@ -78,7 +78,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -157,7 +157,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana-config-dashboards
   namespace: monitoring-system
 ---
@@ -4226,7 +4226,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4248,7 +4248,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4383,7 +4383,7 @@ spec:
         - secretRef:
             name: grafana-env
             optional: true
-        image: docker.io/grafana/grafana:11.0.0
+        image: docker.io/grafana/grafana:11.1.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10
@@ -4456,7 +4456,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4484,7 +4484,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.3
+    helm.sh/chart: grafana-8.3.4
   name: grafana
   namespace: monitoring-system
 spec:

diff --git a/kubernetes/monolithic-mode/profiles/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/profiles/k8s-all-in-one.yaml
@@ -1110,7 +1110,7 @@ data:
     * Profiles\n ********************************************/\nimport.file \"profiles\"
     {\n\tfilename = coalesce(env(\"ALLOY_MODULES_FOLDER\"), \"/etc/alloy/modules\")
     + \"/kubernetes/profiles\"\n}\n\nprofiles.annotations_scrape \"kubernetes\" {\n\tcluster
-    = \"k3d-k3s-codelab\"\n\n\tforward_to = [provider.self_hosted_stack.kubernetes.profiles_receiver]\n}\n\n/********************************************\n
+    = coalesce(env(\"CLUSTER_NAME\"), \"k3d-k3s-codelab\")\n\n\tforward_to = [provider.self_hosted_stack.kubernetes.profiles_receiver]\n}\n\n/********************************************\n
     * Metrics\n ********************************************/\nimport.file \"metrics\"
     {\n\tfilename = coalesce(env(\"ALLOY_MODULES_FOLDER\"), \"/etc/alloy/modules\")
     + \"/kubernetes/metrics\"\n}\n\nmetrics.annotations_scrape \"kubernetes\" {\n\tcluster
@@ -1129,7 +1129,7 @@ data:
     = [provider.self_hosted_stack.kubernetes.metrics_receiver]\n}\n"
 kind: ConfigMap
 metadata:
-  name: alloy-config-6h7tb697c9
+  name: alloy-config-42kch682kt
   namespace: monitoring-system
 ---
 apiVersion: v1
@@ -5092,7 +5092,7 @@ spec:
       serviceAccountName: alloy
       volumes:
       - configMap:
-          name: alloy-config-6h7tb697c9
+          name: alloy-config-42kch682kt
         name: config
       - configMap:
           name: alloy-modules-kubernetes-metrics-6g7hb9cd7g

diff --git a/kubernetes/monolithic-mode/profiles/profiles.alloy b/kubernetes/monolithic-mode/profiles/profiles.alloy
@@ -26,7 +26,7 @@ import.file "profiles" {
 }
 
 profiles.annotations_scrape "kubernetes" {
-	cluster = "k3d-k3s-codelab"
+	cluster = coalesce(env("CLUSTER_NAME"), "k3d-k3s-codelab")
 
 	forward_to = [provider.self_hosted_stack.kubernetes.profiles_receiver]
 }