chore: make build-helm-tests

grafana · Feb 13, 2024 · c96d4c6 · c96d4c6
1 parent cf2e13e
commit c96d4c6
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 94 deletions.
diff --git a/...tamonitoring-values-generated/mimir-distributed/templates/distributor/distributor-so.yaml b/...tamonitoring-values-generated/mimir-distributed/templates/distributor/distributor-so.yaml
@@ -8,10 +8,6 @@ metadata:
     app.kubernetes.io/name: mimir
     app.kubernetes.io/instance: keda-autoscaling-metamonitoring-values
     app.kubernetes.io/component: distributor
-<<<<<<< HEAD
-=======
-    app.kubernetes.io/part-of: memberlist
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
     app.kubernetes.io/managed-by: Helm
   annotations:
     {}
@@ -22,11 +18,7 @@ spec:
       behavior:
         scaleDown:
           policies:
-<<<<<<< HEAD
           - periodSeconds: 600
-=======
-          - periodSeconds: 60
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
             type: Percent
             value: 10
   maxReplicaCount: 10
@@ -38,23 +30,13 @@ spec:
     kind: Deployment
   triggers:
   - metadata:
-<<<<<<< HEAD
       query: max_over_time(sum(sum by (pod) (rate(container_cpu_usage_seconds_total{container="distributor",namespace="citestns"}[5m])) and max by (pod) (up{container="distributor",namespace="citestns"}) > 0)[15m:]) * 1000
-=======
-      metricName: cortex_distributor_cpu_hpa_default
-      query: max_over_time(sum(rate(container_cpu_usage_seconds_total{container="distributor",namespace="citestns"}[5m]))[15m:]) * 1000
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
       serverAddress: https://mimir.example.com/prometheus
       threshold: "0"
       customHeaders: "X-Scope-OrgID=tenant-1"
     type: prometheus
   - metadata:
-<<<<<<< HEAD
       query: max_over_time(sum((sum by (pod) (container_memory_working_set_bytes{container="distributor",namespace="citestns"}) and max by (pod) (up{container="distributor",namespace="citestns"}) > 0) or vector(0))[15m:]) + sum(sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="distributor",namespace="citestns", resource="memory"}[15m])) and max by (pod) (changes(kube_pod_container_status_restarts_total{container="distributor",namespace="citestns"}[15m]) > 0) and max by (pod) (kube_pod_container_status_last_terminated_reason{container="distributor",namespace="citestns", reason="OOMKilled"}) or vector(0))
-=======
-      metricName: cortex_distributor_memory_hpa_default
-      query: max_over_time(sum(container_memory_working_set_bytes{container="distributor",namespace="citestns"})[15m:])
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
       serverAddress: https://mimir.example.com/prometheus
       threshold: "429496729"
       customHeaders: "X-Scope-OrgID=tenant-1"

diff --git a/...aling-metamonitoring-values-generated/mimir-distributed/templates/querier/querier-so.yaml b/...aling-metamonitoring-values-generated/mimir-distributed/templates/querier/querier-so.yaml
@@ -8,10 +8,6 @@ metadata:
     app.kubernetes.io/name: mimir
     app.kubernetes.io/instance: keda-autoscaling-metamonitoring-values
     app.kubernetes.io/component: querier
-<<<<<<< HEAD
-=======
-    app.kubernetes.io/part-of: memberlist
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
     app.kubernetes.io/managed-by: Helm
   annotations:
     {}
@@ -22,7 +18,6 @@ spec:
       behavior:
         scaleDown:
           policies:
-<<<<<<< HEAD
           - periodSeconds: 120
             type: Percent
             value: 10
@@ -36,11 +31,6 @@ spec:
             type: Pods
             value: 15
           stabilizationWindowSeconds: 60
-=======
-          - periodSeconds: 60
-            type: Percent
-            value: 10
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
   maxReplicaCount: 10
   minReplicaCount: 2
   pollingInterval: 10
@@ -50,7 +40,6 @@ spec:
     kind: Deployment
   triggers:
   - metadata:
-<<<<<<< HEAD
       query: sum(max_over_time(cortex_query_scheduler_inflight_requests{container="query-scheduler",namespace="citestns",quantile="0.5"}[1m]))
       serverAddress: https://mimir.example.com/prometheus
       threshold: "6"
@@ -63,11 +52,4 @@ spec:
       threshold: "6"
       customHeaders: "X-Scope-OrgID=tenant-1"
     name: cortex_querier_hpa_default_requests_duration
-=======
-      metricName: cortex_querier_hpa_default
-      query: sum(max_over_time(cortex_query_scheduler_inflight_requests{container="query-scheduler",namespace="citestns",quantile="0.75"}[5m]))
-      serverAddress: https://mimir.example.com/prometheus
-      threshold: "6"
-      customHeaders: "X-Scope-OrgID=tenant-1"
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
     type: prometheus
diff --git a/...toring-values-generated/mimir-distributed/templates/query-frontend/query-frontend-so.yaml b/...toring-values-generated/mimir-distributed/templates/query-frontend/query-frontend-so.yaml
@@ -30,24 +30,13 @@ spec:
     kind: Deployment
   triggers:
   - metadata:
-<<<<<<< HEAD
       query: max_over_time(sum(sum by (pod) (rate(container_cpu_usage_seconds_total{container="query-frontend",namespace="citestns"}[5m])) and max by (pod) (up{container="query-frontend",namespace="citestns"}) > 0)[15m:]) * 1000
       serverAddress: https://mimir.example.com/prometheus
       threshold: "0"
       customHeaders: "X-Scope-OrgID=tenant-1"
     type: prometheus
   - metadata:
       query: max_over_time(sum((sum by (pod) (container_memory_working_set_bytes{container="query-frontend",namespace="citestns"}) and max by (pod) (up{container="query-frontend",namespace="citestns"}) > 0) or vector(0))[15m:]) + sum(sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="query-frontend",namespace="citestns", resource="memory"}[15m])) and max by (pod) (changes(kube_pod_container_status_restarts_total{container="query-frontend",namespace="citestns"}[15m]) > 0) and max by (pod) (kube_pod_container_status_last_terminated_reason{container="query-frontend",namespace="citestns", reason="OOMKilled"}) or vector(0))
-=======
-      metricName: query_frontend_cpu_hpa_default
-      query: max_over_time(sum(rate(container_cpu_usage_seconds_total{container="query-frontend",namespace="citestns"}[5m]))[15m:]) * 1000
-      serverAddress: https://mimir.example.com/prometheus
-      threshold: "0"
-    type: prometheus
-  - metadata:
-      metricName: query_frontend_memory_hpa_default
-      query: max_over_time(sum(container_memory_working_set_bytes{container="query-frontend",namespace="citestns"})[15m:])
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
       serverAddress: https://mimir.example.com/prometheus
       threshold: "107374182"
       customHeaders: "X-Scope-OrgID=tenant-1"

diff --git a/...-autoscaling-values-generated/mimir-distributed/templates/distributor/distributor-so.yaml b/...-autoscaling-values-generated/mimir-distributed/templates/distributor/distributor-so.yaml
@@ -8,10 +8,6 @@ metadata:
     app.kubernetes.io/name: mimir
     app.kubernetes.io/instance: keda-autoscaling-values
     app.kubernetes.io/component: distributor
-<<<<<<< HEAD
-=======
-    app.kubernetes.io/part-of: memberlist
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
     app.kubernetes.io/managed-by: Helm
   annotations:
     {}
@@ -22,11 +18,7 @@ spec:
       behavior:
         scaleDown:
           policies:
-<<<<<<< HEAD
           - periodSeconds: 600
-=======
-          - periodSeconds: 60
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
             type: Percent
             value: 10
   maxReplicaCount: 10
@@ -38,23 +30,13 @@ spec:
     kind: Deployment
   triggers:
   - metadata:
-<<<<<<< HEAD
       query: max_over_time(sum(sum by (pod) (rate(container_cpu_usage_seconds_total{container="distributor",namespace="citestns"}[5m])) and max by (pod) (up{container="distributor",namespace="citestns"}) > 0)[15m:]) * 1000
-=======
-      metricName: cortex_distributor_cpu_hpa_default
-      query: max_over_time(sum(rate(container_cpu_usage_seconds_total{container="distributor",namespace="citestns"}[5m]))[15m:]) * 1000
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
       serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus
       threshold: "0"
       customHeaders: "X-Scope-OrgID=tenant-1"
     type: prometheus
   - metadata:
-<<<<<<< HEAD
       query: max_over_time(sum((sum by (pod) (container_memory_working_set_bytes{container="distributor",namespace="citestns"}) and max by (pod) (up{container="distributor",namespace="citestns"}) > 0) or vector(0))[15m:]) + sum(sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="distributor",namespace="citestns", resource="memory"}[15m])) and max by (pod) (changes(kube_pod_container_status_restarts_total{container="distributor",namespace="citestns"}[15m]) > 0) and max by (pod) (kube_pod_container_status_last_terminated_reason{container="distributor",namespace="citestns", reason="OOMKilled"}) or vector(0))
-=======
-      metricName: cortex_distributor_memory_hpa_default
-      query: max_over_time(sum(container_memory_working_set_bytes{container="distributor",namespace="citestns"})[15m:])
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
       serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus
       threshold: "429496729"
       customHeaders: "X-Scope-OrgID=tenant-1"

diff --git a/...sts/keda-autoscaling-values-generated/mimir-distributed/templates/querier/querier-so.yaml b/...sts/keda-autoscaling-values-generated/mimir-distributed/templates/querier/querier-so.yaml
@@ -8,10 +8,6 @@ metadata:
     app.kubernetes.io/name: mimir
     app.kubernetes.io/instance: keda-autoscaling-values
     app.kubernetes.io/component: querier
-<<<<<<< HEAD
-=======
-    app.kubernetes.io/part-of: memberlist
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
     app.kubernetes.io/managed-by: Helm
   annotations:
     {}
@@ -22,7 +18,6 @@ spec:
       behavior:
         scaleDown:
           policies:
-<<<<<<< HEAD
           - periodSeconds: 120
             type: Percent
             value: 10
@@ -36,11 +31,6 @@ spec:
             type: Pods
             value: 15
           stabilizationWindowSeconds: 60
-=======
-          - periodSeconds: 60
-            type: Percent
-            value: 10
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
   maxReplicaCount: 10
   minReplicaCount: 2
   pollingInterval: 10
@@ -50,7 +40,6 @@ spec:
     kind: Deployment
   triggers:
   - metadata:
-<<<<<<< HEAD
       query: sum(max_over_time(cortex_query_scheduler_inflight_requests{container="query-scheduler",namespace="citestns",quantile="0.5"}[1m]))
       serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus
       threshold: "6"
@@ -63,11 +52,4 @@ spec:
       threshold: "6"
       customHeaders: "X-Scope-OrgID=tenant-1"
     name: cortex_querier_hpa_default_requests_duration
-=======
-      metricName: cortex_querier_hpa_default
-      query: sum(max_over_time(cortex_query_scheduler_inflight_requests{container="query-scheduler",namespace="citestns",quantile="0.75"}[5m]))
-      serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus
-      threshold: "6"
-      customHeaders: "X-Scope-OrgID=tenant-1"
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
     type: prometheus
diff --git a/...caling-values-generated/mimir-distributed/templates/query-frontend/query-frontend-so.yaml b/...caling-values-generated/mimir-distributed/templates/query-frontend/query-frontend-so.yaml
@@ -30,24 +30,13 @@ spec:
     kind: Deployment
   triggers:
   - metadata:
-<<<<<<< HEAD
       query: max_over_time(sum(sum by (pod) (rate(container_cpu_usage_seconds_total{container="query-frontend",namespace="citestns"}[5m])) and max by (pod) (up{container="query-frontend",namespace="citestns"}) > 0)[15m:]) * 1000
       serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus
       threshold: "0"
       customHeaders: "X-Scope-OrgID=tenant-1"
     type: prometheus
   - metadata:
       query: max_over_time(sum((sum by (pod) (container_memory_working_set_bytes{container="query-frontend",namespace="citestns"}) and max by (pod) (up{container="query-frontend",namespace="citestns"}) > 0) or vector(0))[15m:]) + sum(sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="query-frontend",namespace="citestns", resource="memory"}[15m])) and max by (pod) (changes(kube_pod_container_status_restarts_total{container="query-frontend",namespace="citestns"}[15m]) > 0) and max by (pod) (kube_pod_container_status_last_terminated_reason{container="query-frontend",namespace="citestns", reason="OOMKilled"}) or vector(0))
-=======
-      metricName: query_frontend_cpu_hpa_default
-      query: max_over_time(sum(rate(container_cpu_usage_seconds_total{container="query-frontend",namespace="citestns"}[5m]))[15m:]) * 1000
-      serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus
-      threshold: "0"
-    type: prometheus
-  - metadata:
-      metricName: query_frontend_memory_hpa_default
-      query: max_over_time(sum(container_memory_working_set_bytes{container="query-frontend",namespace="citestns"})[15m:])
->>>>>>> 9226de1c4 (feat(helm): Adding KEDA autoscaling support)
       serverAddress: http://keda-autoscaling-values-mimir-nginx.citestns.svc:80/prometheus
       threshold: "107374182"
       customHeaders: "X-Scope-OrgID=tenant-1"