feat: upgrade to kubecost v2

Signed-off-by: Tarun Gupta Akirala <[email protected]>
mesosphere · Dec 22, 2024 · adfdd5e · adfdd5e
1 parent fad9ae9
commit adfdd5e
Show file tree

Hide file tree

Showing 31 changed files with 878 additions and 532 deletions.
diff --git a/common/helm-repositories/kubecost.yaml b/common/helm-repositories/kubecost.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: kubecost
+  namespace: kommander-flux
+spec:
+  interval: 10m
+  timeout: 1m
+  url: "${helmMirrorURL:=https://kubecost.github.io/cost-analyzer/}"
diff --git a/common/helm-repositories/kustomization.yaml b/common/helm-repositories/kustomization.yaml
@@ -13,6 +13,7 @@ resources:
   - kommander-ui.yaml
   - kommander.yaml
   - kube-logging.yaml
+  - kubecost.yaml
   - kubefed.yaml
   - kubetunnel.yaml
   - mesosphere-repos.yaml

diff --git a/hack/list-images.sh b/hack/list-images.sh
@@ -78,6 +78,7 @@ declare -rx releaseNamespace=unused \
             tfaName=unused \
             notPopulatedAnywhereAsThisIsOnlyForAirgappedBundle=unused \
             caIssuerName=unused \
+            CLUSTER_ID=unused \
             kommanderChartVersion="${kommanderChartVersion:-}"
 
 IMAGES_FILE="$(realpath "$(mktemp .helm-list-images-XXXXXX)")"

diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -572,15 +572,15 @@ resources:
       - url: https://github.com/mirror/busybox
         ref: master
         license_path: LICENSE
-  - container_image: gcr.io/kubecost1/cost-model:prod-1.108.1
+  - container_image: gcr.io/kubecost1/cost-model:prod-2.5.0
     sources:
       - url: https://github.com/opencost/opencost
-        ref: v${image_tag#prod-}
+        ref: v1.112.1
         license_path: LICENSE
-  - container_image: ghcr.io/mesosphere/dkp-container-images/gcr.io/kubecost1/frontend:prod-1.108.1-d2iq.0
+  - container_image: gcr.io/kubecost1/frontend:prod-2.5.0
     sources:
       - url: https://github.com/opencost/opencost
-        ref: v1.108.1
+        ref: v1.112.1
         license_path: LICENSE
   - container_image: registry.k8s.io/pause:3.10
     sources:

diff --git a/services/centralized-kubecost/0.37.8/defaults/cm.yaml b/services/centralized-kubecost/0.37.8/defaults/cm.yaml
diff --git a/services/centralized-kubecost/0.37.8/release/release.yaml b/services/centralized-kubecost/0.37.8/release/release.yaml
diff --git a/services/centralized-kubecost/2.5.0/cosi-storage.yaml b/services/centralized-kubecost/2.5.0/cosi-storage.yaml
@@ -0,0 +1,23 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: kubecost-cosi-storage
+  namespace: ${releaseNamespace}
+spec:
+  force: true
+  prune: true
+  wait: true
+  interval: 6h
+  retryInterval: 1m
+  path: ./services/centralized-kubecost/2.5.0/cosi-storage
+  sourceRef:
+    kind: GitRepository
+    name: management
+    namespace: kommander-flux
+  timeout: 1m
+  dependsOn:
+    - name: todo-move-to-konvoy
+      namespace: ${releaseNamespace}
+  postBuild:
+    substitute:
+      releaseNamespace: ${releaseNamespace}