Merge branch 'avr/enable_enterpise_networking_flag' of github.com:kub…

…ecost/cost-analyzer-helm-chart into avr/enable_enterpise_networking_flag
kubecost · Nov 17, 2023 · aa49344 · aa49344
2 parents 8501715 + e93a612
commit aa49344
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/cost-analyzer/charts/prometheus/values.yaml b/cost-analyzer/charts/prometheus/values.yaml
@@ -543,7 +543,7 @@ server:
   ##
   image:
     repository: quay.io/prometheus/prometheus
-    tag: v2.35.0
+    tag: v2.47.2
     pullPolicy: IfNotPresent
 
   ## prometheus server priorityClassName
@@ -1270,7 +1270,7 @@ serverFiles:
 
         metric_relabel_configs:
           - source_labels: [ __name__ ]
-            regex: (kubelet_volume_stats_used_bytes) # this metric is in alpha 
+            regex: (kubelet_volume_stats_used_bytes) # this metric is in alpha
             action: keep
 
       # Scrape config for service endpoints.

diff --git a/cost-analyzer/templates/cost-analyzer-service-template.yaml b/cost-analyzer/templates/cost-analyzer-service-template.yaml
@@ -73,4 +73,14 @@ spec:
       targetPort: 9004
     {{- end }}
     {{- end }}
+{{- if .Values.service.sessionAffinity.enabled }}
+  sessionAffinity: ClientIP
+  {{- if .Values.service.sessionAffinity.timeoutSeconds }}
+  sessionAffinityConfig:
+    clientIP:
+      timeoutSeconds: {{ .Values.service.sessionAffinity.timeoutSeconds }}
+  {{- end }}
+{{- else }}
+  sessionAffinity: None
+{{- end }}
 {{- end }}
diff --git a/cost-analyzer/values-eks-cost-monitoring.yaml b/cost-analyzer/values-eks-cost-monitoring.yaml
@@ -151,8 +151,8 @@ prometheus:
       ## configmap-reload container image
       ##
       image:
-        repository: public.ecr.aws/bitnami/configmap-reload
-        tag: 0.7.1
+        repository: public.ecr.aws/kubecost/prometheus-config-reloader
+        tag: v0.68.0
         pullPolicy: IfNotPresent
       ## Additional configmap-reload container arguments
       ##
@@ -172,7 +172,7 @@ prometheus:
       ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
       ##
       resources: {}
-     
+
   kube-state-metrics:
     disabled: false
   nodeExporter:

diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml
@@ -637,6 +637,9 @@ service:
   # nodePort:
   labels: {}
   annotations: {}
+  sessionAffinity:
+    enabled: false # Makes sure that connections from a client are passed to the same Pod each time, when set to `true`. You should set it when you enabled authentication through OIDC or SAML integration.
+    timeoutSeconds: 10800
 
 # Enabling long-term durable storage with Postgres requires an enterprise license
 remoteWrite: