fix: use m/charts stable repo

Signed-off-by: Tarun Gupta Akirala <[email protected]>
mesosphere · Jan 3, 2025 · 75f7b89 · 75f7b89
1 parent 05d12e5
commit 75f7b89
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 32 deletions.
diff --git a/apptests/constants/apps.go b/apptests/constants/apps.go
@@ -1,9 +1,11 @@
 package constants
 
 const (
-	CertManager  = "cert-manager"
-	Karma        = "karma"
-	KubeCost     = "kubecost"
+	CertManager = "cert-manager"
+	Karma       = "karma"
+	// KubeCost runs only on the managed clusters (in a lightweight agent mode that depends on the centralized kubecost and a valid object storage configuration).
+	// Centralized kubecost runs only on the management cluster.
+	KubeCost     = "centralized-kubecost"
 	Reloader     = "reloader"
 	Traefik      = "traefik"
 	KarmaTraefik = "karma-traefik"

diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -20,12 +20,6 @@ resources:
       - license_path: LICENSE
         ref: v${image_tag%-debian-12-r0}
         url: https://github.com/thanos-io/thanos
-  - container_image: docker.io/grafana/grafana:11.3.1
-    sources:
-      - license_path: LICENSE
-        notice_path: NOTICE.md
-        ref: v${image_tag}
-        url: https://github.com/grafana/grafana
   - container_image: docker.io/grafana/grafana:11.2.2-security-01
     sources:
       - license_path: LICENSE
@@ -577,11 +571,6 @@ resources:
       - url: https://github.com/opencost/opencost
         ref: v1.112.1
         license_path: LICENSE
-  - container_image: gcr.io/kubecost1/kubecost-modeling:v0.1.18
-    sources:
-      - url: https://github.com/opencost/opencost
-        ref: v1.112.1
-        license_path: LICENSE
   - container_image: gcr.io/kubecost1/frontend:prod-2.5.0
     sources:
       - url: https://github.com/opencost/opencost

diff --git a/services/centralized-kubecost/2.5.0/cosi-storage/cosi-bucket.yaml b/services/centralized-kubecost/2.5.0/cosi-storage/cosi-bucket.yaml
@@ -9,8 +9,7 @@ spec:
       chart: cosi-bucket-kit
       sourceRef:
         kind: HelmRepository
-        name: takirala
-        #name: mesosphere.github.io-charts-stable
+        name: mesosphere.github.io-charts-stable
         namespace: kommander-flux
       version: 0.0.1-alpha.0
   interval: 15s

diff --git a/services/centralized-kubecost/2.5.0/defaults/cm.yaml b/services/centralized-kubecost/2.5.0/defaults/cm.yaml
@@ -114,7 +114,7 @@ data:
         retention: 14d
         image:
           repository: quay.io/prometheus/prometheus
-          tag: v2.55.0
+          tag: v2.55.1
         # If clusterIDConfigmap is defined, instead use user-generated configmap with key CLUSTER_ID
         # to use as unique cluster ID in kubecost cost-analyzer deployment.
         # This overrides the cluster_id set in prometheus.server.global.external_labels.

diff --git a/services/centralized-kubecost/2.5.0/move-to-konvoy/move-to-konvoy-cosi-hr.yaml b/services/centralized-kubecost/2.5.0/move-to-konvoy/move-to-konvoy-cosi-hr.yaml
@@ -1,16 +1,5 @@
----
-# TODO: delete after merging the cosi-bucket-kit chart
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: takirala
-  namespace: kommander-flux
-spec:
-  interval: 10m
-  timeout: 1m
-  url: https://takirala.github.io/charts/stable
----
 # TODO: https://jira.nutanix.com/browse/NCN-104793 and https://jira.nutanix.com/browse/NCN-104743
+# Delete this helm release after merging https://github.com/mesosphere/konvoy2/pull/3474 (and adding a similar change in CAREN)
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -22,10 +11,9 @@ spec:
       chart: cosi
       sourceRef:
         kind: HelmRepository
-        name: takirala
-        # name: mesosphere.github.io-charts-stable
+        name: mesosphere.github.io-charts-stable
         namespace: kommander-flux
-      version: 0.0.1-alpha.2
+      version: 0.0.1-alpha.1
   interval: 15s
   install:
     crds: CreateReplace