From 243f78c6d58e0efede1f80012810abfbc3328551 Mon Sep 17 00:00:00 2001
From: Robbie Lankford <robert.lankford@grafana.com>
Date: Mon, 11 Mar 2024 18:57:40 -0700
Subject: [PATCH] shorten names to pass tests

Signed-off-by: Robbie Lankford <robert.lankford@grafana.com>
---
 charts/grafana-sampling/README.md                             | 2 ++
 .../templates/_otelcol_exporter_loadbalancing.river.txt       | 2 +-
 charts/grafana-sampling/templates/configmap_deployment.yaml   | 2 +-
 charts/grafana-sampling/templates/configmap_statefulset.yaml  | 2 +-
 charts/grafana-sampling/values.yaml                           | 4 ++++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md
index c75f0842ff..a59490a284 100644
--- a/charts/grafana-sampling/README.md
+++ b/charts/grafana-sampling/README.md
@@ -80,6 +80,7 @@ A major chart version change indicates that there is an incompatible breaking ch
 | grafana-agent-deployment.controller.autoscaling.targetMemoryUtilizationPercentage | int | `80` | Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling. |
 | grafana-agent-deployment.controller.replicas | int | `1` |  |
 | grafana-agent-deployment.controller.type | string | `"deployment"` |  |
+| grafana-agent-deployment.nameOverride | string | `"deployment"` | Do not change this. |
 | grafana-agent-statefulset.agent.configMap.create | bool | `false` |  |
 | grafana-agent-statefulset.agent.extraEnv[0].name | string | `"GRAFANA_CLOUD_API_KEY"` |  |
 | grafana-agent-statefulset.agent.extraEnv[0].value | string | `"<REQUIRED>"` |  |
@@ -107,6 +108,7 @@ A major chart version change indicates that there is an incompatible breaking ch
 | grafana-agent-statefulset.controller.autoscaling.targetMemoryUtilizationPercentage | int | `80` | Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling. |
 | grafana-agent-statefulset.controller.replicas | int | `1` |  |
 | grafana-agent-statefulset.controller.type | string | `"statefulset"` |  |
+| grafana-agent-statefulset.nameOverride | string | `"statefulset"` | Do not change this. |
 | grafana-agent-statefulset.rbac.create | bool | `false` |  |
 | grafana-agent-statefulset.service.clusterIP | string | `"None"` |  |
 | grafana-agent-statefulset.serviceAccount.create | bool | `false` |  |
diff --git a/charts/grafana-sampling/templates/_otelcol_exporter_loadbalancing.river.txt b/charts/grafana-sampling/templates/_otelcol_exporter_loadbalancing.river.txt
index 41c13e3051..f2ec7ef43e 100644
--- a/charts/grafana-sampling/templates/_otelcol_exporter_loadbalancing.river.txt
+++ b/charts/grafana-sampling/templates/_otelcol_exporter_loadbalancing.river.txt
@@ -4,7 +4,7 @@ otelcol.exporter.loadbalancing "default" {
   resolver {
 
     kubernetes {
-      service = "{{ .Release.Name }}-grafana-agent-statefulset.{{ .Release.Namespace }}"
+      service = "{{ .Release.Name }}-statefulset.{{ .Release.Namespace }}"
     }
   }
 
diff --git a/charts/grafana-sampling/templates/configmap_deployment.yaml b/charts/grafana-sampling/templates/configmap_deployment.yaml
index d48169a338..0255b35e12 100644
--- a/charts/grafana-sampling/templates/configmap_deployment.yaml
+++ b/charts/grafana-sampling/templates/configmap_deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-grafana-agent-deployment
+  name: {{ .Release.Name }}-deployment
   labels:
     {{- include "grafana-agent.labels" . | nindent 4 }}
 data:
diff --git a/charts/grafana-sampling/templates/configmap_statefulset.yaml b/charts/grafana-sampling/templates/configmap_statefulset.yaml
index 28544d4de5..2a0a5499f1 100644
--- a/charts/grafana-sampling/templates/configmap_statefulset.yaml
+++ b/charts/grafana-sampling/templates/configmap_statefulset.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-grafana-agent-statefulset
+  name: {{ .Release.Name }}-statefulset
   labels:
     {{- include "grafana-agent.labels" . | nindent 4 }}
 data:
diff --git a/charts/grafana-sampling/values.yaml b/charts/grafana-sampling/values.yaml
index 4bff6d5884..8eca25bebf 100644
--- a/charts/grafana-sampling/values.yaml
+++ b/charts/grafana-sampling/values.yaml
@@ -50,6 +50,8 @@ sampling:
 
 # @ignored Ignore agent deployment
 grafana-agent-deployment:
+  # -- Do not change this.
+  nameOverride: deployment
   controller:
     type: deployment
     replicas: 1
@@ -84,6 +86,8 @@ grafana-agent-deployment:
 
 # @ignored Ignore agent statefulset
 grafana-agent-statefulset:
+  # -- Do not change this.
+  nameOverride: statefulset
   controller:
     type: statefulset
     replicas: 1