Merge branch 'develop' into dependabot/docker/cost-analyzer/charts/pr…

…ometheus/prom/node-exporter-v1.7.0

README.md

@@ -8,7 +8,7 @@ Kubecost strives to support as many versions of Kubernetes as possible. Below is
 
 | Chart Version                | Kubernetes Min | Kubernetes Max |
 |--------------------------------|----------------|----------------|
-| 1.106                          | 1.20           | 1.28           |
+| 1.107                          | 1.20           | 1.28           |
 
 ## Installation
 

cost-analyzer/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.107.0"
+appVersion: "1.107.1"
 description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to monitor
   cloud costs.
 name: cost-analyzer
-version: "1.107.0"
+version: "1.107.1"
 annotations:
   "artifacthub.io/links": |
     - name: Homepage

cost-analyzer/charts/prometheus/values.yaml

@@ -321,7 +321,7 @@ configmapReload:
     ##
     image:
       repository: quay.io/prometheus-operator/prometheus-config-reloader
-      tag: v0.68.0
+      tag: v0.69.1
       pullPolicy: IfNotPresent
 
     ## Additional configmap-reload container arguments
@@ -361,7 +361,7 @@ configmapReload:
     ##
     image:
       repository: quay.io/prometheus-operator/prometheus-config-reloader
-      tag: v0.68.0
+      tag: v0.69.1
       pullPolicy: IfNotPresent
 
     ## Additional configmap-reload container arguments
@@ -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.

cost-analyzer/charts/thanos/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: thanosio/thanos
-  tag: v0.29.0
+  tag: v0.32.5
   pullPolicy: IfNotPresent
 
 ## PriorityClassName
@@ -187,7 +187,7 @@ queryFrontend:
     validity: 10m
 
   downstreamTripper:
-    enabled: false 
+    enabled: false
     idleConnectionTimeout: 90s
     responseHeaderTimeout: 2m
     tlsHandshakeTimeout: 10s
@@ -198,7 +198,7 @@ queryFrontend:
 
   # Downstream Tripper Configuration Content
   # downstreamTripperConfig:
-    
+
   # Response cache configuration content
   # responseCacheConfig:
 
@@ -233,7 +233,7 @@ queryFrontend:
       # minAvailable and maxUnavailable can't be used simultaneous. Choose one.
     minAvailable: 1
     #  maxUnavailable: 50%
-  
+
   serviceAccount: ""
 
   # The http endpoint to communicate with other components
@@ -327,7 +327,7 @@ queryFrontend:
   # Pod affinity
   # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity
   affinity: {}
-      
+
 query:
   enabled: true
   # Label to treat as a replica indicator along which data is deduplicated.
@@ -355,9 +355,9 @@ query:
   maxConcurrent: 16
   # Maximum number of select requests made concurrently per a query.
   maxConcurrentSelect: 4
-  # Enable automatic adjustment (step / 5) to what source of data should be used in store gateways 
+  # Enable automatic adjustment (step / 5) to what source of data should be used in store gateways
   # if no max_source_resolution param is specified.
-  autoDownsampling: false                                        
+  autoDownsampling: false
   # https://github.com/improbable-eng/thanos/issues/1015
   storeDNSResolver: miekgdns
   # Enable DNS discovery for stores

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 }}

cost-analyzer/values-agent.yaml

@@ -88,7 +88,7 @@ prometheus:
     enableAdminApi: true
     sidecarContainers:
     - name: thanos-sidecar
-      image: thanosio/thanos:v0.29.0
+      image: thanosio/thanos:v0.32.5
       securityContext:
         runAsNonRoot: true
         runAsUser: 1001

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.69.1
         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:

cost-analyzer/values-thanos.yaml

@@ -28,7 +28,7 @@ prometheus:
     enableAdminApi: true
     sidecarContainers:
     - name: thanos-sidecar
-      image: thanosio/thanos:v0.29.0
+      image: thanosio/thanos:v0.32.5
       securityContext:
         allowPrivilegeEscalation: false
         readOnlyRootFilesystem: true

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: