From aacbdeb545b38daae56d5a9bc10b46ddb0931edd Mon Sep 17 00:00:00 2001 From: Matt Ray Date: Tue, 5 Mar 2024 09:46:32 +1100 Subject: [PATCH] Bump the Helm version to 1.30.0 and set the app version to 1.109.0 (#179) * update image repo Signed-off-by: Cliff Colvin * Bump the Helm version and set the app version to 1.109.0 Includes https://github.com/opencost/opencost-helm-chart/pull/178 Signed-off-by: Matt Ray --------- Signed-off-by: Cliff Colvin Signed-off-by: Matt Ray Co-authored-by: Cliff Colvin --- charts/opencost/Chart.yaml | 8 ++++---- charts/opencost/README.md | 12 ++++++------ charts/opencost/templates/deployment.yaml | 4 ++-- charts/opencost/tests/deployment_test.yaml | 2 +- charts/opencost/values.yaml | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/charts/opencost/Chart.yaml b/charts/opencost/Chart.yaml index 17dbe3f..4846638 100755 --- a/charts/opencost/Chart.yaml +++ b/charts/opencost/Chart.yaml @@ -1,15 +1,15 @@ apiVersion: v2 -appVersion: 1.108.0 +appVersion: 1.109.0 name: opencost description: OpenCost and OpenCost UI type: application keywords: + - cloud-costs - cost-optimization - finops - - kubecost - - opencost - monitoring -version: 1.29.1 + - opencost +version: 1.30.0 maintainers: - name: mattray - name: toscott diff --git a/charts/opencost/README.md b/charts/opencost/README.md index 274710d..364094d 100644 --- a/charts/opencost/README.md +++ b/charts/opencost/README.md @@ -2,9 +2,9 @@ OpenCost and OpenCost UI -![Version: 1.29.0](https://img.shields.io/badge/Version-1.29.0-informational?style=flat-square) +![Version: 1.30.0](https://img.shields.io/badge/Version-1.30.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) -![AppVersion: 1.108.0](https://img.shields.io/badge/AppVersion-1.108.0-informational?style=flat-square) +![AppVersion: 1.109.0](https://img.shields.io/badge/AppVersion-1.109.0-informational?style=flat-square) ## Maintainers @@ -54,8 +54,8 @@ $ helm install opencost opencost/opencost | opencost.exporter.extraEnv | object | `{}` | Any extra environment variables you would like to pass on to the pod | | opencost.exporter.extraVolumeMounts | list | `[]` | A list of volume mounts to be added to the pod | | opencost.exporter.image.pullPolicy | string | `"IfNotPresent"` | Exporter container image pull policy | -| opencost.exporter.image.registry | string | `"quay.io"` | Exporter container image registry | -| opencost.exporter.image.repository | string | `"kubecost1/kubecost-cost-model"` | Exporter container image name | +| opencost.exporter.image.registry | string | `"ghcr.io"` | Exporter container image registry | +| opencost.exporter.image.repository | string | `"opencost/opencost"` | Exporter container image name | | opencost.exporter.image.tag | string | `""` (use appVersion in Chart.yaml) | Exporter container image tag | | opencost.exporter.livenessProbe.enabled | bool | `true` | Whether probe is enabled | | opencost.exporter.livenessProbe.failureThreshold | int | `3` | Number of failures for probe to be considered failed | @@ -127,8 +127,8 @@ $ helm install opencost opencost/opencost | opencost.ui.enabled | bool | `true` | Whether or not to deploy the `opencost-ui` container | | opencost.ui.extraVolumeMounts | list | `[]` | A list of volume mounts to be added to the pod | | opencost.ui.image.pullPolicy | string | `"IfNotPresent"` | UI container image pull policy | -| opencost.ui.image.registry | string | `"quay.io"` | UI container image name | -| opencost.ui.image.repository | string | `"kubecost1/opencost-ui"` | UI container image name | +| opencost.ui.image.registry | string | `"ghcr.io"` | UI container image name | +| opencost.ui.image.repository | string | `"opencost/opencost-ui"` | UI container image name | | opencost.ui.image.tag | string | `""` (use appVersion in Chart.yaml) | UI container image tag | | opencost.ui.ingress.annotations | object | `{}` | Annotations for Ingress resource | | opencost.ui.ingress.enabled | bool | `false` | Ingress for OpenCost UI | diff --git a/charts/opencost/templates/deployment.yaml b/charts/opencost/templates/deployment.yaml index 3b768f2..71cb58d 100644 --- a/charts/opencost/templates/deployment.yaml +++ b/charts/opencost/templates/deployment.yaml @@ -51,7 +51,7 @@ spec: {{- if .Values.opencost.exporter.image.fullImageName }} image: {{ .Values.opencost.exporter.image.fullImageName }} {{- else }} - 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) }}" {{- end}} imagePullPolicy: {{ .Values.opencost.exporter.image.pullPolicy }} args: @@ -210,7 +210,7 @@ spec: {{- if .Values.opencost.ui.image.fullImageName }} image: {{ .Values.opencost.ui.image.fullImageName }} {{- else}} - image: "{{ .Values.opencost.ui.image.registry }}/{{ .Values.opencost.ui.image.repository }}:{{ .Values.opencost.ui.image.tag | default (printf "prod-%s" .Chart.AppVersion) }}" + image: "{{ .Values.opencost.ui.image.registry }}/{{ .Values.opencost.ui.image.repository }}:{{ .Values.opencost.ui.image.tag | default (printf "%s" .Chart.AppVersion) }}" {{- end }} imagePullPolicy: {{ .Values.opencost.ui.image.pullPolicy }} ports: diff --git a/charts/opencost/tests/deployment_test.yaml b/charts/opencost/tests/deployment_test.yaml index f865889..79cd084 100644 --- a/charts/opencost/tests/deployment_test.yaml +++ b/charts/opencost/tests/deployment_test.yaml @@ -13,4 +13,4 @@ tests: pattern: -opencost$ - matchRegex: path: spec.template.spec.containers[0].image - pattern: quay\.io\/kubecost1\/kubecost-cost-model:prod-[0-9]*\.[0-9]*\.[0-9]* + pattern: ghcr\.io\/opencost\/opencost:[0-9]*\.[0-9]*\.[0-9]* diff --git a/charts/opencost/values.yaml b/charts/opencost/values.yaml index b6271d1..97b4112 100644 --- a/charts/opencost/values.yaml +++ b/charts/opencost/values.yaml @@ -91,9 +91,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: "" @@ -308,9 +308,9 @@ opencost: enabled: true image: # -- UI container image registry - registry: quay.io + registry: ghcr.io # -- UI container image name - repository: kubecost1/opencost-ui + repository: opencost/opencost-ui # -- UI container image tag # @default -- `""` (use appVersion in Chart.yaml) tag: ""