From 6bb6471a2e4d0540e1d00f1a851ea0fd04b512a5 Mon Sep 17 00:00:00 2001 From: Grace Do Date: Wed, 16 Nov 2022 14:41:36 -0800 Subject: [PATCH] feat: Bump kubecost (#822) * feat: Bump kubecost * chore: Bump prometheus in licenses --- licenses.d2iq.yaml | 6 +++--- .../{0.28.0 => 0.29.0}/defaults/cm.yaml | 2 +- .../{0.28.0 => 0.29.0}/defaults/kustomization.yaml | 0 .../{0.28.0 => 0.29.0}/kustomization.yaml | 0 .../{0.28.0 => 0.29.0}/post-install-jobs.yaml | 2 +- .../post-install-jobs/post-install-jobs.yaml | 0 .../centralized-kubecost/{0.28.0 => 0.29.0}/release.yaml | 2 +- .../{0.28.0 => 0.29.0}/release/release.yaml | 4 ++-- services/kommander/0.5.0/defaults/cm.yaml | 6 +++--- services/kubecost/{0.28.0 => 0.29.0}/defaults/cm.yaml | 2 +- .../kubecost/{0.28.0 => 0.29.0}/defaults/kustomization.yaml | 0 services/kubecost/{0.28.0 => 0.29.0}/kubecost.yaml | 4 ++-- services/kubecost/{0.28.0 => 0.29.0}/kustomization.yaml | 0 13 files changed, 14 insertions(+), 14 deletions(-) rename services/centralized-kubecost/{0.28.0 => 0.29.0}/defaults/cm.yaml (98%) rename services/centralized-kubecost/{0.28.0 => 0.29.0}/defaults/kustomization.yaml (100%) rename services/centralized-kubecost/{0.28.0 => 0.29.0}/kustomization.yaml (100%) rename services/centralized-kubecost/{0.28.0 => 0.29.0}/post-install-jobs.yaml (88%) rename services/centralized-kubecost/{0.28.0 => 0.29.0}/post-install-jobs/post-install-jobs.yaml (100%) rename services/centralized-kubecost/{0.28.0 => 0.29.0}/release.yaml (88%) rename services/centralized-kubecost/{0.28.0 => 0.29.0}/release/release.yaml (98%) rename services/kubecost/{0.28.0 => 0.29.0}/defaults/cm.yaml (98%) rename services/kubecost/{0.28.0 => 0.29.0}/defaults/kustomization.yaml (100%) rename services/kubecost/{0.28.0 => 0.29.0}/kubecost.yaml (97%) rename services/kubecost/{0.28.0 => 0.29.0}/kustomization.yaml (100%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 8cc0b8e77..bc29810de 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -260,12 +260,12 @@ resources: - url: https://github.com/brancz/kube-rbac-proxy ref: ${image_tag} license_path: LICENSE - - container_image: gcr.io/kubecost1/cost-model:prod-1.97.0 + - container_image: gcr.io/kubecost1/cost-model:prod-1.98.0 sources: - url: https://github.com/opencost/opencost ref: v${image_tag#prod-} license_path: LICENSE - - container_image: gcr.io/kubecost1/frontend:prod-1.97.0 + - container_image: gcr.io/kubecost1/frontend:prod-1.98.0 sources: - url: https://github.com/opencost/opencost ref: v${image_tag#prod-} @@ -375,7 +375,7 @@ resources: ref: ${image_tag} license_path: LICENSE notice_path: NOTICE - - container_image: quay.io/prometheus/prometheus:v2.19.2 + - container_image: quay.io/prometheus/prometheus:v2.35.0 sources: - url: https://github.com/prometheus/prometheus ref: ${image_tag} diff --git a/services/centralized-kubecost/0.28.0/defaults/cm.yaml b/services/centralized-kubecost/0.29.0/defaults/cm.yaml similarity index 98% rename from services/centralized-kubecost/0.28.0/defaults/cm.yaml rename to services/centralized-kubecost/0.29.0/defaults/cm.yaml index 12612b1c7..a8bf33ed2 100644 --- a/services/centralized-kubecost/0.28.0/defaults/cm.yaml +++ b/services/centralized-kubecost/0.29.0/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: centralized-kubecost-0.28.0-d2iq-defaults + name: centralized-kubecost-0.29.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/centralized-kubecost/0.28.0/defaults/kustomization.yaml b/services/centralized-kubecost/0.29.0/defaults/kustomization.yaml similarity index 100% rename from services/centralized-kubecost/0.28.0/defaults/kustomization.yaml rename to services/centralized-kubecost/0.29.0/defaults/kustomization.yaml diff --git a/services/centralized-kubecost/0.28.0/kustomization.yaml b/services/centralized-kubecost/0.29.0/kustomization.yaml similarity index 100% rename from services/centralized-kubecost/0.28.0/kustomization.yaml rename to services/centralized-kubecost/0.29.0/kustomization.yaml diff --git a/services/centralized-kubecost/0.28.0/post-install-jobs.yaml b/services/centralized-kubecost/0.29.0/post-install-jobs.yaml similarity index 88% rename from services/centralized-kubecost/0.28.0/post-install-jobs.yaml rename to services/centralized-kubecost/0.29.0/post-install-jobs.yaml index a02f78799..14ad7af7d 100644 --- a/services/centralized-kubecost/0.28.0/post-install-jobs.yaml +++ b/services/centralized-kubecost/0.29.0/post-install-jobs.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/centralized-kubecost/0.28.0/post-install-jobs + path: ./services/centralized-kubecost/0.29.0/post-install-jobs dependsOn: - name: centralized-kubecost-release sourceRef: diff --git a/services/centralized-kubecost/0.28.0/post-install-jobs/post-install-jobs.yaml b/services/centralized-kubecost/0.29.0/post-install-jobs/post-install-jobs.yaml similarity index 100% rename from services/centralized-kubecost/0.28.0/post-install-jobs/post-install-jobs.yaml rename to services/centralized-kubecost/0.29.0/post-install-jobs/post-install-jobs.yaml diff --git a/services/centralized-kubecost/0.28.0/release.yaml b/services/centralized-kubecost/0.29.0/release.yaml similarity index 88% rename from services/centralized-kubecost/0.28.0/release.yaml rename to services/centralized-kubecost/0.29.0/release.yaml index 6ac56183a..891c19c7e 100644 --- a/services/centralized-kubecost/0.28.0/release.yaml +++ b/services/centralized-kubecost/0.29.0/release.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/centralized-kubecost/0.28.0/release + path: ./services/centralized-kubecost/0.29.0/release sourceRef: kind: GitRepository name: management diff --git a/services/centralized-kubecost/0.28.0/release/release.yaml b/services/centralized-kubecost/0.29.0/release/release.yaml similarity index 98% rename from services/centralized-kubecost/0.28.0/release/release.yaml rename to services/centralized-kubecost/0.29.0/release/release.yaml index 01fba4933..db09e642d 100644 --- a/services/centralized-kubecost/0.28.0/release/release.yaml +++ b/services/centralized-kubecost/0.29.0/release/release.yaml @@ -15,7 +15,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-charts-stable namespace: kommander-flux - version: "0.28.0" + version: "0.29.0" interval: 15s install: crds: CreateReplace @@ -29,7 +29,7 @@ spec: releaseName: centralized-kubecost valuesFrom: - kind: ConfigMap - name: centralized-kubecost-0.28.0-d2iq-defaults + name: centralized-kubecost-0.29.0-d2iq-defaults targetNamespace: kubecost --- apiVersion: v1 diff --git a/services/kommander/0.5.0/defaults/cm.yaml b/services/kommander/0.5.0/defaults/cm.yaml index f79d0e64a..302b53187 100644 --- a/services/kommander/0.5.0/defaults/cm.yaml +++ b/services/kommander/0.5.0/defaults/cm.yaml @@ -65,8 +65,8 @@ data: tag: ${kommanderLicensingControllerWebhookImageTag} repository: ${kommanderLicensingControllerWebhookImageRepository} defaultEnterpriseApps: - centralized-kubecost: "0.28.0" - kubecost: "0.28.0" + centralized-kubecost: "0.29.0" + kubecost: "0.29.0" kubecost-thanos-traefik: "0.0.1" centralized-grafana: "40.0.0" karma: "2.0.1" @@ -91,7 +91,7 @@ data: reloader: "0.0.124" traefik: "10.30.1" kubernetes-dashboard: "5.11.0" - kubecost: "0.28.0" + kubecost: "0.29.0" kube-prometheus-stack: "40.0.0" prometheus-adapter: "3.4.2" prometheus-thanos-traefik: "0.0.1" diff --git a/services/kubecost/0.28.0/defaults/cm.yaml b/services/kubecost/0.29.0/defaults/cm.yaml similarity index 98% rename from services/kubecost/0.28.0/defaults/cm.yaml rename to services/kubecost/0.29.0/defaults/cm.yaml index f3adffaf8..29710d815 100644 --- a/services/kubecost/0.28.0/defaults/cm.yaml +++ b/services/kubecost/0.29.0/defaults/cm.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kubecost-0.28.0-d2iq-defaults + name: kubecost-0.29.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/kubecost/0.28.0/defaults/kustomization.yaml b/services/kubecost/0.29.0/defaults/kustomization.yaml similarity index 100% rename from services/kubecost/0.28.0/defaults/kustomization.yaml rename to services/kubecost/0.29.0/defaults/kustomization.yaml diff --git a/services/kubecost/0.28.0/kubecost.yaml b/services/kubecost/0.29.0/kubecost.yaml similarity index 97% rename from services/kubecost/0.28.0/kubecost.yaml rename to services/kubecost/0.29.0/kubecost.yaml index c900ccf4a..4613d145e 100644 --- a/services/kubecost/0.28.0/kubecost.yaml +++ b/services/kubecost/0.29.0/kubecost.yaml @@ -15,7 +15,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-charts-stable namespace: kommander-flux - version: "0.28.0" + version: "0.29.0" interval: 15s install: crds: CreateReplace @@ -29,7 +29,7 @@ spec: releaseName: kubecost valuesFrom: - kind: ConfigMap - name: kubecost-0.28.0-d2iq-defaults + name: kubecost-0.29.0-d2iq-defaults targetNamespace: ${releaseNamespace} --- apiVersion: v1 diff --git a/services/kubecost/0.28.0/kustomization.yaml b/services/kubecost/0.29.0/kustomization.yaml similarity index 100% rename from services/kubecost/0.28.0/kustomization.yaml rename to services/kubecost/0.29.0/kustomization.yaml