From 93ffdce73346b5f0cd2a5f43d96683b6cd230a1c Mon Sep 17 00:00:00 2001 From: Chip Zoller Date: Tue, 17 Oct 2023 08:08:30 -0400 Subject: [PATCH 01/28] Minor script improvement (#2647) * print encoded CA if no values Signed-off-by: Chip Zoller * Update cost-analyzer/scripts/create-admission-controller-tls.sh Co-authored-by: Thomas Nguyen --------- Signed-off-by: Chip Zoller Co-authored-by: Thomas Nguyen --- cost-analyzer/scripts/create-admission-controller-tls.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cost-analyzer/scripts/create-admission-controller-tls.sh b/cost-analyzer/scripts/create-admission-controller-tls.sh index 7a8fa5bdc..2290cadd1 100755 --- a/cost-analyzer/scripts/create-admission-controller-tls.sh +++ b/cost-analyzer/scripts/create-admission-controller-tls.sh @@ -19,6 +19,11 @@ kubectl create secret tls webhook-server-tls \ --cert "certs/tls.crt" \ --key "certs/tls.key" -n "${namespace}" -echo -e "\nUpdating values.yaml ..." ENCODED_CA=$(base64 < certs/tls.crt | tr -d '\n') -sed -i '' 's@${CA_BUNDLE}@'"${ENCODED_CA}"'@g' ../values.yaml \ No newline at end of file + +if [ -f "../values.yaml" ]; then + echo -e "\nUpdating values.yaml ..." + sed -i '' 's@${CA_BUNDLE}@'"${ENCODED_CA}"'@g' ../values.yaml +else + echo -e "\nThe CA bundle to use in your values file is: \n${ENCODED_CA}" +fi \ No newline at end of file From c14d75222db8a01f8278283f6638a14166e25951 Mon Sep 17 00:00:00 2001 From: Alex Meijer Date: Tue, 17 Oct 2023 10:27:03 -0400 Subject: [PATCH 02/28] provide embedded jaeger all in one for tracing Signed-off-by: Alex Meijer --- cost-analyzer/templates/aggregator-statefulset.yaml | 11 ++++++++++- cost-analyzer/values.yaml | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/cost-analyzer/templates/aggregator-statefulset.yaml b/cost-analyzer/templates/aggregator-statefulset.yaml index c172fed99..29d0fb6dc 100644 --- a/cost-analyzer/templates/aggregator-statefulset.yaml +++ b/cost-analyzer/templates/aggregator-statefulset.yaml @@ -69,6 +69,12 @@ spec: {{- end }} containers: + {{- if .Values.kubecostAggregator.jaeger.enabled }} + - name: embedded-jaeger + securityContext: + {{- toYaml .Values.kubecostAggregator.jaeger.containerSecurityContext | nindent 12 }} + image: {{ .Values.kubecostAggregator.jaeger.image }}:{{ .Values.kubecostAggregator.jaeger.imageVersion }} + {{- end }} - name: aggregator {{- if .Values.kubecostAggregator.containerSecurityContext }} securityContext: @@ -127,7 +133,10 @@ spec: name: {{ .Values.prometheus.server.clusterIDConfigmap }} key: CLUSTER_ID {{- end }} - + {{- if .Values.kubecostAggregator.jaeger.enabled }} + - name: TRACING_URL + value: "http://localhost:14268/api/traces" + {{- end }} - name: CONFIG_PATH value: /var/configs/ - name: ETL_ENABLED diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index 76bce396a..1cf6ff688 100644 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -946,6 +946,11 @@ kubecostDeployment: # At present, this should only be enabled when recommended # by Kubecost staff. kubecostAggregator: + jaeger: + enabled: false + image: jaegertracing/all-in-one + imageVersion: latest + # containerSecurityContext: # fullImageName: cloudCost: enabled: false From 70febcf914a5b6791c50f486d6c164ed626d5f5d Mon Sep 17 00:00:00 2001 From: Jesse Goodier <31039225+jessegoodier@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:26:23 -0400 Subject: [PATCH 03/28] option to hide diagnostics (#2651) * option to hide diagnostics --- .../cost-analyzer-frontend-config-map-template.yaml | 11 ++++++++++- cost-analyzer/values.yaml | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml index 7b827c3b0..b2646b6cc 100755 --- a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml @@ -344,7 +344,7 @@ data: } # to get memory profile from query service need to prefix all request by queryservice/ - # for example if you want heap dump from query service end point should be + # for example if you want heap dump from query service end point should be # /model/queryservice/debug/pprof/heap to get queryservice heap dumps location ~ /model/queryservice/(.*)$ { proxy_connect_timeout 600; @@ -580,6 +580,15 @@ data: proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } {{- end }} + location = /model/hideDiagnostics { + default_type text/html; + {{- if .Values.kubecostFrontend.hideDiagnostics }} + return 200 'true'; + {{- else }} + return 200 'false'; + {{- end }} + } + {{- if .Values.kubecostAggregator.cloudCost.enabled }} location = /model/cloudCost/status { proxy_read_timeout 300; diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index 76bce396a..782774470 100644 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -358,6 +358,7 @@ kubecostFrontend: # proxy_buffers 4 512k; # proxy_buffer_size 256k; # large_client_header_buffers 4 64k; + # hideDiagnostics: false # used if the primary is not monitored. Supported in limited environments. # api: # fqdn: kubecost-api.kubecost.svc.cluster.local:9001 From 4c6f3cf900077b48036111c8f4031369701b4992 Mon Sep 17 00:00:00 2001 From: Niko Kovacevic Date: Tue, 17 Oct 2023 12:48:06 -0600 Subject: [PATCH 04/28] Enable Aggregator's /clusters/status endpoint --- .../cost-analyzer-frontend-config-map-template.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml index b2646b6cc..f9ede583f 100755 --- a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml @@ -489,6 +489,14 @@ data: proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } + location = /model/clusters/status { + proxy_read_timeout 300; + proxy_pass http://aggregator/clusters/status; + proxy_redirect off; + proxy_set_header Connection ""; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } location = /model/savings { proxy_read_timeout 300; proxy_pass http://aggregator/savings; From 2ba9dc2adaed093843c213279e3533aabde608fe Mon Sep 17 00:00:00 2001 From: Niko Kovacevic Date: Tue, 17 Oct 2023 16:57:11 -0600 Subject: [PATCH 05/28] Aggregator: support /model/unclaimedVolumes --- .../cost-analyzer-frontend-config-map-template.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml index f9ede583f..0d522ccdf 100755 --- a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml @@ -521,6 +521,14 @@ data: proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } + location = /model/savings/unclaimedVolumes { + proxy_read_timeout 300; + proxy_pass http://aggregator/savings/unclaimedVolumes; + proxy_redirect off; + proxy_set_header Connection ""; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } location = /model/reports/allocation { proxy_read_timeout 300; proxy_pass http://aggregator/reports/allocation; From 5237edc91d9d51bf374ce1bfac373deb77f800c4 Mon Sep 17 00:00:00 2001 From: Alex Meijer Date: Wed, 18 Oct 2023 10:50:17 -0400 Subject: [PATCH 06/28] the aggregator should just use the cost analyzer's SA unless a specific override is provided Signed-off-by: Alex Meijer --- cost-analyzer/templates/_helpers.tpl | 6 +- .../templates/aggregator-clusterrole.yaml | 81 ------------------- .../aggregator-clusterrolebinding.yaml | 18 ----- .../templates/aggregator-service-account.yaml | 18 ----- cost-analyzer/values.yaml | 4 + 5 files changed, 7 insertions(+), 120 deletions(-) delete mode 100644 cost-analyzer/templates/aggregator-clusterrole.yaml delete mode 100644 cost-analyzer/templates/aggregator-clusterrolebinding.yaml delete mode 100644 cost-analyzer/templates/aggregator-service-account.yaml diff --git a/cost-analyzer/templates/_helpers.tpl b/cost-analyzer/templates/_helpers.tpl index 0b0f8337c..e2227c856 100755 --- a/cost-analyzer/templates/_helpers.tpl +++ b/cost-analyzer/templates/_helpers.tpl @@ -127,10 +127,10 @@ Create the name of the service account {{- end -}} {{- end -}} {{- define "aggregator.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "aggregator.fullname" .) .Values.serviceAccount.name }} +{{- if .Values.kubecostAggregator.serviceAccountName -}} + {{ .Values.kubecostAggregator.serviceAccountName }} {{- else -}} - {{ default "default" .Values.serviceAccount.name }} + {{ template "cost-analyzer.serviceAccountName" . }} {{- end -}} {{- end -}} {{- define "cloudCost.serviceAccountName" -}} diff --git a/cost-analyzer/templates/aggregator-clusterrole.yaml b/cost-analyzer/templates/aggregator-clusterrole.yaml deleted file mode 100644 index 4355b73b3..000000000 --- a/cost-analyzer/templates/aggregator-clusterrole.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and (not .Values.agent) (not .Values.cloudAgent) (.Values.kubecostAggregator) }} -{{- if .Values.kubecostAggregator.enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ template "aggregator.serviceAccountName" . }} - labels: - {{ include "aggregator.commonLabels" . | nindent 4 }} -rules: - - apiGroups: - - '' - resources: - - configmaps - - nodes - - pods - - events - - services - - resourcequotas - - replicationcontrollers - - limitranges - - persistentvolumeclaims - - persistentvolumes - - namespaces - - endpoints - verbs: - - get - - list - - watch - - apiGroups: - - apps - resources: - - statefulsets - - deployments - - daemonsets - - replicasets - verbs: - - list - - watch - - apiGroups: - - batch - resources: - - cronjobs - - jobs - verbs: - - get - - list - - watch - - apiGroups: - - autoscaling - resources: - - horizontalpodautoscalers - verbs: - - get - - list - - watch - - apiGroups: - - policy - resources: - - poddisruptionbudgets - verbs: - - get - - list - - watch - - apiGroups: - - storage.k8s.io - resources: - - storageclasses - verbs: - - get - - list - - watch - - apiGroups: - - events.k8s.io - resources: - - events - verbs: - - get - - list - - watch -{{- end }} -{{- end }} diff --git a/cost-analyzer/templates/aggregator-clusterrolebinding.yaml b/cost-analyzer/templates/aggregator-clusterrolebinding.yaml deleted file mode 100644 index 7feeb81fa..000000000 --- a/cost-analyzer/templates/aggregator-clusterrolebinding.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and (not .Values.agent) (not .Values.cloudAgent) (.Values.kubecostAggregator) }} -{{- if .Values.kubecostAggregator.enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ template "aggregator.serviceAccountName" . }} - labels: - {{ include "aggregator.commonLabels" . | nindent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ template "aggregator.serviceAccountName" . }} -subjects: - - kind: ServiceAccount - name: {{ template "aggregator.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} -{{- end }} -{{- end }} diff --git a/cost-analyzer/templates/aggregator-service-account.yaml b/cost-analyzer/templates/aggregator-service-account.yaml deleted file mode 100644 index a7f12c8ee..000000000 --- a/cost-analyzer/templates/aggregator-service-account.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and (not .Values.agent) (not .Values.cloudAgent) (.Values.kubecostAggregator) }} -{{- if .Values.kubecostAggregator.enabled }} - -{{- if .Values.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ template "aggregator.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} - labels: - {{ include "aggregator.commonLabels" . | nindent 4 }} -{{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -{{- end }} -{{- end }} -{{- end }} diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index 6c729f502..dd0cce62d 100644 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -947,6 +947,10 @@ kubecostDeployment: # At present, this should only be enabled when recommended # by Kubecost staff. kubecostAggregator: + # by default, the aggregator uses the same service account as the cost analyzer + # if a custom service account is desired for the aggregator only, provide the name + # of a pre-existing service account for the Kubecost Aggregator to use here + #serviceAccountName: jaeger: enabled: false image: jaegertracing/all-in-one From 5769e848faaba78ef64f2df999ec8e56adc3a0cb Mon Sep 17 00:00:00 2001 From: Jesse Goodier <31039225+jessegoodier@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:23:44 -0400 Subject: [PATCH 07/28] 1.106.3 update (#2661) --- cost-analyzer/Chart.yaml | 4 +- kubecost.yaml | 738 +++++++++++---------------------------- 2 files changed, 215 insertions(+), 527 deletions(-) diff --git a/cost-analyzer/Chart.yaml b/cost-analyzer/Chart.yaml index 8a0d38561..7bf488a2d 100755 --- a/cost-analyzer/Chart.yaml +++ b/cost-analyzer/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: "1.106.0" +appVersion: "1.106.3" description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to monitor cloud costs. name: cost-analyzer -version: "1.106.0" +version: "1.106.3" annotations: "artifacthub.io/links": | - name: Homepage diff --git a/kubecost.yaml b/kubecost.yaml index d64075cb2..3447802b3 100644 --- a/kubecost.yaml +++ b/kubecost.yaml @@ -19,20 +19,6 @@ metadata: name: kubecost-grafana namespace: kubecost --- -# Source: cost-analyzer/charts/prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - labels: - app.kubernetes.io/name: kube-state-metrics - helm.sh/chart: kube-state-metrics-2.7.2 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/instance: kubecost - name: kubecost-kube-state-metrics - namespace: kubecost -imagePullSecrets: - [] ---- # Source: cost-analyzer/charts/prometheus/templates/node-exporter-serviceaccount.yaml apiVersion: v1 kind: ServiceAccount @@ -66,9 +52,9 @@ metadata: name: kubecost-cost-analyzer namespace: kubecost labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -296,84 +282,6 @@ data: source_labels: - __meta_kubernetes_pod_node_name target_label: kubernetes_node - - job_name: kubernetes-service-endpoints-slow - kubernetes_sd_configs: - - role: endpoints - relabel_configs: - - action: keep - regex: true - source_labels: - - __meta_kubernetes_service_annotation_prometheus_io_scrape_slow - - action: replace - regex: (https?) - source_labels: - - __meta_kubernetes_service_annotation_prometheus_io_scheme - target_label: __scheme__ - - action: replace - regex: (.+) - source_labels: - - __meta_kubernetes_service_annotation_prometheus_io_path - target_label: __metrics_path__ - - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 - source_labels: - - __address__ - - __meta_kubernetes_service_annotation_prometheus_io_port - target_label: __address__ - - action: labelmap - regex: __meta_kubernetes_service_label_(.+) - - action: replace - source_labels: - - __meta_kubernetes_namespace - target_label: kubernetes_namespace - - action: replace - source_labels: - - __meta_kubernetes_service_name - target_label: kubernetes_name - - action: replace - source_labels: - - __meta_kubernetes_pod_node_name - target_label: kubernetes_node - scrape_interval: 5m - scrape_timeout: 30s - - honor_labels: true - job_name: prometheus-pushgateway - kubernetes_sd_configs: - - role: service - relabel_configs: - - action: keep - regex: pushgateway - source_labels: - - __meta_kubernetes_service_annotation_prometheus_io_probe - - job_name: kubernetes-services - kubernetes_sd_configs: - - role: service - metrics_path: /probe - params: - module: - - http_2xx - relabel_configs: - - action: keep - regex: true - source_labels: - - __meta_kubernetes_service_annotation_prometheus_io_probe - - source_labels: - - __address__ - target_label: __param_target - - replacement: blackbox - target_label: __address__ - - source_labels: - - __param_target - target_label: instance - - action: labelmap - regex: __meta_kubernetes_service_label_(.+) - - source_labels: - - __meta_kubernetes_namespace - target_label: kubernetes_namespace - - source_labels: - - __meta_kubernetes_service_name - target_label: kubernetes_name - job_name: kubecost honor_labels: true scrape_interval: 1m @@ -393,7 +301,7 @@ data: - source_labels: [__meta_kubernetes_pod_label_app] action: keep regex: kubecost-network-costs - + recording_rules.yml: | {} rules: | @@ -442,9 +350,9 @@ metadata: name: kubecost-cost-analyzer namespace: kubecost labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -460,9 +368,9 @@ metadata: name: nginx-conf namespace: kubecost labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -514,7 +422,6 @@ data: upstream grafana { server kubecost-grafana.kubecost; } - server { server_name _; root /var/www; @@ -531,7 +438,7 @@ data: location / { try_files $uri $uri/ /index.html; } - add_header ETag "1.106.0"; + add_header ETag "1.106.3"; listen 9090; listen [::]:9090; location /api/ { @@ -615,7 +522,13 @@ data: proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; } - + + + # Query Service Replicas (QSR) proxy + location = /model/hideDiagnostics { + default_type text/html; + return 200 'false'; + } } --- # Source: cost-analyzer/templates/grafana-attached-disk-metrics-template.yaml @@ -624,9 +537,9 @@ kind: ConfigMap metadata: name: attached-disk-metrics-dashboard labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -749,7 +662,7 @@ data: "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(container_fs_limit_bytes{instance=~'$disk', device!=\"tmpfs\", id=\"/\", cluster_id=~'$cluster'}) by (cluster_id, instance)", + "expr": "max(container_fs_limit_bytes{instance=~'$disk', device!=\"tmpfs\", id=\"/\", cluster_id=~'$cluster'}) by (cluster_id, instance)", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -846,7 +759,7 @@ data: "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(container_fs_usage_bytes{instance=~'$disk',id=\"/\", cluster_id=~'$cluster'}) by (cluster_id, instance) / sum(container_fs_limit_bytes{instance=~'$disk',device!=\"tmpfs\", id=\"/\", cluster_id=~'$cluster'}) by (cluster_id,instance)", + "expr": "sum(container_fs_usage_bytes{instance=~'$disk',id=\"/\", cluster_id=~'$cluster'}) by (cluster_id, instance) / max(container_fs_limit_bytes{instance=~'$disk',device!=\"tmpfs\", id=\"/\", cluster_id=~'$cluster'}) by (cluster_id,instance)", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -1176,9 +1089,9 @@ kind: ConfigMap metadata: name: cluster-metrics-dashboard labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -2876,9 +2789,9 @@ kind: ConfigMap metadata: name: cluster-utilization-dashboard labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -3502,7 +3415,7 @@ data: "pluginVersion": "8.3.2", "targets": [ { - "expr": "SUM(container_memory_usage_bytes{namespace!=\"\"}) / SUM(kube_node_status_allocatable{resource=\"memory\", unit=\"byte\"}) * 100", + "expr": "SUM(container_memory_working_set_bytes{name!=\"POD\", container!=\"\", namespace!=\"\"}) / SUM(kube_node_status_allocatable{resource=\"memory\", unit=\"byte\"}) * 100", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -6090,9 +6003,9 @@ kind: ConfigMap metadata: name: deployment-utilization-dashboard labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -7494,9 +7407,9 @@ kind: ConfigMap metadata: name: grafana-dashboard-kubernetes-resource-efficiency labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -7920,9 +7833,9 @@ kind: ConfigMap metadata: name: label-cost-dashboard labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -9083,9 +8996,9 @@ kind: ConfigMap metadata: name: namespace-utilization-dashboard labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -9115,7 +9028,7 @@ data: "id":9, "iteration":1553150922105, "links":[ - + ], "panels":[ { @@ -9136,7 +9049,7 @@ data: "hideTimeOverride":true, "id":73, "links":[ - + ], "pageSize":8, "repeat":null, @@ -9181,7 +9094,7 @@ data: "decimals":2, "pattern":"Value #B", "thresholds":[ - + ], "type":"number", "unit":"decbytes" @@ -9199,7 +9112,7 @@ data: "mappingType":1, "pattern":"Value #A", "thresholds":[ - + ], "type":"number", "unit":"percent" @@ -9217,7 +9130,7 @@ data: "mappingType":1, "pattern":"Time", "thresholds":[ - + ], "type":"hidden", "unit":"short" @@ -9235,7 +9148,7 @@ data: "mappingType":1, "pattern":"Value #C", "thresholds":[ - + ], "type":"number", "unit":"currencyUSD" @@ -9253,7 +9166,7 @@ data: "mappingType":1, "pattern":"Value #D", "thresholds":[ - + ], "type":"number", "unit":"currencyUSD" @@ -9343,7 +9256,7 @@ data: "hideTimeOverride":true, "id":90, "links":[ - + ], "pageSize":8, "repeatDirection":"v", @@ -9367,7 +9280,7 @@ data: "mappingType":1, "pattern":"namespace", "thresholds":[ - + ], "type":"hidden", "unit":"short" @@ -9385,7 +9298,7 @@ data: "mappingType":1, "pattern":"persistentvolumeclaim", "thresholds":[ - + ], "type":"number", "unit":"short" @@ -9403,7 +9316,7 @@ data: "mappingType":1, "pattern":"storageclass", "thresholds":[ - + ], "type":"number", "unit":"short" @@ -9421,7 +9334,7 @@ data: "mappingType":1, "pattern":"Value", "thresholds":[ - + ], "type":"number", "unit":"gbytes" @@ -9439,7 +9352,7 @@ data: "mappingType":1, "pattern":"Time", "thresholds":[ - + ], "type":"hidden", "unit":"short" @@ -9466,7 +9379,7 @@ data: }, { "aliasColors":{ - + }, "bars":false, "dashLength":10, @@ -9493,7 +9406,7 @@ data: "lines":true, "linewidth":1, "links":[ - + ], "nullPointMode":"null", "percentage":false, @@ -9501,7 +9414,7 @@ data: "points":false, "renderer":"flot", "seriesOverrides":[ - + ], "spaceLength":10, "stack":false, @@ -9515,7 +9428,7 @@ data: } ], "thresholds":[ - + ], "timeFrom":null, "timeShift":null, @@ -9532,7 +9445,7 @@ data: "name":null, "show":true, "values":[ - + ] }, "yaxes":[ @@ -9560,7 +9473,7 @@ data: }, { "aliasColors":{ - + }, "bars":false, "dashLength":10, @@ -9572,7 +9485,7 @@ data: "error":false, "fill":0, "grid":{ - + }, "gridPos":{ "h":6, @@ -9602,7 +9515,7 @@ data: "lines":true, "linewidth":2, "links":[ - + ], "nullPointMode":"connected", "percentage":false, @@ -9610,7 +9523,7 @@ data: "points":false, "renderer":"flot", "seriesOverrides":[ - + ], "spaceLength":10, "stack":false, @@ -9630,7 +9543,7 @@ data: } ], "thresholds":[ - + ], "timeFrom":"", "timeShift":null, @@ -9648,7 +9561,7 @@ data: "name":null, "show":true, "values":[ - + ] }, "yaxes":[ @@ -9677,7 +9590,7 @@ data: }, { "aliasColors":{ - + }, "bars":false, "dashLength":10, @@ -9689,7 +9602,7 @@ data: "error":false, "fill":0, "grid":{ - + }, "gridPos":{ "h":6, @@ -9716,7 +9629,7 @@ data: "lines":true, "linewidth":2, "links":[ - + ], "nullPointMode":"connected", "percentage":false, @@ -9724,7 +9637,7 @@ data: "points":false, "renderer":"flot", "seriesOverrides":[ - + ], "spaceLength":10, "stack":false, @@ -9740,7 +9653,7 @@ data: } ], "thresholds":[ - + ], "timeFrom":"", "timeShift":null, @@ -9758,7 +9671,7 @@ data: "name":null, "show":true, "values":[ - + ] }, "yaxes":[ @@ -9787,7 +9700,7 @@ data: }, { "aliasColors":{ - + }, "bars":false, "dashLength":10, @@ -9799,7 +9712,7 @@ data: "error":false, "fill":1, "grid":{ - + }, "gridPos":{ "h":6, @@ -9829,7 +9742,7 @@ data: "lines":true, "linewidth":2, "links":[ - + ], "nullPointMode":"connected", "percentage":false, @@ -9837,7 +9750,7 @@ data: "points":false, "renderer":"flot", "seriesOverrides":[ - + ], "spaceLength":10, "stack":false, @@ -9867,7 +9780,7 @@ data: } ], "thresholds":[ - + ], "timeFrom":"", "timeShift":null, @@ -9885,7 +9798,7 @@ data: "name":null, "show":true, "values":[ - + ] }, "yaxes":[ @@ -9913,7 +9826,7 @@ data: }, { "aliasColors":{ - + }, "bars":false, "dashLength":10, @@ -9925,7 +9838,7 @@ data: "error":false, "fill":1, "grid":{ - + }, "gridPos":{ "h":6, @@ -9955,7 +9868,7 @@ data: "lines":true, "linewidth":2, "links":[ - + ], "nullPointMode":"connected", "percentage":false, @@ -9963,7 +9876,7 @@ data: "points":false, "renderer":"flot", "seriesOverrides":[ - + ], "spaceLength":10, "stack":false, @@ -9993,7 +9906,7 @@ data: } ], "thresholds":[ - + ], "timeFrom":"", "timeShift":null, @@ -10011,7 +9924,7 @@ data: "name":null, "show":true, "values":[ - + ] }, "yaxes":[ @@ -10187,7 +10100,7 @@ data: "multi":false, "name":"namespace", "options":[ - + ], "query":"query_result(sum(kube_namespace_created{namespace!=\"\"}) by (namespace))", "refresh":1, @@ -10196,7 +10109,7 @@ data: "sort":0, "tagValuesQuery":"", "tags":[ - + ], "tagsQuery":"", "type":"query", @@ -10205,7 +10118,7 @@ data: { "datasource":"${datasource}", "filters":[ - + ], "hide":0, "label":"", @@ -10276,9 +10189,9 @@ kind: ConfigMap metadata: name: node-utilization-dashboard labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -10307,7 +10220,7 @@ data: "id":6, "iteration":1557245882378, "links":[ - + ], "panels":[ { @@ -10337,7 +10250,7 @@ data: "id":2, "interval":null, "links":[ - + ], "mappingType":1, "mappingTypes":[ @@ -10419,7 +10332,7 @@ data: "id":3, "interval":null, "links":[ - + ], "mappingType":1, "mappingTypes":[ @@ -10501,7 +10414,7 @@ data: "id":4, "interval":null, "links":[ - + ], "mappingType":1, "mappingTypes":[ @@ -10574,7 +10487,7 @@ data: "hideTimeOverride":true, "id":21, "links":[ - + ], "pageSize":8, "repeat":null, @@ -10620,7 +10533,7 @@ data: "mappingType":1, "pattern":"Time", "thresholds":[ - + ], "type":"hidden", "unit":"short" @@ -10638,7 +10551,7 @@ data: "mappingType":1, "pattern":"Value #C", "thresholds":[ - + ], "type":"number", "unit":"short" @@ -10656,7 +10569,7 @@ data: "mappingType":1, "pattern":"Value #A", "thresholds":[ - + ], "type":"number", "unit":"short" @@ -10674,7 +10587,7 @@ data: "mappingType":1, "pattern":"Value #B", "thresholds":[ - + ], "type":"number", "unit":"short" @@ -10692,7 +10605,7 @@ data: "mappingType":1, "pattern":"Value #D", "thresholds":[ - + ], "type":"number", "unit":"bytes" @@ -10710,7 +10623,7 @@ data: "mappingType":1, "pattern":"Value #E", "thresholds":[ - + ], "type":"number", "unit":"bytes" @@ -10728,7 +10641,7 @@ data: "mappingType":1, "pattern":"Value #F", "thresholds":[ - + ], "type":"number", "unit":"bytes" @@ -10799,7 +10712,7 @@ data: "id":8, "interval":null, "links":[ - + ], "mappingType":1, "mappingTypes":[ @@ -10882,7 +10795,7 @@ data: "id":18, "interval":null, "links":[ - + ], "mappingType":1, "mappingTypes":[ @@ -10964,7 +10877,7 @@ data: "id":9, "interval":null, "links":[ - + ], "mappingType":1, "mappingTypes":[ @@ -11046,7 +10959,7 @@ data: "id":19, "interval":null, "links":[ - + ], "mappingType":1, "mappingTypes":[ @@ -11103,7 +11016,7 @@ data: }, { "aliasColors":{ - + }, "bars":false, "dashLength":10, @@ -11115,7 +11028,7 @@ data: "error":false, "fill":0, "grid":{ - + }, "gridPos":{ "h":6, @@ -11145,7 +11058,7 @@ data: "lines":true, "linewidth":2, "links":[ - + ], "nullPointMode":"connected", "percentage":false, @@ -11153,7 +11066,7 @@ data: "points":false, "renderer":"flot", "seriesOverrides":[ - + ], "spaceLength":10, "stack":false, @@ -11173,7 +11086,7 @@ data: } ], "thresholds":[ - + ], "timeFrom":"", "timeShift":null, @@ -11191,7 +11104,7 @@ data: "name":null, "show":true, "values":[ - + ] }, "yaxes":[ @@ -11220,7 +11133,7 @@ data: }, { "aliasColors":{ - + }, "bars":false, "dashLength":10, @@ -11232,7 +11145,7 @@ data: "error":false, "fill":0, "grid":{ - + }, "gridPos":{ "h":6, @@ -11259,7 +11172,7 @@ data: "lines":true, "linewidth":2, "links":[ - + ], "nullPointMode":"connected", "percentage":false, @@ -11267,7 +11180,7 @@ data: "points":false, "renderer":"flot", "seriesOverrides":[ - + ], "spaceLength":10, "stack":false, @@ -11286,7 +11199,7 @@ data: } ], "thresholds":[ - + ], "timeFrom":"", "timeShift":null, @@ -11304,7 +11217,7 @@ data: "name":null, "show":true, "values":[ - + ] }, "yaxes":[ @@ -11333,7 +11246,7 @@ data: }, { "aliasColors":{ - + }, "bars":false, "dashLength":10, @@ -11345,7 +11258,7 @@ data: "error":false, "fill":1, "grid":{ - + }, "gridPos":{ "h":6, @@ -11375,7 +11288,7 @@ data: "lines":true, "linewidth":2, "links":[ - + ], "nullPointMode":"connected", "percentage":false, @@ -11383,7 +11296,7 @@ data: "points":false, "renderer":"flot", "seriesOverrides":[ - + ], "spaceLength":10, "stack":false, @@ -11413,7 +11326,7 @@ data: } ], "thresholds":[ - + ], "timeFrom":"", "timeShift":null, @@ -11431,7 +11344,7 @@ data: "name":null, "show":true, "values":[ - + ] }, "yaxes":[ @@ -11459,7 +11372,7 @@ data: }, { "aliasColors":{ - + }, "bars":false, "dashLength":10, @@ -11471,7 +11384,7 @@ data: "error":false, "fill":1, "grid":{ - + }, "gridPos":{ "h":6, @@ -11501,7 +11414,7 @@ data: "lines":true, "linewidth":2, "links":[ - + ], "nullPointMode":"connected", "percentage":false, @@ -11509,7 +11422,7 @@ data: "points":false, "renderer":"flot", "seriesOverrides":[ - + ], "spaceLength":10, "stack":false, @@ -11539,7 +11452,7 @@ data: } ], "thresholds":[ - + ], "timeFrom":"", "timeShift":null, @@ -11557,7 +11470,7 @@ data: "name":null, "show":true, "values":[ - + ] }, "yaxes":[ @@ -11606,7 +11519,7 @@ data: "multi":false, "name":"node", "options":[ - + ], "query":"query_result(kube_node_labels)", "refresh":1, @@ -11615,7 +11528,7 @@ data: "sort":0, "tagValuesQuery":"", "tags":[ - + ], "tagsQuery":"", "type":"query", @@ -11683,9 +11596,9 @@ kind: ConfigMap metadata: name: pod-utilization-dashboard labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -12458,9 +12371,9 @@ kind: ConfigMap metadata: name: prom-benchmark-dashboard labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -18165,9 +18078,9 @@ kind: ConfigMap metadata: name: grafana-dashboard-networkcosts-metrics labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -18822,9 +18735,9 @@ kind: ConfigMap metadata: name: grafana-dashboard-pod-utilization-multi-cluster labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -19637,9 +19550,9 @@ metadata: name: kubecost-cost-analyzer namespace: kubecost labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -19665,118 +19578,6 @@ rules: resources: ["configmaps"] verbs: ["get", "watch", "list"] --- -# Source: cost-analyzer/charts/prometheus/charts/kube-state-metrics/templates/clusterrole.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: - app.kubernetes.io/name: kube-state-metrics - helm.sh/chart: kube-state-metrics-2.7.2 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/instance: kubecost - name: kubecost-kube-state-metrics -rules: - -- apiGroups: [""] - resources: - - configmaps - verbs: ["list", "watch"] - -- apiGroups: ["batch"] - resources: - - cronjobs - verbs: ["list", "watch"] - -- apiGroups: ["extensions", "apps"] - resources: - - daemonsets - verbs: ["list", "watch"] - -- apiGroups: ["extensions", "apps"] - resources: - - deployments - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - endpoints - verbs: ["list", "watch"] - -- apiGroups: ["autoscaling"] - resources: - - horizontalpodautoscalers - verbs: ["list", "watch"] - -- apiGroups: ["batch"] - resources: - - jobs - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - limitranges - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - namespaces - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - nodes - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - persistentvolumeclaims - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - persistentvolumes - verbs: ["list", "watch"] - -- apiGroups: ["policy"] - resources: - - poddisruptionbudgets - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - pods - verbs: ["list", "watch"] - -- apiGroups: ["extensions", "apps"] - resources: - - replicasets - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - replicationcontrollers - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - resourcequotas - verbs: ["list", "watch"] - -- apiGroups: [""] - resources: - - services - verbs: ["list", "watch"] - -- apiGroups: ["apps"] - resources: - - statefulsets - verbs: ["list", "watch"] - -- apiGroups: ["storage.k8s.io"] - resources: - - storageclasses - verbs: ["list", "watch"] ---- # Source: cost-analyzer/charts/prometheus/templates/server-clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -19824,9 +19625,9 @@ kind: ClusterRole metadata: name: kubecost-cost-analyzer labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -19896,9 +19697,9 @@ rules: - get - list - watch - - apiGroups: + - apiGroups: - storage.k8s.io - resources: + resources: - storageclasses verbs: - get @@ -19932,25 +19733,6 @@ roleRef: name: kubecost-grafana-clusterrole apiGroup: rbac.authorization.k8s.io --- -# Source: cost-analyzer/charts/prometheus/charts/kube-state-metrics/templates/clusterrolebinding.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - labels: - app.kubernetes.io/name: kube-state-metrics - helm.sh/chart: kube-state-metrics-2.7.2 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/instance: kubecost - name: kubecost-kube-state-metrics -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kubecost-kube-state-metrics -subjects: -- kind: ServiceAccount - name: kubecost-kube-state-metrics - namespace: kubecost ---- # Source: cost-analyzer/charts/prometheus/templates/server-clusterrolebinding.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding @@ -19977,9 +19759,9 @@ kind: ClusterRoleBinding metadata: name: kubecost-cost-analyzer labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -20011,14 +19793,14 @@ metadata: namespace: kubecost name: kubecost-cost-analyzer labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer rules: -- apiGroups: +- apiGroups: - '' resources: - "pods/log" @@ -20053,9 +19835,9 @@ metadata: name: kubecost-cost-analyzer namespace: kubecost labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -20091,30 +19873,6 @@ spec: app: grafana release: kubecost --- -# Source: cost-analyzer/charts/prometheus/charts/kube-state-metrics/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: kubecost-kube-state-metrics - namespace: kubecost - labels: - app.kubernetes.io/name: kube-state-metrics - helm.sh/chart: "kube-state-metrics-2.7.2" - app.kubernetes.io/instance: "kubecost" - app.kubernetes.io/managed-by: "Helm" - annotations: - prometheus.io/scrape: 'true' -spec: - type: "ClusterIP" - ports: - - name: "http" - protocol: TCP - port: 8080 - targetPort: 8080 - selector: - app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: kubecost ---- # Source: cost-analyzer/charts/prometheus/templates/node-exporter-service.yaml apiVersion: v1 kind: Service @@ -20174,15 +19932,15 @@ metadata: name: kubecost-cost-analyzer namespace: kubecost labels: - + app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer spec: selector: - + app.kubernetes.io/name: cost-analyzer app.kubernetes.io/instance: kubecost app: cost-analyzer @@ -20284,12 +20042,23 @@ spec: spec: serviceAccountName: kubecost-grafana securityContext: - fsGroup: 472 - runAsUser: 472 + fsGroup: 65534 + runAsGroup: 65534 + runAsNonRoot: true + runAsUser: 65534 + seccompProfile: + type: RuntimeDefault containers: - name: grafana-sc-dashboard - image: "kiwigrid/k8s-sidecar:1.25.0" + image: "kiwigrid/k8s-sidecar:1.25.1" imagePullPolicy: IfNotPresent + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + privileged: false + readOnlyRootFilesystem: true env: - name: LABEL value: "grafana_dashboard" @@ -20305,6 +20074,13 @@ spec: - name: grafana image: "grafana/grafana:9.4.7" imagePullPolicy: IfNotPresent + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + privileged: false + readOnlyRootFilesystem: true volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" @@ -20322,7 +20098,7 @@ spec: subPath: provider.yaml - name: storage mountPath: "/var/lib/grafana" - subPath: + subPath: ports: - name: service containerPort: 80 @@ -20372,123 +20148,6 @@ spec: configMap: name: kubecost-grafana-config-dashboards --- -# Source: cost-analyzer/charts/prometheus/charts/kube-state-metrics/templates/deployment.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: kubecost-kube-state-metrics - namespace: kubecost - labels: - app.kubernetes.io/name: kube-state-metrics - helm.sh/chart: "kube-state-metrics-2.7.2" - app.kubernetes.io/instance: "kubecost" - app.kubernetes.io/managed-by: "Helm" -spec: - selector: - matchLabels: - app.kubernetes.io/name: kube-state-metrics - replicas: 1 - template: - metadata: - labels: - app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: "kubecost" - spec: - hostNetwork: false - serviceAccountName: kubecost-kube-state-metrics - securityContext: - fsGroup: 65534 - runAsUser: 65534 - containers: - - name: kube-state-metrics - args: - - - - --collectors=configmaps - - - - --collectors=cronjobs - - - - --collectors=daemonsets - - - - --collectors=deployments - - - - --collectors=endpoints - - - - --collectors=horizontalpodautoscalers - - - - - --collectors=jobs - - - - --collectors=limitranges - - - - - --collectors=namespaces - - - - - --collectors=nodes - - - - --collectors=persistentvolumeclaims - - - - --collectors=persistentvolumes - - - - --collectors=poddisruptionbudgets - - - - --collectors=pods - - - - --collectors=replicasets - - - - --collectors=replicationcontrollers - - - - --collectors=resourcequotas - - - - - --collectors=services - - - - --collectors=statefulsets - - - - --collectors=storageclasses - - - - - - - imagePullPolicy: IfNotPresent - image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v1.9.8" - ports: - - containerPort: 8080 - livenessProbe: - httpGet: - path: /healthz - port: 8080 - initialDelaySeconds: 5 - timeoutSeconds: 5 - readinessProbe: - httpGet: - path: / - port: 8080 - initialDelaySeconds: 5 - timeoutSeconds: 5 ---- # Source: cost-analyzer/charts/prometheus/templates/server-deployment.yaml apiVersion: apps/v1 kind: Deployment @@ -20522,13 +20181,20 @@ spec: serviceAccountName: kubecost-prometheus-server containers: - name: prometheus-server-configmap-reload - image: "jimmidyson/configmap-reload:v0.7.1" + image: "jimmidyson/configmap-reload:v0.9.0" imagePullPolicy: "IfNotPresent" args: - --volume-dir=/etc/config - --webhook-url=http://127.0.0.1:9090/-/reload resources: {} + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + privileged: false + readOnlyRootFilesystem: true volumeMounts: - name: config-volume mountPath: /etc/config @@ -20566,6 +20232,13 @@ spec: successThreshold: 1 resources: {} + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + privileged: false + readOnlyRootFilesystem: true volumeMounts: - name: config-volume mountPath: /etc/config @@ -20573,10 +20246,12 @@ spec: mountPath: /data subPath: "" securityContext: - fsGroup: 1001 - runAsGroup: 1001 + fsGroup: 65534 + runAsGroup: 65534 runAsNonRoot: true - runAsUser: 1001 + runAsUser: 65534 + seccompProfile: + type: RuntimeDefault terminationGracePeriodSeconds: 300 volumes: - name: config-volume @@ -20594,7 +20269,7 @@ metadata: namespace: kubecost labels: app.kubernetes.io/name: cost-analyzer - helm.sh/chart: cost-analyzer-1.106.0 + helm.sh/chart: cost-analyzer-1.106.3 app.kubernetes.io/instance: kubecost app.kubernetes.io/managed-by: Helm app: cost-analyzer @@ -20618,9 +20293,12 @@ spec: app: cost-analyzer spec: securityContext: - runAsUser: 1001 - runAsGroup: 1001 - fsGroup: 1001 + fsGroup: 65534 + runAsGroup: 65534 + runAsNonRoot: true + runAsUser: 65534 + seccompProfile: + type: RuntimeDefault restartPolicy: Always serviceAccountName: kubecost-cost-analyzer volumes: @@ -20637,9 +20315,16 @@ spec: claimName: kubecost-cost-analyzer initContainers: containers: - - image: gcr.io/kubecost1/cost-model:prod-1.106.0 - + - image: gcr.io/kubecost1/cost-model:prod-1.106.3 + name: cost-model + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + privileged: false + readOnlyRootFilesystem: true imagePullPolicy: Always ports: - name: tcp-model @@ -20672,8 +20357,6 @@ spec: env: - name: GRAFANA_ENABLED value: "true" - - name: HELM_VALUES - value: {"affinity":{},"awsstore":{"createServiceAccount":false,"priorityClassName":"","useAwsStore":false},"extraObjects":[],"extraVolumeMounts":[],"extraVolumes":[],"federatedETL":{"federatedCluster":false,"primaryCluster":false,"redirectS3Backup":false,"useExistingS3Config":false,"useMultiClusterDB":false},"global":{"additionalLabels":{},"containerSecuritycontext":{},"grafana":{"domainName":"cost-analyzer-grafana.default.svc","enabled":true,"proxy":true,"scheme":"http"},"notifications":{},"podAnnotations":{},"prometheus":{"enabled":true,"fqdn":"http://cost-analyzer-prometheus-server.default.svc"}},"grafana":{"adminPassword":"strongpassword","adminUser":"admin","affinity":{},"dashboardProviders":{},"dashboards":{},"dashboardsConfigMaps":{},"datasources":{},"deploymentStrategy":"RollingUpdate","downloadDashboardsImage":{"pullPolicy":"IfNotPresent","repository":"curlimages/curl","tag":"latest"},"env":{},"envFromSecret":"","extraSecretMounts":[],"global":{"additionalLabels":{},"containerSecuritycontext":{},"grafana":{"domainName":"cost-analyzer-grafana.default.svc","enabled":true,"proxy":true,"scheme":"http"},"notifications":{},"podAnnotations":{},"prometheus":{"enabled":true,"fqdn":"http://cost-analyzer-prometheus-server.default.svc"}},"grafana.ini":{"analytics":{"check_for_updates":true},"auth.anonymous":{"enabled":true,"org_name":"Main Org.","org_role":"Editor"},"grafana_net":{"url":"https://grafana.net"},"log":{"mode":"console"},"paths":{"data":"/var/lib/grafana/data","logs":"/var/log/grafana","plugins":"/var/lib/grafana/plugins","provisioning":"/etc/grafana/provisioning"},"server":{"root_url":"%(protocol)s://%(domain)s:%(http_port)s/grafana","serve_from_sub_path":true}},"image":{"pullPolicy":"IfNotPresent","repository":"grafana/grafana","tag":"9.4.7"},"ldap":{"config":"","existingSecret":""},"livenessProbe":{"failureThreshold":10,"httpGet":{"path":"/api/health","port":3000},"initialDelaySeconds":60,"timeoutSeconds":30},"nodeSelector":{},"plugins":[],"priorityClassName":"","rbac":{"create":true,"pspEnabled":false,"pspUseAppArmor":true},"readinessProbe":{"httpGet":{"path":"/api/health","port":3000}},"replicas":1,"resources":{},"securityContext":{"fsGroup":472,"runAsUser":472},"service":{"annotations":{},"labels":{},"port":80,"type":"ClusterIP"},"serviceAccount":{"create":true},"sidecar":{"dashboards":{"annotations":{},"enabled":true,"error_throttle_sleep":0,"folder":"/tmp/dashboards","label":"grafana_dashboard"},"image":{"pullPolicy":"IfNotPresent","repository":"kiwigrid/k8s-sidecar","tag":"1.25.0"},"resources":null},"smtp":{"existingSecret":""},"tolerations":[]},"initChownData":{"resources":{}},"initChownDataImage":"busybox","kubecostDeployment":{"annotations":{},"labels":{},"queryService":{"configVolumeSize":"1Gi","databaseVolumeSize":"100Gi","resources":{"requests":{"cpu":"1000m","memory":"500Mi"}},"storageClass":""},"queryServiceReplicas":0,"replicas":1},"kubecostFrontend":{"image":"gcr.io/kubecost1/frontend","imagePullPolicy":"Always","ipv6":{"enabled":true},"livenessProbe":{"enabled":true,"failureThreshold":200,"initialDelaySeconds":30,"periodSeconds":10},"resources":{"requests":{"cpu":"10m","memory":"55Mi"}}},"kubecostMetrics":{},"kubecostModel":{"allocation":null,"cloudCost":{"enabled":true,"labelList":{"IsIncludeList":false,"labels":""},"topNItems":1000},"etl":true,"etlDailyStoreDurationDays":91,"etlFileStoreEnabled":true,"etlHourlyStoreDurationHours":49,"etlReadOnlyMode":false,"etlWeeklyStoreDurationWeeks":53,"extraArgs":[],"image":"gcr.io/kubecost1/cost-model","imagePullPolicy":"Always","maxQueryConcurrency":5,"outOfClusterPromMetricsEnabled":false,"resources":{"requests":{"cpu":"200m","memory":"55Mi"}},"warmCache":false,"warmSavingsCache":true},"kubecostToken":null,"nodeSelector":{},"persistentVolume":{"annotations":{},"dbSize":"32.0Gi","enabled":true,"labels":{},"size":"32Gi"},"prometheus":{"alertRelabelConfigs":null,"alertmanagerFiles":{"alertmanager.yml":{"global":{},"receivers":[{"name":"default-receiver"}],"route":{"group_interval":"5m","group_wait":"10s","receiver":"default-receiver","repeat_interval":"3h"}}},"configmapReload":{"alertmanager":{"enabled":true,"extraArgs":{},"extraConfigmapMounts":[],"extraVolumeDirs":[],"image":{"pullPolicy":"IfNotPresent","repository":"jimmidyson/configmap-reload","tag":"v0.7.1"},"name":"configmap-reload","resources":{}},"prometheus":{"containerSecurityContext":{},"enabled":true,"extraArgs":{},"extraConfigmapMounts":[],"extraVolumeDirs":[],"image":{"pullPolicy":"IfNotPresent","repository":"jimmidyson/configmap-reload","tag":"v0.7.1"},"name":"configmap-reload","resources":{}}},"extraScrapeConfigs":"- job_name: kubecost\n  honor_labels: true\n  scrape_interval: 1m\n  scrape_timeout: 60s\n  metrics_path: /metrics\n  scheme: http\n  dns_sd_configs:\n  - names:\n    - {{ template \"cost-analyzer.serviceName\" . }}\n    type: 'A'\n    port: 9003\n- job_name: kubecost-networking\n  kubernetes_sd_configs:\n    - role: pod\n  relabel_configs:\n  # Scrape only the the targets matching the following metadata\n    - source_labels: [__meta_kubernetes_pod_label_app]\n      action: keep\n      regex:  {{ template \"cost-analyzer.networkCostsName\" . }}\n","global":{"additionalLabels":{},"containerSecuritycontext":{},"grafana":{"domainName":"cost-analyzer-grafana.default.svc","enabled":true,"proxy":true,"scheme":"http"},"notifications":{},"podAnnotations":{},"prometheus":{"enabled":true,"fqdn":"http://cost-analyzer-prometheus-server.default.svc"}},"imagePullSecrets":null,"kube-state-metrics":{"affinity":{},"collectors":{"certificatesigningrequests":false,"configmaps":true,"cronjobs":true,"daemonsets":true,"deployments":true,"endpoints":true,"horizontalpodautoscalers":true,"ingresses":false,"jobs":true,"limitranges":true,"mutatingwebhookconfigurations":false,"namespaces":true,"networkpolicies":false,"nodes":true,"persistentvolumeclaims":true,"persistentvolumes":true,"poddisruptionbudgets":true,"pods":true,"replicasets":true,"replicationcontrollers":true,"resourcequotas":true,"secrets":false,"services":true,"statefulsets":true,"storageclasses":true,"validatingwebhookconfigurations":false,"verticalpodautoscalers":false,"volumeattachments":false},"customLabels":{},"disabled":false,"enabled":true,"global":{"additionalLabels":{},"containerSecuritycontext":{},"grafana":{"domainName":"cost-analyzer-grafana.default.svc","enabled":true,"proxy":true,"scheme":"http"},"notifications":{},"podAnnotations":{},"prometheus":{"enabled":true,"fqdn":"http://cost-analyzer-prometheus-server.default.svc"}},"hostNetwork":false,"image":{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/kube-state-metrics/kube-state-metrics","tag":"v1.9.8"},"namespaceOverride":"","nodeSelector":{},"podAnnotations":{},"prometheus":{},"prometheusScrape":true,"rbac":{"create":true},"replicas":1,"securityContext":{"enabled":true,"fsGroup":65534,"runAsUser":65534},"service":{"annotations":{},"loadBalancerIP":"","nodePort":0,"port":8080,"type":"ClusterIP"},"serviceAccount":{"create":true,"imagePullSecrets":[]},"tolerations":[]},"kubeStateMetrics":{"enabled":true},"nodeExporter":{"dnsPolicy":"ClusterFirstWithHostNet","enabled":true,"extraArgs":{},"extraConfigmapMounts":[],"extraHostPathMounts":[],"hostNetwork":true,"hostPID":true,"image":{"pullPolicy":"IfNotPresent","repository":"prom/node-exporter","tag":"v1.5.0"},"name":"node-exporter","nodeSelector":{},"pod":{"labels":{}},"podAnnotations":{},"podSecurityPolicy":{"annotations":{}},"priorityClassName":"","resources":{},"securityContext":{},"service":{"annotations":{"prometheus.io/scrape":"true"},"clusterIP":"None","externalIPs":[],"hostPort":9100,"labels":{},"loadBalancerIP":"","loadBalancerSourceRanges":[],"servicePort":9100,"type":"ClusterIP"},"tolerations":[],"updateStrategy":{"type":"RollingUpdate"}},"rbac":{"create":true},"server":{"affinity":{},"alertmanagers":[],"baseURL":"","configMapOverrideName":"","configPath":"/etc/config/prometheus.yml","containerSecurityContext":{},"emptyDir":{"sizeLimit":""},"enabled":true,"env":[],"extraArgs":{"query.max-concurrency":1,"query.max-samples":100000000},"extraConfigmapMounts":[],"extraFlags":["web.enable-lifecycle"],"extraHostPathMounts":[],"extraInitContainers":[],"extraSecretMounts":[],"extraVolumeMounts":[],"extraVolumes":[],"global":{"evaluation_interval":"1m","external_labels":{"cluster_id":"cluster-one"},"scrape_interval":"1m","scrape_timeout":"60s"},"image":{"pullPolicy":"IfNotPresent","repository":"quay.io/prometheus/prometheus","tag":"v2.35.0"},"livenessProbeFailureThreshold":3,"livenessProbeInitialDelay":30,"livenessProbeSuccessThreshold":1,"livenessProbeTimeout":30,"name":"server","nodeSelector":{},"persistentVolume":{"accessModes":["ReadWriteOnce"],"annotations":{},"enabled":true,"existingClaim":"","mountPath":"/data","size":"32Gi","subPath":""},"podAnnotations":{},"podLabels":{},"podSecurityPolicy":{"annotations":{}},"prefixURL":"","priorityClassName":"","readinessProbeFailureThreshold":3,"readinessProbeInitialDelay":30,"readinessProbeSuccessThreshold":1,"readinessProbeTimeout":30,"remoteRead":{},"remoteWrite":{},"replicaCount":1,"resources":{},"retention":"15d","securityContext":{"fsGroup":1001,"runAsGroup":1001,"runAsNonRoot":true,"runAsUser":1001},"service":{"annotations":{},"clusterIP":"","externalIPs":[],"labels":{},"loadBalancerIP":"","loadBalancerSourceRanges":[],"servicePort":80,"sessionAffinity":"None","type":"ClusterIP"},"sidecarContainers":null,"strategy":{"type":"Recreate"},"terminationGracePeriodSeconds":300,"tolerations":[]},"serverFiles":{"alerting_rules.yml":{},"alerts":{},"prometheus.yml":{"rule_files":["/etc/config/recording_rules.yml","/etc/config/alerting_rules.yml","/etc/config/rules","/etc/config/alerts"],"scrape_configs":[{"job_name":"prometheus","static_configs":[{"targets":["localhost:9090"]}]},{"bearer_token_file":"/var/run/secrets/kubernetes.io/serviceaccount/token","job_name":"kubernetes-nodes-cadvisor","kubernetes_sd_configs":[{"role":"node"}],"metric_relabel_configs":[{"action":"keep","regex":"(container_cpu_usage_seconds_total|container_memory_working_set_bytes|container_network_receive_errors_total|container_network_transmit_errors_total|container_network_receive_packets_dropped_total|container_network_transmit_packets_dropped_total|container_memory_usage_bytes|container_cpu_cfs_throttled_periods_total|container_cpu_cfs_periods_total|container_fs_usage_bytes|container_fs_limit_bytes|container_cpu_cfs_periods_total|container_fs_inodes_free|container_fs_inodes_total|container_fs_usage_bytes|container_fs_limit_bytes|container_cpu_cfs_throttled_periods_total|container_cpu_cfs_periods_total|container_network_receive_bytes_total|container_network_transmit_bytes_total|container_fs_inodes_free|container_fs_inodes_total|container_fs_usage_bytes|container_fs_limit_bytes|container_spec_cpu_shares|container_spec_memory_limit_bytes|container_network_receive_bytes_total|container_network_transmit_bytes_total|container_fs_reads_bytes_total|container_network_receive_bytes_total|container_fs_writes_bytes_total|container_fs_reads_bytes_total|cadvisor_version_info|kubecost_pv_info)","source_labels":["__name__"]},{"action":"replace","regex":"(.+)","source_labels":["container"],"target_label":"container_name"},{"action":"replace","regex":"(.+)","source_labels":["pod"],"target_label":"pod_name"}],"relabel_configs":[{"action":"labelmap","regex":"__meta_kubernetes_node_label_(.+)"},{"replacement":"kubernetes.default.svc:443","target_label":"__address__"},{"regex":"(.+)","replacement":"/api/v1/nodes/$1/proxy/metrics/cadvisor","source_labels":["__meta_kubernetes_node_name"],"target_label":"__metrics_path__"}],"scheme":"https","tls_config":{"ca_file":"/var/run/secrets/kubernetes.io/serviceaccount/ca.crt","insecure_skip_verify":true}},{"bearer_token_file":"/var/run/secrets/kubernetes.io/serviceaccount/token","job_name":"kubernetes-nodes","kubernetes_sd_configs":[{"role":"node"}],"metric_relabel_configs":[{"action":"keep","regex":"(kubelet_volume_stats_used_bytes)","source_labels":["__name__"]}],"relabel_configs":[{"action":"labelmap","regex":"__meta_kubernetes_node_label_(.+)"},{"replacement":"kubernetes.default.svc:443","target_label":"__address__"},{"regex":"(.+)","replacement":"/api/v1/nodes/$1/proxy/metrics","source_labels":["__meta_kubernetes_node_name"],"target_label":"__metrics_path__"}],"scheme":"https","tls_config":{"ca_file":"/var/run/secrets/kubernetes.io/serviceaccount/ca.crt","insecure_skip_verify":true}},{"job_name":"kubernetes-service-endpoints","kubernetes_sd_configs":[{"role":"endpoints"}],"metric_relabel_configs":[{"action":"keep","regex":"(container_cpu_allocation|container_cpu_usage_seconds_total|container_fs_limit_bytes|container_fs_writes_bytes_total|container_gpu_allocation|container_memory_allocation_bytes|container_memory_usage_bytes|container_memory_working_set_bytes|container_network_receive_bytes_total|container_network_transmit_bytes_total|DCGM_FI_DEV_GPU_UTIL|deployment_match_labels|kube_daemonset_status_desired_number_scheduled|kube_daemonset_status_number_ready|kube_deployment_spec_replicas|kube_deployment_status_replicas|kube_deployment_status_replicas_available|kube_job_status_failed|kube_namespace_annotations|kube_namespace_labels|kube_node_info|kube_node_labels|kube_node_status_allocatable|kube_node_status_allocatable_cpu_cores|kube_node_status_allocatable_memory_bytes|kube_node_status_capacity|kube_node_status_capacity_cpu_cores|kube_node_status_capacity_memory_bytes|kube_node_status_condition|kube_persistentvolume_capacity_bytes|kube_persistentvolume_status_phase|kube_persistentvolumeclaim_info|kube_persistentvolumeclaim_resource_requests_storage_bytes|kube_pod_container_info|kube_pod_container_resource_limits|kube_pod_container_resource_limits_cpu_cores|kube_pod_container_resource_limits_memory_bytes|kube_pod_container_resource_requests|kube_pod_container_resource_requests_cpu_cores|kube_pod_container_resource_requests_memory_bytes|kube_pod_container_status_restarts_total|kube_pod_container_status_running|kube_pod_container_status_terminated_reason|kube_pod_labels|kube_pod_owner|kube_pod_status_phase|kube_replicaset_owner|kube_statefulset_replicas|kube_statefulset_status_replicas|kubecost_cluster_info|kubecost_cluster_management_cost|kubecost_cluster_memory_working_set_bytes|kubecost_load_balancer_cost|kubecost_network_internet_egress_cost|kubecost_network_region_egress_cost|kubecost_network_zone_egress_cost|kubecost_node_is_spot|kubecost_pod_network_egress_bytes_total|node_cpu_hourly_cost|node_cpu_seconds_total|node_disk_reads_completed|node_disk_reads_completed_total|node_disk_writes_completed|node_disk_writes_completed_total|node_filesystem_device_error|node_gpu_count|node_gpu_hourly_cost|node_memory_Buffers_bytes|node_memory_Cached_bytes|node_memory_MemAvailable_bytes|node_memory_MemFree_bytes|node_memory_MemTotal_bytes|node_network_transmit_bytes_total|node_ram_hourly_cost|node_total_hourly_cost|pod_pvc_allocation|pv_hourly_cost|service_selector_labels|statefulSet_match_labels|kubecost_pv_info|up)","source_labels":["__name__"]}],"relabel_configs":[{"action":"keep","regex":true,"source_labels":["__meta_kubernetes_service_annotation_prometheus_io_scrape"]},{"action":"keep","regex":"(.*kube-state-metrics|.*node-exporter|kubecost-network-costs)","source_labels":["__meta_kubernetes_endpoints_name"]},{"action":"replace","regex":"(https?)","source_labels":["__meta_kubernetes_service_annotation_prometheus_io_scheme"],"target_label":"__scheme__"},{"action":"replace","regex":"(.+)","source_labels":["__meta_kubernetes_service_annotation_prometheus_io_path"],"target_label":"__metrics_path__"},{"action":"replace","regex":"([^:]+)(?::\\d+)?;(\\d+)","replacement":"$1:$2","source_labels":["__address__","__meta_kubernetes_service_annotation_prometheus_io_port"],"target_label":"__address__"},{"action":"labelmap","regex":"__meta_kubernetes_service_label_(.+)"},{"action":"replace","source_labels":["__meta_kubernetes_namespace"],"target_label":"kubernetes_namespace"},{"action":"replace","source_labels":["__meta_kubernetes_service_name"],"target_label":"kubernetes_name"},{"action":"replace","source_labels":["__meta_kubernetes_pod_node_name"],"target_label":"kubernetes_node"}]},{"job_name":"kubernetes-service-endpoints-slow","kubernetes_sd_configs":[{"role":"endpoints"}],"relabel_configs":[{"action":"keep","regex":true,"source_labels":["__meta_kubernetes_service_annotation_prometheus_io_scrape_slow"]},{"action":"replace","regex":"(https?)","source_labels":["__meta_kubernetes_service_annotation_prometheus_io_scheme"],"target_label":"__scheme__"},{"action":"replace","regex":"(.+)","source_labels":["__meta_kubernetes_service_annotation_prometheus_io_path"],"target_label":"__metrics_path__"},{"action":"replace","regex":"([^:]+)(?::\\d+)?;(\\d+)","replacement":"$1:$2","source_labels":["__address__","__meta_kubernetes_service_annotation_prometheus_io_port"],"target_label":"__address__"},{"action":"labelmap","regex":"__meta_kubernetes_service_label_(.+)"},{"action":"replace","source_labels":["__meta_kubernetes_namespace"],"target_label":"kubernetes_namespace"},{"action":"replace","source_labels":["__meta_kubernetes_service_name"],"target_label":"kubernetes_name"},{"action":"replace","source_labels":["__meta_kubernetes_pod_node_name"],"target_label":"kubernetes_node"}],"scrape_interval":"5m","scrape_timeout":"30s"},{"honor_labels":true,"job_name":"prometheus-pushgateway","kubernetes_sd_configs":[{"role":"service"}],"relabel_configs":[{"action":"keep","regex":"pushgateway","source_labels":["__meta_kubernetes_service_annotation_prometheus_io_probe"]}]},{"job_name":"kubernetes-services","kubernetes_sd_configs":[{"role":"service"}],"metrics_path":"/probe","params":{"module":["http_2xx"]},"relabel_configs":[{"action":"keep","regex":true,"source_labels":["__meta_kubernetes_service_annotation_prometheus_io_probe"]},{"source_labels":["__address__"],"target_label":"__param_target"},{"replacement":"blackbox","target_label":"__address__"},{"source_labels":["__param_target"],"target_label":"instance"},{"action":"labelmap","regex":"__meta_kubernetes_service_label_(.+)"},{"source_labels":["__meta_kubernetes_namespace"],"target_label":"kubernetes_namespace"},{"source_labels":["__meta_kubernetes_service_name"],"target_label":"kubernetes_name"}]}]},"recording_rules.yml":{},"rules":{"groups":[{"name":"CPU","rules":[{"expr":"sum(rate(container_cpu_usage_seconds_total{container!=\"\"}[5m]))","record":"cluster:cpu_usage:rate5m"},{"expr":"rate(container_cpu_usage_seconds_total{container!=\"\"}[5m])","record":"cluster:cpu_usage_nosum:rate5m"},{"expr":"avg(irate(container_cpu_usage_seconds_total{container!=\"POD\", container!=\"\"}[5m])) by (container,pod,namespace)","record":"kubecost_container_cpu_usage_irate"},{"expr":"sum(container_memory_working_set_bytes{container!=\"POD\",container!=\"\"}) by (container,pod,namespace)","record":"kubecost_container_memory_working_set_bytes"},{"expr":"sum(container_memory_working_set_bytes{container!=\"POD\",container!=\"\"})","record":"kubecost_cluster_memory_working_set_bytes"}]},{"name":"Savings","rules":[{"expr":"sum(avg(kube_pod_owner{owner_kind!=\"DaemonSet\"}) by (pod) * sum(container_cpu_allocation) by (pod))","labels":{"daemonset":"false"},"record":"kubecost_savings_cpu_allocation"},{"expr":"sum(avg(kube_pod_owner{owner_kind=\"DaemonSet\"}) by (pod) * sum(container_cpu_allocation) by (pod)) / sum(kube_node_info)","labels":{"daemonset":"true"},"record":"kubecost_savings_cpu_allocation"},{"expr":"sum(avg(kube_pod_owner{owner_kind!=\"DaemonSet\"}) by (pod) * sum(container_memory_allocation_bytes) by (pod))","labels":{"daemonset":"false"},"record":"kubecost_savings_memory_allocation_bytes"},{"expr":"sum(avg(kube_pod_owner{owner_kind=\"DaemonSet\"}) by (pod) * sum(container_memory_allocation_bytes) by (pod)) / sum(kube_node_info)","labels":{"daemonset":"true"},"record":"kubecost_savings_memory_allocation_bytes"}]}]}},"serviceAccounts":{"alertmanager":{"create":true},"nodeExporter":{"create":true},"pushgateway":{"create":true},"server":{"annotations":{},"create":true}}},"remoteWrite":{},"reporting":{"errorReporting":true,"logCollection":true,"productAnalytics":true,"valuesReporting":true},"service":{"annotations":{},"labels":{},"port":9090,"targetPort":9090,"type":"ClusterIP"},"serviceAccount":{"annotations":{},"create":true},"sigV4Proxy":{"extraEnv":null,"host":"aps-workspaces.us-west-2.amazonaws.com","image":"public.ecr.aws/aws-observability/aws-sigv4-proxy:latest","imagePullPolicy":"Always","name":"aps","port":8005,"region":"us-west-2"},"supportNFS":false,"tolerations":[]} - name: READ_ONLY value: "false" - name: PROMETHEUS_SERVER_ENDPOINT @@ -20689,8 +20372,6 @@ spec: value: /var/db/ - name: CLUSTER_PROFILE value: production - - name: REMOTE_WRITE_PASSWORD - value: admin - name: EMIT_POD_ANNOTATIONS_METRIC value: "false" - name: EMIT_NAMESPACE_ANNOTATIONS_METRIC @@ -20766,7 +20447,7 @@ spec: - name: MAX_QUERY_CONCURRENCY value: "5" - name: UTC_OFFSET - value: + value: "0" - name: CLUSTER_ID value: cluster-one - name: SQL_ADDRESS @@ -20787,12 +20468,19 @@ spec: configMapKeyRef: name: kubecost-cost-analyzer key: kubecost-token - - image: gcr.io/kubecost1/frontend:prod-1.106.0 - + - image: gcr.io/kubecost1/frontend:prod-1.106.3 + env: - name: GET_HOSTS_FROM value: dns name: cost-analyzer-frontend + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + privileged: false + readOnlyRootFilesystem: true volumeMounts: - name: tmp mountPath: /tmp From 9554511d99149c3c6a1a2efa3fd8e42d6866dc8e Mon Sep 17 00:00:00 2001 From: Neal Ormsbee Date: Wed, 18 Oct 2023 11:09:49 -0600 Subject: [PATCH 08/28] Automatically use the Aggregator-compatible image for a release when it is enabled. Otherwise users would have to set the full image name manually --- cost-analyzer/templates/cost-analyzer-deployment-template.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml index f8104c6d3..bcc85261a 100644 --- a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml @@ -1068,6 +1068,8 @@ spec: - image: {{ .Values.kubecostFrontend.fullImageName }} {{- else if .Values.imageVersion }} - image: {{ .Values.kubecostFrontend.image }}:{{ .Values.imageVersion }} + {{- else if .Values.kubecostAggregator.enabled }} + - image: {{ .Values.kubecostFrontend.image }}:prod-{{ $.Chart.AppVersion }}-aggregator {{- else }} - image: {{ .Values.kubecostFrontend.image }}:prod-{{ $.Chart.AppVersion }} {{ end }} From 775953ff56c480f789744dc236c8f74847bc443d Mon Sep 17 00:00:00 2001 From: Chip Zoller Date: Wed, 18 Oct 2023 13:57:20 -0400 Subject: [PATCH 09/28] update perms (#2662) Signed-off-by: chipzoller --- .../cost-analyzer-cluster-role-template.yaml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml b/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml index e8c2a7a40..60c1b5bd2 100644 --- a/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml @@ -29,13 +29,13 @@ rules: - '' resources: - configmaps - - deployments - nodes - pods - events - services - resourcequotas - replicationcontrollers + - replicasets - limitranges - persistentvolumeclaims - persistentvolumes @@ -45,16 +45,6 @@ rules: - get - list - watch - - apiGroups: - - extensions - resources: - - daemonsets - - deployments - - replicasets - verbs: - - get - - list - - watch {{- $isLeaderFollowerEnabled := include "cost-analyzer.leaderFollowerEnabled" . }} {{- if $isLeaderFollowerEnabled }} - apiGroups: @@ -72,6 +62,7 @@ rules: - daemonsets - replicasets verbs: + - get - list - watch - apiGroups: From 40c1fcb82d4e28d128ccd4108fc86221d620c6f4 Mon Sep 17 00:00:00 2001 From: Nik Willwerth Date: Mon, 16 Oct 2023 19:50:57 -0500 Subject: [PATCH 10/28] Added /savings/localLowDisks proxy for Aggregator. --- .../cost-analyzer-frontend-config-map-template.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml index 0d522ccdf..4c6727ea2 100755 --- a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml @@ -528,6 +528,13 @@ data: proxy_set_header Connection ""; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + location = /model/savings/localLowDisks { + proxy_read_timeout 300; + proxy_pass http://aggregator/savings/localLowDisks; + proxy_redirect off; + proxy_set_header Connection ""; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } location = /model/reports/allocation { proxy_read_timeout 300; From d566731c3a2f1deb6ffbccd8b2628bff8c1c993c Mon Sep 17 00:00:00 2001 From: Alex Meijer Date: Wed, 18 Oct 2023 14:53:20 -0400 Subject: [PATCH 11/28] add ability to override cc sa name Signed-off-by: Alex Meijer --- cost-analyzer/templates/_helpers.tpl | 7 +++++-- cost-analyzer/values.yaml | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cost-analyzer/templates/_helpers.tpl b/cost-analyzer/templates/_helpers.tpl index e2227c856..9d7ccefc3 100755 --- a/cost-analyzer/templates/_helpers.tpl +++ b/cost-analyzer/templates/_helpers.tpl @@ -134,9 +134,12 @@ Create the name of the service account {{- end -}} {{- end -}} {{- define "cloudCost.serviceAccountName" -}} - {{ (include "cloudCost.fullname" .) }} +{{- if .Values.kubecostAggregator.cloudCost.serviceAccountName -}} + {{ .Values.kubecostAggregator.cloudCost.serviceAccountName }} +{{- else -}} + {{ template "cost-analyzer.serviceAccountName" . }} +{{- end -}} {{- end -}} - {{/* Network Costs name used to tie autodiscovery of metrics to daemon set pods */}} diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index dd0cce62d..26369415a 100644 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -959,6 +959,10 @@ kubecostAggregator: # fullImageName: cloudCost: enabled: false + # by default, the aggregator cloud cost pod uses the same service account as the cost analyzer + # if a custom service account is desired for the aggregator cloud cost pod only, provide the name + # of a pre-existing service account for the Kubecost Aggregator cloud cost pod to use here + # serviceAccountName: replicas: 1 enabled: false resources: {} From f850bab8148422179bcbc2bba53467b5195212ee Mon Sep 17 00:00:00 2001 From: Alex Meijer Date: Wed, 18 Oct 2023 16:07:42 -0400 Subject: [PATCH 12/28] add missing bracket Signed-off-by: Alex Meijer --- .../templates/cost-analyzer-frontend-config-map-template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml index 4c6727ea2..f96f0d7be 100755 --- a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml @@ -528,6 +528,7 @@ data: proxy_set_header Connection ""; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } location = /model/savings/localLowDisks { proxy_read_timeout 300; proxy_pass http://aggregator/savings/localLowDisks; From 39ed317aa34aca5a86df439d409dcb98a83f7894 Mon Sep 17 00:00:00 2001 From: nickcurie Date: Wed, 18 Oct 2023 16:44:20 -0700 Subject: [PATCH 13/28] pv sizing proxy for wf --- .../cost-analyzer-frontend-config-map-template.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml index f96f0d7be..3894f70ac 100755 --- a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml @@ -537,6 +537,14 @@ data: proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } + location = /model/savings/persistentVolumeSizing { + proxy_read_timeout 300; + proxy_pass http://aggregator/savings/persistentVolumeSizing; + proxy_redirect off; + proxy_set_header Connection ""; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } location = /model/reports/allocation { proxy_read_timeout 300; proxy_pass http://aggregator/reports/allocation; From 88e8361f44d4c7aabf7926ee5257d7e255a03609 Mon Sep 17 00:00:00 2001 From: Jesse Goodier <31039225+jessegoodier@users.noreply.github.com> Date: Thu, 19 Oct 2023 08:50:03 -0400 Subject: [PATCH 14/28] setting to 50h to match etl retention time (#2667) --- cost-analyzer/values-agent.yaml | 3 ++- cost-analyzer/values.yaml | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cost-analyzer/values-agent.yaml b/cost-analyzer/values-agent.yaml index da097271f..4f790b455 100644 --- a/cost-analyzer/values-agent.yaml +++ b/cost-analyzer/values-agent.yaml @@ -72,10 +72,11 @@ prometheus: action: keep regex: {{ template "cost-analyzer.networkCostsName" . }} server: + retention: 50h + # retentionSize: 1Gi extraArgs: storage.tsdb.min-block-duration: 2h storage.tsdb.max-block-duration: 2h - storage.tsdb.retention: 10h securityContext: runAsNonRoot: true runAsUser: 1001 diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index 26369415a..b97e3299e 100644 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -695,6 +695,8 @@ prometheus: # operator: "Equal|Exists" # value: "value" # effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)" + # retention: 50h This must be greater than or equal to etlHourlyStoreDurationHours + # retentionSize: should be significantly greater than the storage used in the number of hours set in etlHourlyStoreDurationHours alertmanager: enabled: false persistentVolume: @@ -942,21 +944,21 @@ kubecostDeployment: configVolumeSize: 1Gi initImage: {} -# The Kubecost Aggregator is a high scale implementation of kubecost +# The Kubecost Aggregator is a high scale implementation of kubecost # intended for large datasets and/or high query load. -# At present, this should only be enabled when recommended +# At present, this should only be enabled when recommended # by Kubecost staff. kubecostAggregator: # by default, the aggregator uses the same service account as the cost analyzer # if a custom service account is desired for the aggregator only, provide the name # of a pre-existing service account for the Kubecost Aggregator to use here - #serviceAccountName: + #serviceAccountName: jaeger: enabled: false image: jaegertracing/all-in-one imageVersion: latest - # containerSecurityContext: - # fullImageName: + # containerSecurityContext: + # fullImageName: cloudCost: enabled: false # by default, the aggregator cloud cost pod uses the same service account as the cost analyzer @@ -1155,7 +1157,7 @@ federatedETL: ## To use this feature, ensure you have run the `create-admission-controller.sh` ## script. This generates a k8s secret with TLS keys/certificats and a ## corresponding CA bundle. -## +## kubecostAdmissionController: enabled: false secretName: webhook-server-tls From 20daa70ee7568b2cf65ba9d7128564eccf9d477e Mon Sep 17 00:00:00 2001 From: Jesse Goodier <31039225+jessegoodier@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:01:17 -0400 Subject: [PATCH 15/28] label consistency (#2673) --- cost-analyzer/templates/_helpers.tpl | 14 +++++++------- .../templates/aggregator-statefulset.yaml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cost-analyzer/templates/_helpers.tpl b/cost-analyzer/templates/_helpers.tpl index 9d7ccefc3..402677a48 100755 --- a/cost-analyzer/templates/_helpers.tpl +++ b/cost-analyzer/templates/_helpers.tpl @@ -221,7 +221,7 @@ app: federator {{- end -}} {{- define "aggregator.commonLabels" -}} {{ include "cost-analyzer.chartLabels" . }} -app: kubecost-aggregator +app: aggregator {{- end -}} {{- define "cloudCost.commonLabels" -}} {{ include "cost-analyzer.chartLabels" . }} @@ -249,7 +249,7 @@ app: federator {{- define "aggregator.selectorLabels" -}} app.kubernetes.io/name: {{ include "aggregator.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -app: kubecost-aggregator +app: aggregator {{- end -}} {{- define "cloudCost.selectorLabels" -}} app.kubernetes.io/name: {{ include "cloudCost.name" . }} @@ -303,9 +303,9 @@ Return the appropriate apiVersion for podsecuritypolicy. {{/* Recursive filter which accepts a map containing an input map (.v) and an output map (.r). The template -will traverse all values inside .v recursively writing non-map values to the output .r. If a nested map -is discovered, we look for an 'enabled' key. If it doesn't exist, we continue traversing the -map. If it does exist, we omit the inner map traversal iff enabled is false. This filter writes the +will traverse all values inside .v recursively writing non-map values to the output .r. If a nested map +is discovered, we look for an 'enabled' key. If it doesn't exist, we continue traversing the +map. If it does exist, we omit the inner map traversal iff enabled is false. This filter writes the enabled only version to the output .r */}} {{- define "cost-analyzer.filter" -}} @@ -343,8 +343,8 @@ The implied use case is {{ template "cost-analyzer.filterEnabled" .Values }} {{/* This template runs the full check for leader/follower requirements in order to determine -whether it should be configured. This template will return true if it's enabled and all -requirements are met. +whether it should be configured. This template will return true if it's enabled and all +requirements are met. */}} {{- define "cost-analyzer.leaderFollowerEnabled" }} {{- if .Values.kubecostDeployment }} diff --git a/cost-analyzer/templates/aggregator-statefulset.yaml b/cost-analyzer/templates/aggregator-statefulset.yaml index 29d0fb6dc..7c35052e2 100644 --- a/cost-analyzer/templates/aggregator-statefulset.yaml +++ b/cost-analyzer/templates/aggregator-statefulset.yaml @@ -15,7 +15,7 @@ spec: matchLabels: app.kubernetes.io/name: aggregator app.kubernetes.io/instance: {{ .Release.Name }} - app: kubecost-aggregator + app: aggregator volumeClaimTemplates: - metadata: name: persistent-configs @@ -48,7 +48,7 @@ spec: labels: app.kubernetes.io/name: aggregator app.kubernetes.io/instance: {{ .Release.Name }} - app: kubecost-aggregator + app: aggregator spec: restartPolicy: Always {{- if .Values.kubecostAggregator.securityContext }} From 3c4ecd6bf55c3fb29440ad6224d80d213c049dd5 Mon Sep 17 00:00:00 2001 From: Chip Zoller Date: Thu, 19 Oct 2023 18:34:28 -0400 Subject: [PATCH 16/28] Add version matrix and more tests (#2664) * add matrix Signed-off-by: chipzoller * add 1.20-1.22 Signed-off-by: chipzoller --------- Signed-off-by: chipzoller --- .github/workflows/chart.yaml | 6 ++++++ README.md | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/.github/workflows/chart.yaml b/.github/workflows/chart.yaml index a0fe95619..dae0f7d27 100644 --- a/.github/workflows/chart.yaml +++ b/.github/workflows/chart.yaml @@ -36,6 +36,12 @@ jobs: fail-fast: false matrix: k8s-version: + - name: v1.20 + version: v1.20.15 + - name: v1.21 + version: v1.21.14 + - name: v1.22 + version: v1.22.17 - name: v1.23 version: v1.23.17 - name: v1.24 diff --git a/README.md b/README.md index 8b4cb518a..b1bc4c69e 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,16 @@ This is the official Helm chart for [Kubecost](https://www.kubecost.com/), an enterprise-grade application to monitor and manage Kubernetes spend. Please see the [website](https://www.kubecost.com/) for more details on what Kubecost can do for you and the official documentation [here](https://docs.kubecost.com/), or contact [team@kubecost.com](mailto:team@kubecost.com) for assistance. +## Version Support + +Kubecost strives to support as many versions of Kubernetes as possible. Below is the version support matrix which has been tested. Versions outside of the stated range may still work but are untested. + +| Chart Version | Kubernetes Min | Kubernetes Max | +|--------------------------------|----------------|----------------| +| 1.106 | 1.20 | 1.28 | + +## Installation + To install via Helm, run the following command. ```sh From fe5564e9f87226196e018a88fefec6096134e840 Mon Sep 17 00:00:00 2001 From: Jesse Goodier <31039225+jessegoodier@users.noreply.github.com> Date: Fri, 20 Oct 2023 14:25:36 -0400 Subject: [PATCH 17/28] consistent image name for aggregator (#2676) --- cost-analyzer/templates/cost-analyzer-deployment-template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml index bcc85261a..03ed9caff 100644 --- a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml @@ -1069,7 +1069,7 @@ spec: {{- else if .Values.imageVersion }} - image: {{ .Values.kubecostFrontend.image }}:{{ .Values.imageVersion }} {{- else if .Values.kubecostAggregator.enabled }} - - image: {{ .Values.kubecostFrontend.image }}:prod-{{ $.Chart.AppVersion }}-aggregator + - image: {{ .Values.kubecostFrontend.image }}:prod-aggregator-{{ $.Chart.AppVersion }} {{- else }} - image: {{ .Values.kubecostFrontend.image }}:prod-{{ $.Chart.AppVersion }} {{ end }} From 9c3e5911e86193acb800e217f4040a072d73c740 Mon Sep 17 00:00:00 2001 From: Jesse Goodier <31039225+jessegoodier@users.noreply.github.com> Date: Fri, 20 Oct 2023 14:54:34 -0400 Subject: [PATCH 18/28] update securityContexts (#2669) --- cost-analyzer/values.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index b97e3299e..8c2a06072 100644 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -223,9 +223,11 @@ global: runAsNonRoot: true seccompProfile: type: RuntimeDefault - fsGroup: 65534 - runAsGroup: 65534 - runAsUser: 65534 + fsGroup: 1001 + runAsGroup: 1001 + runAsUser: 1001 + + fsGroupChangePolicy: OnRootMismatch containerSecurityContext: allowPrivilegeEscalation: false privileged: false @@ -919,9 +921,10 @@ kubecostDeployment: queryServiceReplicas: 0 queryService: securityContext: - fsGroup: 65534 - runAsGroup: 65534 - runAsUser: 65534 + runAsGroup: 1001 + runAsUser: 1001 + fsGroup: 1001 + fsGroupChangePolicy: OnRootMismatch runAsNonRoot: false seccompProfile: type: RuntimeDefault From 3f670cd2c4a09c97fbee479af7483a50a9feb453 Mon Sep 17 00:00:00 2001 From: Chip Zoller Date: Fri, 20 Oct 2023 14:56:52 -0400 Subject: [PATCH 19/28] Begin Helm testing (#2674) * add basic health test Signed-off-by: chipzoller * start testing Signed-off-by: chipzoller * increase wait Signed-off-by: chipzoller * install prometheus and grafana Signed-off-by: chipzoller * clean Signed-off-by: chipzoller --------- Signed-off-by: chipzoller --- .github/workflows/chart.yaml | 9 ++- cost-analyzer/templates/tests/_helpers.tpl | 5 ++ .../templates/tests/basic-health.yaml | 59 +++++++++++++++++++ 3 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 cost-analyzer/templates/tests/_helpers.tpl create mode 100644 cost-analyzer/templates/tests/basic-health.yaml diff --git a/.github/workflows/chart.yaml b/.github/workflows/chart.yaml index dae0f7d27..963996511 100644 --- a/.github/workflows/chart.yaml +++ b/.github/workflows/chart.yaml @@ -69,5 +69,10 @@ jobs: - name: Install Kubecost chart working-directory: ./cost-analyzer - run: | - helm install --wait --wait-for-jobs kubecost . --namespace kubecost --create-namespace --set global.prometheus.enabled=false --set global.grafana.enabled=false + run: helm install --wait --wait-for-jobs kubecost . -n kubecost --create-namespace + + - name: Wait for ready + run: kubectl wait --namespace kubecost --for=condition=ready pod --selector app.kubernetes.io/name=cost-analyzer --timeout=120s + + - name: Run Helm tests + run: helm test -n kubecost kubecost \ No newline at end of file diff --git a/cost-analyzer/templates/tests/_helpers.tpl b/cost-analyzer/templates/tests/_helpers.tpl new file mode 100644 index 000000000..8c1e53a56 --- /dev/null +++ b/cost-analyzer/templates/tests/_helpers.tpl @@ -0,0 +1,5 @@ +{{/* vim: set filetype=mustache: */}} + +{{- define "kubecost.test.annotations" -}} +helm.sh/hook: test +{{- end -}} diff --git a/cost-analyzer/templates/tests/basic-health.yaml b/cost-analyzer/templates/tests/basic-health.yaml new file mode 100644 index 000000000..4bf072c18 --- /dev/null +++ b/cost-analyzer/templates/tests/basic-health.yaml @@ -0,0 +1,59 @@ +apiVersion: v1 +kind: Pod +metadata: + name: basic-health + namespace: {{ .Release.Namespace }} + annotations: + {{- include "kubecost.test.annotations" . | nindent 4 }} +spec: + serviceAccountName: tester + restartPolicy: Never + containers: + - name: test-kubecost + image: alpine/k8s:1.26.9 + command: + - /bin/sh + args: + - -c + - >- + svc=$(kubectl -n {{ .Release.Namespace }} get svc -l app.kubernetes.io/name=cost-analyzer -o json | jq -r .items[0].metadata.name); + echo Getting current Kubecost state.; + response=$(curl -sL http://${svc}:9090/model/getConfigs); + code=$(echo ${response} | jq .code); + if [ "$code" -eq 200 ]; then + echo "Got Kubecost working configuration. Successful." + exit 0 + else + echo "Failed to fetch Kubecost configuration. Response was $response" + exit 1 + fi +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: test-role + namespace: {{ .Release.Namespace }} +rules: +- apiGroups: [""] + resources: ["services"] + verbs: ["list"] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: test-rolebinding + namespace: {{ .Release.Namespace }} +subjects: +- kind: ServiceAccount + name: tester + namespace: {{ .Release.Namespace }} +roleRef: + kind: Role + name: test-role + apiGroup: rbac.authorization.k8s.io +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: tester + namespace: {{ .Release.Namespace }} \ No newline at end of file From ae9f321678ece3458c176266abd8fb507d773363 Mon Sep 17 00:00:00 2001 From: Jesse Goodier <31039225+jessegoodier@users.noreply.github.com> Date: Sun, 22 Oct 2023 15:17:57 -0400 Subject: [PATCH 20/28] networkCosts service discovery (#2677) --- cost-analyzer/values.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index 8c2a06072..10ce5088a 100644 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -663,9 +663,12 @@ prometheus: - role: pod relabel_configs: # Scrape only the the targets matching the following metadata - - source_labels: [__meta_kubernetes_pod_label_app] + - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance] action: keep - regex: {{ template "cost-analyzer.networkCostsName" . }} + regex: kubecost + - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_name] + action: keep + regex: network-costs server: # If clusterIDConfigmap is defined, instead use user-generated configmap with key CLUSTER_ID # to use as unique cluster ID in kubecost cost-analyzer deployment. @@ -881,7 +884,10 @@ networkCosts: podMonitor: enabled: false additionalLabels: {} - additionalLabels: {} + # match the default extraScrapeConfig + additionalLabels: + app.kubernetes.io/instance: kubecost + app.kubernetes.io/name: network-costs nodeSelector: {} annotations: {} healthCheckProbes: {} From 66280ebe7f3368132104abf570b46a916d9ff30b Mon Sep 17 00:00:00 2001 From: Chip Zoller Date: Mon, 23 Oct 2023 08:07:46 -0400 Subject: [PATCH 21/28] remove replicasets from core (#2678) Signed-off-by: chipzoller --- cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml b/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml index 60c1b5bd2..94d25aaa0 100644 --- a/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml @@ -35,7 +35,6 @@ rules: - services - resourcequotas - replicationcontrollers - - replicasets - limitranges - persistentvolumeclaims - persistentvolumes From 5e9248f351fd46bb99c5a8549279c32dd09183a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:30:15 -0400 Subject: [PATCH 22/28] Bump actions/checkout from 4.1.0 to 4.1.1 (#2683) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/8ade135a41bc03ea155e62e844d188df1ea18608...b4ffde65f46336ab88eb53be808477a3936bae11) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/chart.yaml b/.github/workflows/chart.yaml index 963996511..21382f80d 100644 --- a/.github/workflows/chart.yaml +++ b/.github/workflows/chart.yaml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Helm lint working-directory: ./cost-analyzer @@ -58,7 +58,7 @@ jobs: name: ${{ matrix.k8s-version.name }} test steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Create KinD cluster uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0 From 494a2d609e56cca5bda886c038e22e671edab063 Mon Sep 17 00:00:00 2001 From: Chip Zoller Date: Mon, 23 Oct 2023 20:02:11 -0400 Subject: [PATCH 23/28] [Feature] Development guide and devcontainers (#2680) * devcontainers Signed-off-by: chipzoller * add development guide Signed-off-by: chipzoller --------- Signed-off-by: chipzoller --- .devcontainer/cluster/Dockerfile | 18 ++++++++++++++++++ .devcontainer/cluster/devcontainer.json | 13 +++++++++++++ .devcontainer/devcontainer.json | 4 ++++ .devcontainer/tools.sh | 4 ++++ DEVELOPMENT.md | 24 ++++++++++++++++++++++++ docs/images/custom-devcontainer.png | Bin 0 -> 18526 bytes 6 files changed, 63 insertions(+) create mode 100644 .devcontainer/cluster/Dockerfile create mode 100644 .devcontainer/cluster/devcontainer.json create mode 100644 .devcontainer/devcontainer.json create mode 100644 .devcontainer/tools.sh create mode 100644 DEVELOPMENT.md create mode 100644 docs/images/custom-devcontainer.png diff --git a/.devcontainer/cluster/Dockerfile b/.devcontainer/cluster/Dockerfile new file mode 100644 index 000000000..0cdf5232f --- /dev/null +++ b/.devcontainer/cluster/Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu:22.04@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f + +RUN apt-get update && apt-get install -y sudo git curl wget apt-transport-https ca-certificates gnupg-agent software-properties-common +ARG USERNAME=root +RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ + && chmod 0440 /etc/sudoers.d/$USERNAME + +# Install Docker +RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg +RUN echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null +RUN apt-get update && apt-get install -y docker-ce docker-ce-cli containerd.io + +# Expose ports for Minikube and Docker +EXPOSE 22 80 2375 8443 + +CMD ["/bin/bash"] \ No newline at end of file diff --git a/.devcontainer/cluster/devcontainer.json b/.devcontainer/cluster/devcontainer.json new file mode 100644 index 000000000..958fc39e2 --- /dev/null +++ b/.devcontainer/cluster/devcontainer.json @@ -0,0 +1,13 @@ +{ + "name": "Cluster", + "build": { + "dockerfile": "Dockerfile" + }, + "remoteUser": "root", + "mounts": ["source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"], + "runArgs": ["--privileged", "--network=host", "-p", "22:22", "-p", "80:80", "-p", "2375:2375", "-p", "8443:8443"], + "features": { + "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {} + }, + "postCreateCommand": "./.devcontainer/tools.sh" +} \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 000000000..10c5d4821 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Default", + "postCreateCommand": "./.devcontainer/tools.sh" +} \ No newline at end of file diff --git a/.devcontainer/tools.sh b/.devcontainer/tools.sh new file mode 100644 index 000000000..ddff79c3c --- /dev/null +++ b/.devcontainer/tools.sh @@ -0,0 +1,4 @@ +#! /bin/bash + +## Install yq +sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq \ No newline at end of file diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md new file mode 100644 index 000000000..2d4e278a0 --- /dev/null +++ b/DEVELOPMENT.md @@ -0,0 +1,24 @@ +# Kubecost Helm Chart Development Guide + +This guide contains tips on setting up a development environment for the Kubecost Helm chart. + +> [!IMPORTANT] +> Following some of these steps may involve billing charges by GitHub for either an individual account or organization. + +## Developing with Codespaces and Devcontainers + +GitHub includes a feature called [Codespaces](https://github.com/features/codespaces) which allows you to set up an instant, fully-provisioned development environment in the cloud in seconds. This is a containerized environment powered by [Development Containers](https://containers.dev/) ("devcontainers") which have all the necessary project-specific tools to get started. + +This repository contains two such devcontainers to aid in easy development, testing, and contribution. The first, which is the default, contains basic tools such as `helm` and `kubectl` along with some other commonly-used tools for Chart development. This default devcontainer will be the one used if no other selection is chosen. Follow the process [here](https://docs.github.com/en/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository) to create a Codespaces environment using the default devcontainer. + +The second devcontainer provides a Docker-in-Docker experience allowing you to test/develop your Helm chart changes as well as deploy them to a running cluster all inside the Codespaces environment. In order to create this more advanced Codespaces environment, follow the guide [here](https://docs.github.com/en/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository) at step four and then select the "Cluster" configuration as shown below. You may also wish to use a larger machine type such as the 4-core option if you intend on actually deploying Kubecost. + +![Custom devcontainer profile](/docs/images/custom-devcontainer.png) + +This Cluster profile includes Docker and Minikube allowing you to not only develop against the Helm chart but also fully deploy, as opposed to just rendering, the Chart to inspect changes. When running Minikube in this devcontainer, pass the `--force` flag to permit Minikube to run as root. + +```sh +minikube start --force +``` + +For more information on GitHub Codespaces, see the reference documentation [here](https://docs.github.com/en/codespaces/overview). diff --git a/docs/images/custom-devcontainer.png b/docs/images/custom-devcontainer.png new file mode 100644 index 0000000000000000000000000000000000000000..182bfba9bb1d72bbb97c6c735fb9f87bc6a5fbf1 GIT binary patch literal 18526 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 Date: Tue, 24 Oct 2023 23:25:38 +0200 Subject: [PATCH 24/28] feat(cost-analyzer): add StatefulSet as option (#2188) so that you can use a real stateful deployment --- cost-analyzer/README.md | 54 +++++++++++++++++++ .../cost-analyzer-db-pvc-template.yaml | 2 + .../cost-analyzer-deployment-template.yaml | 46 +++++++++++++++- .../templates/cost-analyzer-pvc-template.yaml | 2 + cost-analyzer/values.yaml | 3 ++ 5 files changed, 106 insertions(+), 1 deletion(-) diff --git a/cost-analyzer/README.md b/cost-analyzer/README.md index 3121c8eab..feedbbf3e 100644 --- a/cost-analyzer/README.md +++ b/cost-analyzer/README.md @@ -99,3 +99,57 @@ Adjusting the log format changes the format in which the logs are output making |--------|----------------------------------------------------------------------------------------------------------------------------| | `JSON` | `{"level":"info","time":"2006-01-02T15:04:05.999999999Z07:00","message":"Starting cost-model (git commit \"1.91.0-rc.0\")"}` | | `pretty` | `2006-01-02T15:04:05.999999999Z07:00 INF Starting cost-model (git commit "1.91.0-rc.0")` | + +## Testing +To perform local testing do next: +- install locally [kind](https://github.com/kubernetes-sigs/kind) according to documentation. +- install locally [ct](https://github.com/helm/chart-testing) according to documentation. +- create local cluster using `kind` \ +use image version from https://github.com/kubernetes-sigs/kind/releases e.g. `kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8` +```shell +kind create cluster --image kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8 +``` +- perform ct execution +```shell +ct install --chart-dirs="." --charts="." +``` + +- perform ct StatefulSet execution + +```shell +# create multiple nodes kind config +cat > kind-config.yaml < etlBucketConfigSecret.yaml < Date: Thu, 26 Oct 2023 15:12:47 -0400 Subject: [PATCH 25/28] add systemProxy env vars (#2687) --- .../cost-analyzer-deployment-template.yaml | 47 ++++++++++++++++++- .../federator-deployment-template.yaml | 14 ++++++ cost-analyzer/values.yaml | 7 ++- 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml index f55500ddc..f3f60418f 100644 --- a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml @@ -344,6 +344,21 @@ spec: args: - "--web.listen-address=:{{ .Values.global.gmp.gmpProxy.port }}" - "--query.project-id={{ .Values.global.gmp.gmpProxy.projectId }}" + {{- if .Values.systemProxy.enabled }} + env: + - name: HTTP_PROXY + value: {{ .Values.systemProxy.httpProxyUrl }} + - name: http_proxy + value: {{ .Values.systemProxy.httpProxyUrl }} + - name: HTTPS_PROXY + value: {{ .Values.systemProxy.httpsProxyUrl }} + - name: https_proxy + value: {{ .Values.systemProxy.httpsProxyUrl }} + - name: NO_PROXY + value: {{ .Values.systemProxy.noProxy }} + - name: no_proxy + value: {{ .Values.systemProxy.noProxy }} + {{- end }} ports: - name: web containerPort: {{ .Values.global.gmp.gmpProxy.port | int }} @@ -384,8 +399,24 @@ spec: ports: - name: aws-sigv4-proxy containerPort: {{ .Values.sigV4Proxy.port | int }} - {{- if .Values.sigV4Proxy.extraEnv }} env: + - name: AGENT_LOCAL_PORT + value: "{{ .Values.sigV4Proxy.port | int }}" + {{- if .Values.systemProxy.enabled }} + - name: HTTP_PROXY + value: {{ .Values.systemProxy.httpProxyUrl }} + - name: http_proxy + value: {{ .Values.systemProxy.httpProxyUrl }} + - name: HTTPS_PROXY + value: {{ .Values.systemProxy.httpsProxyUrl }} + - name: https_proxy + value: {{ .Values.systemProxy.httpsProxyUrl }} + - name: NO_PROXY + value: {{ .Values.systemProxy.noProxy }} + - name: no_proxy + value: {{ .Values.systemProxy.noProxy }} + {{- end }} + {{- if .Values.sigV4Proxy.extraEnv }} {{- toYaml .Values.sigV4Proxy.extraEnv | nindent 10 }} {{- end }} {{- end }} @@ -393,6 +424,20 @@ spec: - name: ubbagent image: gcr.io/kubecost1/gcp-mp/ent/cost-model/ubbagent:1.0 env: + {{- if .Values.systemProxy.enabled }} + - name: HTTP_PROXY + value: {{ .Values.systemProxy.httpProxyUrl }} + - name: http_proxy + value: {{ .Values.systemProxy.httpProxyUrl }} + - name: HTTPS_PROXY + value: {{ .Values.systemProxy.httpsProxyUrl }} + - name: https_proxy + value: {{ .Values.systemProxy.httpsProxyUrl }} + - name: NO_PROXY + value: {{ .Values.systemProxy.noProxy }} + - name: no_proxy + value: {{ .Values.systemProxy.noProxy }} + {{- end }} - name: AGENT_CONFIG_FILE value: "/etc/ubbagent/config.yaml" - name: AGENT_LOCAL_PORT diff --git a/cost-analyzer/templates/federator-deployment-template.yaml b/cost-analyzer/templates/federator-deployment-template.yaml index b32275b8d..864426e18 100644 --- a/cost-analyzer/templates/federator-deployment-template.yaml +++ b/cost-analyzer/templates/federator-deployment-template.yaml @@ -81,6 +81,20 @@ spec: {{- if .Values.federatedETL.federator.extraEnv }} {{- toYaml .Values.federatedETL.federator.extraEnv | nindent 12 }} {{- end }} + {{- if .Values.systemProxy.enabled }} + - name: HTTP_PROXY + value: {{ .Values.systemProxy.httpProxyUrl }} + - name: http_proxy + value: {{ .Values.systemProxy.httpProxyUrl }} + - name: HTTPS_PROXY + value: {{ .Values.systemProxy.httpsProxyUrl }} + - name: https_proxy + value: {{ .Values.systemProxy.httpsProxyUrl }} + - name: NO_PROXY + value: {{ .Values.systemProxy.noProxy }} + - name: no_proxy + value: {{ .Values.systemProxy.noProxy }} + {{- end }} restartPolicy: Always serviceAccountName: {{ template "cost-analyzer.serviceAccountName" . }} volumes: diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index a3c0f2f28..5b5d1e491 100644 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -320,8 +320,11 @@ oidc: # claimValues: # - "editor" -# Adds an httpProxy as an environment variable. systemProxy.enabled must be `true`to have any effect. -# Ref: https://www.oreilly.com/library/view/security-with-go/9781788627917/5ea6a02b-3d96-44b1-ad3c-6ab60fcbbe4f.xhtml +## Adds the HTTP_PROXY, HTTPS_PROXY, and NO_PROXY environment variables to all +## containers. Typically used in environments that have firewall rules which +## prevent kubecost from accessing cloud provider resources. +## Ref: https://www.oreilly.com/library/view/security-with-go/9781788627917/5ea6a02b-3d96-44b1-ad3c-6ab60fcbbe4f.xhtml +## systemProxy: enabled: false httpProxyUrl: "" From 6f2f6c2569b9d71b2e057c5f9c4f1e206f5cd9d2 Mon Sep 17 00:00:00 2001 From: saweber Date: Thu, 26 Oct 2023 16:29:29 -0500 Subject: [PATCH 26/28] update savedReports and advancedReports in values.yml to reflect current filter schema --- cost-analyzer/values.yaml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index 5b5d1e491..045a4d60b 100644 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -149,11 +149,10 @@ global: idle: "separate" rate: "cumulative" accumulate: false # daily resolution - filters: - - property: "cluster" - value: "cluster-one,cluster*" # supports wildcard filtering and multiple comma separated values - - property: "namespace" - value: "kubecost" + filters: # Ref: https://docs.kubecost.com/apis/apis-overview/filters-api + - key: "cluster" # Ref: https://docs.kubecost.com/apis/apis-overview/filters-api#allocation-apis-request-sizing-v2-api + operator: ":" # Ref: https://docs.kubecost.com/apis/apis-overview/filters-api#filter-operators + value: "dev" - title: "Example Saved Report 1" window: "month" aggregateBy: "controllerKind" @@ -161,10 +160,9 @@ global: idle: "share" rate: "monthly" accumulate: false - filters: - - property: "label" - value: "app:cost*,environment:kube*" - - property: "namespace" + filters: # Ref: https://docs.kubecost.com/apis/apis-overview/filters-api + - key: "namespace" # Ref: https://docs.kubecost.com/apis/apis-overview/filters-api#allocation-apis-request-sizing-v2-api + operator: "!:" # Ref: https://docs.kubecost.com/apis/apis-overview/filters-api#filter-operators value: "kubecost" - title: "Example Saved Report 2" window: "2020-11-11T00:00:00Z,2020-12-09T23:59:59Z" @@ -196,9 +194,10 @@ global: - title: "Example Advanced Report 0" window: "7d" aggregateBy: "namespace" - filters: - - property: "cluster" - value: "cluster-one" + filters: # same as allocation api filters Ref: https://docs.kubecost.com/apis/apis-overview/filters-api + - key: "cluster" # Ref: https://docs.kubecost.com/apis/apis-overview/filters-api#allocation-apis-request-sizing-v2-api + operator: ":" # Ref: https://docs.kubecost.com/apis/apis-overview/filters-api#filter-operators + value: "dev" cloudBreakdown: "service" cloudJoin: "label:kubernetes_namespace" From 6b7c44a0a44989234241fa39e2f65f175378a99c Mon Sep 17 00:00:00 2001 From: Chip Zoller Date: Fri, 27 Oct 2023 14:27:52 -0400 Subject: [PATCH 27/28] swap jimmidyson/configmap-reload for prometheus-operator/prometheus-config-reloader (#2698) Signed-off-by: chipzoller --- cost-analyzer/charts/prometheus/README.md | 8 ++++---- .../charts/prometheus/templates/server-deployment.yaml | 4 ++-- .../prometheus/templates/server-statefulset.yaml | 4 ++-- cost-analyzer/charts/prometheus/values.yaml | 10 ++++------ kubecost.yaml | 6 +++--- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/cost-analyzer/charts/prometheus/README.md b/cost-analyzer/charts/prometheus/README.md index 0f636b204..bb8fded41 100755 --- a/cost-analyzer/charts/prometheus/README.md +++ b/cost-analyzer/charts/prometheus/README.md @@ -183,8 +183,8 @@ Parameter | Description | Default `configmapReload.prometheus.enabled` | If false, the configmap-reload container for Prometheus will not be deployed | `true` `configmapReload.prometheus.containerSecurityContext` | securityContext for container | `{}` `configmapReload.prometheus.name` | configmap-reload container name | `configmap-reload` -`configmapReload.prometheus.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload` -`configmapReload.prometheus.image.tag` | configmap-reload container image tag | `v0.5.0` +`configmapReload.prometheus.image.repository` | configmap-reload container image repository | `quay.io/prometheus-operator/prometheus-config-reloader` +`configmapReload.prometheus.image.tag` | configmap-reload container image tag | `v0.68.0` `configmapReload.prometheus.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent` `configmapReload.prometheus.extraArgs` | Additional configmap-reload container arguments | `{}` `configmapReload.prometheus.extraVolumeDirs` | Additional configmap-reload volume directories | `{}` @@ -192,8 +192,8 @@ Parameter | Description | Default `configmapReload.prometheus.resources` | configmap-reload pod resource requests & limits | `{}` `configmapReload.alertmanager.enabled` | If false, the configmap-reload container for AlertManager will not be deployed | `true` `configmapReload.alertmanager.name` | configmap-reload container name | `configmap-reload` -`configmapReload.alertmanager.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload` -`configmapReload.alertmanager.image.tag` | configmap-reload container image tag | `v0.5.0` +`configmapReload.alertmanager.image.repository` | configmap-reload container image repository | `quay.io/prometheus-operator/prometheus-config-reloader` +`configmapReload.alertmanager.image.tag` | configmap-reload container image tag | `v0.68.0` `configmapReload.alertmanager.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent` `configmapReload.alertmanager.extraArgs` | Additional configmap-reload container arguments | `{}` `configmapReload.alertmanager.extraVolumeDirs` | Additional configmap-reload volume directories | `{}` diff --git a/cost-analyzer/charts/prometheus/templates/server-deployment.yaml b/cost-analyzer/charts/prometheus/templates/server-deployment.yaml index f0e07fbca..4924f9136 100755 --- a/cost-analyzer/charts/prometheus/templates/server-deployment.yaml +++ b/cost-analyzer/charts/prometheus/templates/server-deployment.yaml @@ -50,8 +50,8 @@ spec: image: "{{ .Values.configmapReload.prometheus.image.repository }}:{{ .Values.configmapReload.prometheus.image.tag }}" imagePullPolicy: "{{ .Values.configmapReload.prometheus.image.pullPolicy }}" args: - - --volume-dir=/etc/config - - --webhook-url=http://127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload + - --watched-dir=/etc/config + - --reload-url=http://127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload {{- range $key, $value := .Values.configmapReload.prometheus.extraArgs }} - --{{ $key }}={{ $value }} {{- end }} diff --git a/cost-analyzer/charts/prometheus/templates/server-statefulset.yaml b/cost-analyzer/charts/prometheus/templates/server-statefulset.yaml index 2f25a94ad..d121c2696 100755 --- a/cost-analyzer/charts/prometheus/templates/server-statefulset.yaml +++ b/cost-analyzer/charts/prometheus/templates/server-statefulset.yaml @@ -51,8 +51,8 @@ spec: image: "{{ .Values.configmapReload.prometheus.image.repository }}:{{ .Values.configmapReload.prometheus.image.tag }}" imagePullPolicy: "{{ .Values.configmapReload.prometheus.image.pullPolicy }}" args: - - --volume-dir=/etc/config - - --webhook-url=http://127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload + - --watched-dir=/etc/config + - --reload-url=http://127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload {{- range $key, $value := .Values.configmapReload.prometheus.extraArgs }} - --{{ $key }}={{ $value }} {{- end }} diff --git a/cost-analyzer/charts/prometheus/values.yaml b/cost-analyzer/charts/prometheus/values.yaml index 5d4084d0c..0df64f922 100644 --- a/cost-analyzer/charts/prometheus/values.yaml +++ b/cost-analyzer/charts/prometheus/values.yaml @@ -307,8 +307,6 @@ alertmanager: type: ClusterIP ## Monitors ConfigMap changes and POSTs to a URL -## Ref: https://github.com/jimmidyson/configmap-reload -## configmapReload: prometheus: ## If false, the configmap-reload container will not be deployed @@ -322,8 +320,8 @@ configmapReload: ## configmap-reload container image ## image: - repository: jimmidyson/configmap-reload - tag: v0.9.0 + repository: quay.io/prometheus-operator/prometheus-config-reloader + tag: v0.68.0 pullPolicy: IfNotPresent ## Additional configmap-reload container arguments @@ -362,8 +360,8 @@ configmapReload: ## configmap-reload container image ## image: - repository: jimmidyson/configmap-reload - tag: v0.9.0 + repository: quay.io/prometheus-operator/prometheus-config-reloader + tag: v0.68.0 pullPolicy: IfNotPresent ## Additional configmap-reload container arguments diff --git a/kubecost.yaml b/kubecost.yaml index 3447802b3..7d6728070 100644 --- a/kubecost.yaml +++ b/kubecost.yaml @@ -20181,11 +20181,11 @@ spec: serviceAccountName: kubecost-prometheus-server containers: - name: prometheus-server-configmap-reload - image: "jimmidyson/configmap-reload:v0.9.0" + image: "quay.io/prometheus-operator/prometheus-config-reloader:v0.68.0" imagePullPolicy: "IfNotPresent" args: - - --volume-dir=/etc/config - - --webhook-url=http://127.0.0.1:9090/-/reload + - --watched-dir=/etc/config + - --reload-url=http://127.0.0.1:9090/-/reload resources: {} securityContext: From b675a8cacaa5b6c64cf00d3583df026cfc2ec507 Mon Sep 17 00:00:00 2001 From: Chip Zoller Date: Sat, 28 Oct 2023 16:18:07 -0400 Subject: [PATCH 28/28] exec (#2701) Signed-off-by: GitHub --- .devcontainer/tools.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .devcontainer/tools.sh diff --git a/.devcontainer/tools.sh b/.devcontainer/tools.sh old mode 100644 new mode 100755