Rename regional and child charts

K0rdent · Dec 20, 2024 · ed022b2 · ed022b2
1 parent 98347da
commit ed022b2
Show file tree

Hide file tree

Showing 71 changed files with 31 additions and 15 deletions.
diff --git a/charts/motel-mothership/templates/hmc/cert-manager/svctmpl.yaml b/charts/motel-mothership/templates/hmc/cert-manager/svctmpl.yaml
@@ -2,7 +2,7 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ServiceTemplate
 metadata:
-  name: cert-manager-1-16-1
+  name: cert-manager
   namespace: hmc-system
 spec:
   helm:
@@ -11,6 +11,5 @@ spec:
       kind: HelmChart
       name: cert-manager
       namespace: hmc-system
-    chartVersion: 1.16.1
   providers: []
 {{- end }}
diff --git a/charts/motel-mothership/templates/hmc/motel-child/svctmpl.yaml b/charts/motel-mothership/templates/hmc/motel-child/svctmpl.yaml
@@ -2,7 +2,7 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ServiceTemplate
 metadata:
-  name: motel-child-0-1-2
+  name: motel-child
   namespace: hmc-system
 spec:
   helm:
@@ -11,6 +11,5 @@ spec:
       kind: HelmChart
       name: motel-child
       namespace: hmc-system
-    chartVersion: 0.1.2
   providers: []
 {{- end }}
diff --git a/charts/motel-mothership/templates/hmc/motel-regional/svctmpl.yaml b/charts/motel-mothership/templates/hmc/motel-regional/svctmpl.yaml
@@ -6,11 +6,13 @@ metadata:
   namespace: hmc-system
 spec:
   helm:
-    chartRef:
-      apiVersion: source.toolkit.fluxcd.io/v1
-      kind: HelmChart
-      name: motel-regional
-      namespace: hmc-system
-    chartVersion: 0.1.2
+    chartSpec:
+      chart: motel-regional
+      interval: 10m0s
+      reconcileStrategy: ChartVersion
+      sourceRef:
+        kind: HelmRepository
+        name: motel
+      version: 0.1.2
   providers: []
 {{- end }}
diff --git a/charts/motel-regional/Chart.lock → charts/motel-storage/Chart.lock b/charts/motel-regional/Chart.lock → charts/motel-storage/Chart.lock
diff --git a/charts/motel-regional/Chart.yaml → charts/motel-storage/Chart.yaml b/charts/motel-regional/Chart.yaml → charts/motel-storage/Chart.yaml
@@ -9,11 +9,11 @@ dependencies:
     repository: "oci://ghcr.io/grafana/helm-charts"
     condition: grafana.enabled
   - name: victoria-metrics-operator
-    version: "0.36.*"
+    version: "0.40.*"
     repository: "https://victoriametrics.github.io/helm-charts/"
     condition: victoria-metrics-operator.enabled
   - name: victoria-logs-single
-    version: "0.7.*"
+    version: "0.8.*"
     repository: https://victoriametrics.github.io/helm-charts/
     condition: victoria-logs-single.enabled
   - name: external-dns

diff --git a/...s/dashboards/kubernetes-views-global.yaml → ...s/dashboards/kubernetes-views-global.yaml b/...s/dashboards/kubernetes-views-global.yaml → ...s/dashboards/kubernetes-views-global.yaml
diff --git a/...shboards/kubernetes-views-namespaces.yaml → ...shboards/kubernetes-views-namespaces.yaml b/...shboards/kubernetes-views-namespaces.yaml → ...shboards/kubernetes-views-namespaces.yaml
diff --git a/...es/dashboards/kubernetes-views-nodes.yaml → ...es/dashboards/kubernetes-views-nodes.yaml b/...es/dashboards/kubernetes-views-nodes.yaml → ...es/dashboards/kubernetes-views-nodes.yaml
diff --git a/...les/dashboards/kubernetes-views-pods.yaml → ...les/dashboards/kubernetes-views-pods.yaml b/...les/dashboards/kubernetes-views-pods.yaml → ...les/dashboards/kubernetes-views-pods.yaml
diff --git a/.../files/dashboards/node-exporter-full.yaml → .../files/dashboards/node-exporter-full.yaml b/.../files/dashboards/node-exporter-full.yaml → .../files/dashboards/node-exporter-full.yaml
diff --git a/...pencost-cost-reporter-basic-overview.yaml → ...pencost-cost-reporter-basic-overview.yaml b/...pencost-cost-reporter-basic-overview.yaml → ...pencost-cost-reporter-basic-overview.yaml
diff --git a/...cost-cost-reporter-detailed-overview.yaml → ...cost-cost-reporter-detailed-overview.yaml b/...cost-cost-reporter-detailed-overview.yaml → ...cost-cost-reporter-detailed-overview.yaml
diff --git a/charts/motel-regional/files/rules/etcd.yaml → charts/motel-storage/files/rules/etcd.yaml b/charts/motel-regional/files/rules/etcd.yaml → charts/motel-storage/files/rules/etcd.yaml
diff --git a/...l-regional/files/rules/general.rules.yaml → ...el-storage/files/rules/general.rules.yaml b/...l-regional/files/rules/general.rules.yaml → ...el-storage/files/rules/general.rules.yaml
diff --git a/...rules/k8s.rules.container_cpu_limits.yaml → ...rules/k8s.rules.container_cpu_limits.yaml b/...rules/k8s.rules.container_cpu_limits.yaml → ...rules/k8s.rules.container_cpu_limits.yaml
diff --git a/...les/k8s.rules.container_cpu_requests.yaml → ...les/k8s.rules.container_cpu_requests.yaml b/...les/k8s.rules.container_cpu_requests.yaml → ...les/k8s.rules.container_cpu_requests.yaml
diff --git a/...es.container_cpu_usage_seconds_total.yaml → ...es.container_cpu_usage_seconds_total.yaml b/...es.container_cpu_usage_seconds_total.yaml → ...es.container_cpu_usage_seconds_total.yaml
diff --git a/...les/k8s.rules.container_memory_cache.yaml → ...les/k8s.rules.container_memory_cache.yaml b/...les/k8s.rules.container_memory_cache.yaml → ...les/k8s.rules.container_memory_cache.yaml
diff --git a/...es/k8s.rules.container_memory_limits.yaml → ...es/k8s.rules.container_memory_limits.yaml b/...es/k8s.rules.container_memory_limits.yaml → ...es/k8s.rules.container_memory_limits.yaml
diff --git a/.../k8s.rules.container_memory_requests.yaml → .../k8s.rules.container_memory_requests.yaml b/.../k8s.rules.container_memory_requests.yaml → .../k8s.rules.container_memory_requests.yaml
diff --git a/...rules/k8s.rules.container_memory_rss.yaml → ...rules/k8s.rules.container_memory_rss.yaml b/...rules/k8s.rules.container_memory_rss.yaml → ...rules/k8s.rules.container_memory_rss.yaml
diff --git a/...ules/k8s.rules.container_memory_swap.yaml → ...ules/k8s.rules.container_memory_swap.yaml b/...ules/k8s.rules.container_memory_swap.yaml → ...ules/k8s.rules.container_memory_swap.yaml
diff --git a/...s.container_memory_working_set_bytes.yaml → ...s.container_memory_working_set_bytes.yaml b/...s.container_memory_working_set_bytes.yaml → ...s.container_memory_working_set_bytes.yaml
diff --git a/...onal/files/rules/k8s.rules.pod_owner.yaml → ...rage/files/rules/k8s.rules.pod_owner.yaml b/...onal/files/rules/k8s.rules.pod_owner.yaml → ...rage/files/rules/k8s.rules.pod_owner.yaml
diff --git a/.../rules/kube-prometheus-general.rules.yaml → .../rules/kube-prometheus-general.rules.yaml b/.../rules/kube-prometheus-general.rules.yaml → .../rules/kube-prometheus-general.rules.yaml
diff --git a/...kube-prometheus-node-recording.rules.yaml → ...kube-prometheus-node-recording.rules.yaml b/...kube-prometheus-node-recording.rules.yaml → ...kube-prometheus-node-recording.rules.yaml
diff --git a/...ional/files/rules/kube-state-metrics.yaml → ...orage/files/rules/kube-state-metrics.yaml b/...ional/files/rules/kube-state-metrics.yaml → ...orage/files/rules/kube-state-metrics.yaml
diff --git a/...l-regional/files/rules/kubelet.rules.yaml → ...el-storage/files/rules/kubelet.rules.yaml b/...l-regional/files/rules/kubelet.rules.yaml → ...el-storage/files/rules/kubelet.rules.yaml
diff --git a/...regional/files/rules/kubernetes-apps.yaml → ...-storage/files/rules/kubernetes-apps.yaml b/...regional/files/rules/kubernetes-apps.yaml → ...-storage/files/rules/kubernetes-apps.yaml
diff --git a/...nal/files/rules/kubernetes-resources.yaml → ...age/files/rules/kubernetes-resources.yaml b/...nal/files/rules/kubernetes-resources.yaml → ...age/files/rules/kubernetes-resources.yaml
diff --git a/...ional/files/rules/kubernetes-storage.yaml → ...orage/files/rules/kubernetes-storage.yaml b/...ional/files/rules/kubernetes-storage.yaml → ...orage/files/rules/kubernetes-storage.yaml
diff --git a/...es/rules/kubernetes-system-apiserver.yaml → ...es/rules/kubernetes-system-apiserver.yaml b/...es/rules/kubernetes-system-apiserver.yaml → ...es/rules/kubernetes-system-apiserver.yaml
diff --git a/...iles/rules/kubernetes-system-kubelet.yaml → ...iles/rules/kubernetes-system-kubelet.yaml b/...iles/rules/kubernetes-system-kubelet.yaml → ...iles/rules/kubernetes-system-kubelet.yaml
diff --git a/...gional/files/rules/kubernetes-system.yaml → ...torage/files/rules/kubernetes-system.yaml b/...gional/files/rules/kubernetes-system.yaml → ...torage/files/rules/kubernetes-system.yaml
diff --git a/...onal/files/rules/node-exporter.rules.yaml → ...rage/files/rules/node-exporter.rules.yaml b/...onal/files/rules/node-exporter.rules.yaml → ...rage/files/rules/node-exporter.rules.yaml
diff --git a/...l-regional/files/rules/node-exporter.yaml → ...el-storage/files/rules/node-exporter.yaml b/...l-regional/files/rules/node-exporter.yaml → ...el-storage/files/rules/node-exporter.yaml
diff --git a/...el-regional/files/rules/node-network.yaml → ...tel-storage/files/rules/node-network.yaml b/...el-regional/files/rules/node-network.yaml → ...tel-storage/files/rules/node-network.yaml
diff --git a/...otel-regional/files/rules/node.rules.yaml → ...motel-storage/files/rules/node.rules.yaml b/...otel-regional/files/rules/node.rules.yaml → ...motel-storage/files/rules/node.rules.yaml
diff --git a/charts/motel-child/templates/_helpers.tpl → charts/motel-storage/templates/_helpers.tpl b/charts/motel-child/templates/_helpers.tpl → charts/motel-storage/templates/_helpers.tpl
diff --git a/...templates/cert-manager/clusterissuer.yaml → ...templates/cert-manager/clusterissuer.yaml b/...templates/cert-manager/clusterissuer.yaml → ...templates/cert-manager/clusterissuer.yaml
diff --git a/...mplates/grafana/dashboards/dashboard.yaml → ...mplates/grafana/dashboards/dashboard.yaml b/...mplates/grafana/dashboards/dashboard.yaml → ...mplates/grafana/dashboards/dashboard.yaml
diff --git a/...l-regional/templates/grafana/grafana.yaml → ...el-storage/templates/grafana/grafana.yaml b/...l-regional/templates/grafana/grafana.yaml → ...el-storage/templates/grafana/grafana.yaml
diff --git a/...al/templates/grafana/logs-datasource.yaml → ...ge/templates/grafana/logs-datasource.yaml b/...al/templates/grafana/logs-datasource.yaml → ...ge/templates/grafana/logs-datasource.yaml
diff --git a/...templates/grafana/metrics-datasource.yaml → ...templates/grafana/metrics-datasource.yaml b/...templates/grafana/metrics-datasource.yaml → ...templates/grafana/metrics-datasource.yaml
diff --git a/...gional/templates/grafana/rules/rules.yaml → ...torage/templates/grafana/rules/rules.yaml b/...gional/templates/grafana/rules/rules.yaml → ...torage/templates/grafana/rules/rules.yaml
diff --git a/...d/templates/victoria/scrape/cadvisor.yaml → ...e/templates/victoria/scrape/cadvisor.yaml b/...d/templates/victoria/scrape/cadvisor.yaml → ...e/templates/victoria/scrape/cadvisor.yaml
diff --git a/...s/victoria/scrape/kube-state-metrics.yaml → ...s/victoria/scrape/kube-state-metrics.yaml b/...s/victoria/scrape/kube-state-metrics.yaml → ...s/victoria/scrape/kube-state-metrics.yaml
diff --git a/...ld/templates/victoria/scrape/kubelet.yaml → ...ge/templates/victoria/scrape/kubelet.yaml b/...ld/templates/victoria/scrape/kubelet.yaml → ...ge/templates/victoria/scrape/kubelet.yaml
diff --git a/...plates/victoria/scrape/node-exporter.yaml → ...plates/victoria/scrape/node-exporter.yaml b/...plates/victoria/scrape/node-exporter.yaml → ...plates/victoria/scrape/node-exporter.yaml
diff --git a/...ild/templates/victoria/scrape/probes.yaml → ...age/templates/victoria/scrape/probes.yaml b/...ild/templates/victoria/scrape/probes.yaml → ...age/templates/victoria/scrape/probes.yaml
diff --git a/...-regional/templates/victoria/vmagent.yaml → ...l-storage/templates/victoria/vmagent.yaml b/...-regional/templates/victoria/vmagent.yaml → ...l-storage/templates/victoria/vmagent.yaml
diff --git a/...-regional/templates/victoria/vmalert.yaml → ...l-storage/templates/victoria/vmalert.yaml b/...-regional/templates/victoria/vmalert.yaml → ...l-storage/templates/victoria/vmalert.yaml
diff --git a/...l-regional/templates/victoria/vmauth.yaml → ...el-storage/templates/victoria/vmauth.yaml b/...l-regional/templates/victoria/vmauth.yaml → ...el-storage/templates/victoria/vmauth.yaml
diff --git a/...egional/templates/victoria/vmcluster.yaml → ...storage/templates/victoria/vmcluster.yaml b/...egional/templates/victoria/vmcluster.yaml → ...storage/templates/victoria/vmcluster.yaml
diff --git a/...onal/templates/victoria/vmuser-creds.yaml → ...rage/templates/victoria/vmuser-creds.yaml b/...onal/templates/victoria/vmuser-creds.yaml → ...rage/templates/victoria/vmuser-creds.yaml
diff --git a/...l-regional/templates/victoria/vmuser.yaml → ...el-storage/templates/victoria/vmuser.yaml b/...l-regional/templates/victoria/vmuser.yaml → ...el-storage/templates/victoria/vmuser.yaml
diff --git a/charts/motel-regional/values.yaml → charts/motel-storage/values.yaml b/charts/motel-regional/values.yaml → charts/motel-storage/values.yaml
diff --git a/charts/motel-child/Chart.lock → charts/motel-vmagent/Chart.lock b/charts/motel-child/Chart.lock → charts/motel-vmagent/Chart.lock
diff --git a/charts/motel-child/Chart.yaml → charts/motel-vmagent/Chart.yaml b/charts/motel-child/Chart.yaml → charts/motel-vmagent/Chart.yaml
diff --git a/charts/motel-regional/templates/_helpers.tpl → charts/motel-vmagent/templates/_helpers.tpl b/charts/motel-regional/templates/_helpers.tpl → charts/motel-vmagent/templates/_helpers.tpl
diff --git a/...-child/templates/victoria/fluent-out.yaml → ...magent/templates/victoria/fluent-out.yaml b/...-child/templates/victoria/fluent-out.yaml → ...magent/templates/victoria/fluent-out.yaml
diff --git a/...l/templates/victoria/scrape/cadvisor.yaml → ...t/templates/victoria/scrape/cadvisor.yaml b/...l/templates/victoria/scrape/cadvisor.yaml → ...t/templates/victoria/scrape/cadvisor.yaml
diff --git a/...s/victoria/scrape/kube-state-metrics.yaml → ...s/victoria/scrape/kube-state-metrics.yaml b/...s/victoria/scrape/kube-state-metrics.yaml → ...s/victoria/scrape/kube-state-metrics.yaml
diff --git a/...al/templates/victoria/scrape/kubelet.yaml → ...nt/templates/victoria/scrape/kubelet.yaml b/...al/templates/victoria/scrape/kubelet.yaml → ...nt/templates/victoria/scrape/kubelet.yaml
diff --git a/...plates/victoria/scrape/node-exporter.yaml → ...plates/victoria/scrape/node-exporter.yaml b/...plates/victoria/scrape/node-exporter.yaml → ...plates/victoria/scrape/node-exporter.yaml
diff --git a/...nal/templates/victoria/scrape/probes.yaml → ...ent/templates/victoria/scrape/probes.yaml b/...nal/templates/victoria/scrape/probes.yaml → ...ent/templates/victoria/scrape/probes.yaml
diff --git a/...tel-child/templates/victoria/vmagent.yaml → ...l-vmagent/templates/victoria/vmagent.yaml b/...tel-child/templates/victoria/vmagent.yaml → ...l-vmagent/templates/victoria/vmagent.yaml
diff --git a/...hild/templates/victoria/vmauth-creds.yaml → ...gent/templates/victoria/vmauth-creds.yaml b/...hild/templates/victoria/vmauth-creds.yaml → ...gent/templates/victoria/vmauth-creds.yaml
diff --git a/charts/motel-child/values.yaml → charts/motel-vmagent/values.yaml b/charts/motel-child/values.yaml → charts/motel-vmagent/values.yaml
diff --git a/demo/demo-mothership-values.yaml b/demo/demo-mothership-values.yaml
@@ -24,8 +24,8 @@ grafana:
   promxyDatasourceUrl:
   logSources:
   - name: hmc0-logs
-    url: https://vmauth.hmc0.example.net/vls
-    type: victorialogs-datasource
+    url: https://vmauth.pbasov-reg-0.project2a-dev.mirantis.com/vls
+    type: victoriametrics-logs-datasource
     auth:
       username: motel
       password: motel
@@ -84,7 +84,7 @@ promxy:
     serverGroups:
       - clusterName: hmc0
         targets:
-          - vmauth.hmc0.example.net:443
+          - vmauth.pbasov-reg-0.project2a-dev.mirantis.com
         auth:
           username: motel
           password: motel
diff --git a/test-values.yaml b/test-values.yaml
@@ -0,0 +1,16 @@
+fluent-bit:
+  enabled: true
+  outputHost: vmauth.pbasov-reg-0.project2a-dev.mirantis.com
+  outputPassword: motel
+  outputUsername: motel
+opencost:
+  exporter:
+    defaultClusterId: aws-child0
+  prometheus:
+    external:
+      url: https://vmauth.pbasov-reg-0.project2a-dev.mirantis.com/vm/select/0/prometheus
+victoriametrics:
+  vmagent:
+    remotePassword: motel
+    remoteUsername: motel
+    remoteWriteUrl: https://vmauth.pbasov-reg-0.project2a-dev.mirantis.com/vm/insert/0/prometheus/api/v1/write