From 9cc618bc70dd0d12210720e90b58b355d589312b Mon Sep 17 00:00:00 2001 From: Matt Ray Date: Mon, 26 Feb 2024 20:41:00 +1100 Subject: [PATCH 1/3] OpenCost 1.109.0, which moved the default container registry to GHCR.io appVersion bump to 1.109.0, version bump to 0.1.2 Registry moved from quay.io -> ghcr.io Renamed container to "opencost" from legacy "kubecost-cost-model" Removed "prod-" tag prefix, no longer used in ghcr.io Synced the internal Prometheus defaults to match the documentation defaults Signed-off-by: Matt Ray --- charts/prometheus-opencost-exporter/Chart.yaml | 5 +++-- .../templates/deployment.yaml | 2 +- charts/prometheus-opencost-exporter/values.yaml | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/charts/prometheus-opencost-exporter/Chart.yaml b/charts/prometheus-opencost-exporter/Chart.yaml index b0a5b6afd741..b35b31ac491a 100644 --- a/charts/prometheus-opencost-exporter/Chart.yaml +++ b/charts/prometheus-opencost-exporter/Chart.yaml @@ -1,5 +1,5 @@ -appVersion: 1.108.0 -version: 0.1.1 +appVersion: 1.109.0 +version: 0.1.2 description: Prometheus OpenCost Exporter home: https://github.com/opencost/opencost name: prometheus-opencost-exporter @@ -11,6 +11,7 @@ keywords: - opencost - prometheus - exporter +- finops maintainers: - email: mattray@kubecost.com name: mattray diff --git a/charts/prometheus-opencost-exporter/templates/deployment.yaml b/charts/prometheus-opencost-exporter/templates/deployment.yaml index 1df485ace588..54a996c2ee44 100644 --- a/charts/prometheus-opencost-exporter/templates/deployment.yaml +++ b/charts/prometheus-opencost-exporter/templates/deployment.yaml @@ -51,7 +51,7 @@ spec: {{- end }} containers: - name: {{ include "prometheus-opencost-exporter.fullname" . }} - image: "{{ .Values.opencost.exporter.image.registry }}/{{ .Values.opencost.exporter.image.repository }}:{{ .Values.opencost.exporter.image.tag | default (printf "prod-%s" .Chart.AppVersion) }}" + image: "{{ .Values.opencost.exporter.image.registry }}/{{ .Values.opencost.exporter.image.repository }}:{{ .Values.opencost.exporter.image.tag | default (printf "%s" .Chart.AppVersion) }}" imagePullPolicy: {{ .Values.opencost.exporter.image.pullPolicy }} ports: - containerPort: 9003 diff --git a/charts/prometheus-opencost-exporter/values.yaml b/charts/prometheus-opencost-exporter/values.yaml index fb5a9bf7ff31..ada00b3adfdf 100644 --- a/charts/prometheus-opencost-exporter/values.yaml +++ b/charts/prometheus-opencost-exporter/values.yaml @@ -53,9 +53,9 @@ opencost: defaultClusterId: 'default-cluster' image: # -- Exporter container image registry - registry: quay.io + registry: ghcr.io # -- Exporter container image name - repository: kubecost1/kubecost-cost-model + repository: opencost/opencost # -- Exporter container image tag # @default -- `""` (use appVersion in Chart.yaml) tag: "" @@ -170,8 +170,8 @@ opencost: # -- Use in-cluster Prometheus enabled: true # -- Service name of in-cluster Prometheus - serviceName: my-prometheus + serviceName: prometheus-server # -- Namespace of in-cluster Prometheus - namespaceName: opencost + namespaceName: prometheus-system # -- Service port of in-cluster Prometheus - port: 9090 + port: 80 From 69c6480c3eafd2f475c6928f7157b41295185621 Mon Sep 17 00:00:00 2001 From: Matt Ray Date: Tue, 27 Feb 2024 10:44:09 +1100 Subject: [PATCH 2/3] Bump minor version for change in container registry Signed-off-by: Matt Ray --- charts/prometheus-opencost-exporter/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prometheus-opencost-exporter/Chart.yaml b/charts/prometheus-opencost-exporter/Chart.yaml index b35b31ac491a..46b14f2b94d7 100644 --- a/charts/prometheus-opencost-exporter/Chart.yaml +++ b/charts/prometheus-opencost-exporter/Chart.yaml @@ -1,5 +1,5 @@ appVersion: 1.109.0 -version: 0.1.2 +version: 0.2.0 description: Prometheus OpenCost Exporter home: https://github.com/opencost/opencost name: prometheus-opencost-exporter From 98d837c6ca84aeab6253020522f338c4d50638d9 Mon Sep 17 00:00:00 2001 From: Matt Ray Date: Wed, 24 Apr 2024 15:55:43 +1000 Subject: [PATCH 3/3] Minor typo "OpenCost" not "Opencost" Signed-off-by: Matt Ray --- charts/prometheus-opencost-exporter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prometheus-opencost-exporter/README.md b/charts/prometheus-opencost-exporter/README.md index 168a124b61da..483e221129af 100644 --- a/charts/prometheus-opencost-exporter/README.md +++ b/charts/prometheus-opencost-exporter/README.md @@ -1,4 +1,4 @@ -# Prometheus Opencost Exporter +# Prometheus OpenCost Exporter Prometheus exporter for [OpenCost](https://www.opencost.io) Kubernetes cost monitoring data.