Fix up charts

jetstack · Aug 19, 2024 · 77212fc · 77212fc
1 parent 68057fe
commit 77212fc
Show file tree

Hide file tree

Showing 9 changed files with 425 additions and 373 deletions.
diff --git a/chart/Chart.lock b/chart/Chart.lock
@@ -1,27 +1,36 @@
 dependencies:
 - name: vpatron
-  repository: file://../../vpatron/chart/
+  repository: file://../../finops-toolkit/vpatron/chart/
   version: v0.0.5
 - name: autospot
-  repository: file://../../autospot/chart/
+  repository: file://../../finops-toolkit/autospot/chart/
   version: v0.0.5
 - name: limit-ranger
-  repository: file://../../limit-ranger/chart/
+  repository: file://../../finops-toolkit/limit-ranger/chart/
   version: v0.0.5
 - name: office-hours
-  repository: file://../../office-hours/chart/
+  repository: file://../../finops-toolkit/office-hours/chart/
   version: v0.0.5
+- name: prometheus-opencost-exporter
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 0.1.1
+- name: opencost
+  repository: https://opencost.github.io/opencost-helm-chart
+  version: 1.41.0
 - name: kyverno
   repository: https://kyverno.github.io/kyverno/
   version: 3.2.6
 - name: finops-policies
-  repository: file://../../finops-policies/chart/
+  repository: file://../../finops-toolkit/finops-policies/chart/
   version: v0.0.5
 - name: vpa
   repository: https://charts.fairwinds.com/stable
   version: 4.5.0
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 8.4.1
-digest: sha256:c652c255c5ee0273c90708b220340debf6a7669f8aec29a8d421be44c92af40a
-generated: "2024-08-08T13:50:34.800366+01:00"
+  version: 8.4.4
+- name: finops-dashboards
+  repository: file://../../finops-toolkit/finops-dashboards/chart/
+  version: 0.1.0
+digest: sha256:7fc5a075027ea2d9e13fc40e1d6f996a178a16dcc637b890824a7215113693cc
+generated: "2024-08-15T17:39:39.63753+01:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -1,7 +1,6 @@
 apiVersion: v2
 name: finops-stack
 description: A FinOps Stack for Kubernetes
-
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
@@ -11,66 +10,65 @@ description: A FinOps Stack for Kubernetes
 # a dependency of application charts to inject those utilities and functions into the rendering
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 version: v0.0.5
-
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "0.0.3"
-
 dependencies:
-  - name: vpatron
-    version: "~0.0.0"
-    condition: feature.vpatron
-    # repository: https://charts.jetstack.io
-    repository: file://../../finops-toolkit/vpatron/chart/
-  - name: autospot
-    version: "~0.0.0"
-    condition: feature.autospot
-    # repository: https://charts.jetstack.io
-    repository: file://../../finops-toolkit/autospot/chart/
-  - name: limit-ranger
-    version: "~0.0.0"
-    condition: feature.limit-ranger
-    # repository: https://charts.jetstack.io
-    repository: file://../../finops-toolkit/limit-ranger/chart/
-  - name: office-hours
-    version: "~> 0.0.0"
-    condition: feature.office-hours
-    # repository: https://charts.jetstack.io
-    repository: file://../../finops-toolkit/office-hours/chart/
-
-  # OpenCost
-  - name: prometheus-opencost-exporter
-    version: "~> 0.1.1"
-    condition: feature.opencost-exporter
-    repository: https://prometheus-community.github.io/helm-charts
-  - name: opencost
-    version: "~> 1.41.0"
-    condition: feature.opencost
-    repository: https://opencost.github.io/opencost-helm-chart
-
-  # Kyverno
-  - name: kyverno
-    version: "*"
-    condition: feature.kyverno
-    repository: https://kyverno.github.io/kyverno/
-  - name: finops-policies
-    version: "*"
-    condition: feature.finops-policies
-    repository: https://charts.jetstack.io
-
-  - name: vpa
-    version: "4.5.0"
-    condition: feature.vpa
-    repository: https://charts.fairwinds.com/stable
-
-  - name: grafana
-    version: "8.4.0"
-    condition: feature.grafana
-    repository: https://grafana.github.io/helm-charts
+    - name: vpatron
+      version: "~0.0.0"
+      condition: feature.vpatron
+      # repository: https://charts.jetstack.io
+      repository: file://../../finops-toolkit/vpatron/chart/
+    - name: autospot
+      version: "~0.0.0"
+      condition: feature.autospot
+      # repository: https://charts.jetstack.io
+      repository: file://../../finops-toolkit/autospot/chart/
+    - name: limit-ranger
+      version: "~0.0.0"
+      condition: feature.limit-ranger
+      # repository: https://charts.jetstack.io
+      repository: file://../../finops-toolkit/limit-ranger/chart/
+    - name: office-hours
+      version: "~> 0.0.0"
+      condition: feature.office-hours
+      # repository: https://charts.jetstack.io
+      repository: file://../../finops-toolkit/office-hours/chart/
+    # OpenCost
+    - name: prometheus-opencost-exporter
+      version: "*"
+      condition: feature.opencost-exporter
+      repository: https://prometheus-community.github.io/helm-charts
+    - name: opencost
+      version: "~> 1.41.0"
+      condition: feature.opencost
+      repository: https://opencost.github.io/opencost-helm-chart
+    # Kyverno
+    - name: kyverno
+      version: "3.2.6"
+      condition: feature.kyverno
+      repository: https://kyverno.github.io/kyverno/
+    - name: finops-policies
+      version: "*"
+      condition: feature.finops-policies
+      # repository: https://charts.jetstack.io
+      repository: file://../../finops-toolkit/finops-policies/chart/
+    - name: vpa
+      version: "4.5.0"
+      condition: feature.vpa
+      repository: https://charts.fairwinds.com/stable
+    - name: grafana
+      version: "8.4.4"
+      condition: feature.grafana
+      repository: https://grafana.github.io/helm-charts
+    - name: finops-dashboards
+      version: "*"
+      condition: feature.finops-dashboards
+      # repository: https://charts.jetstack.io
+      repository: file://../../finops-toolkit/finops-dashboards/chart/
diff --git a/chart/cloud-integration.json b/chart/cloud-integration.json
@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "jetstack-david",
+  "private_key_id": "78e91aee7a823d5bc2fa1f08e8d2dfe942857620",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC3YtG7peWpitOL\nqo6EvGZI4OnxRVB6OvsBHcw4kSGYbxw7t8QdI46sQBjNRUlCnALPxeiTZK4a8xYj\nXF2d8crvN309qAS/+GfnfopTIxFbaRNtTc9zhFTpwVmWExpotrGh5TDO3NU7o0tf\nJkm6jYMF+tg6GMUZiHvWsWDXhZPK/vJ8LjuI2+VIlrYYPFOoFuEl7Z0i4QO8tFPm\nvd9UycwhDy1SS47SZSzB/H4QSrKPoCeK6jeEwppcMHUnMFbnbOmd85luHUByA3fC\n1GQxe5/OLT76k4QhIyEYpeq01sGv/Yjt0LYt3abu39rKRc3RdLOFm3MF18+XspLM\nxlPG4q39AgMBAAECggEACEyqnUl2yWOFC28eoBc+sdGsBMVUTRPaRESq92xqDtII\nfxNkBsWTMWx9Mt0N4bvZzLlyOyl1T7bsq5EEk59bxdPHEUFHZcDCQxHRBM4zfOWW\ngX3iA6JbjXC4szgOG+sYwvDycopABEDxqk67S3wYD+84VfjFAtDQefjxHw/mjmtD\nrrsE7BZF+dRTLIcsTE4tDeFu+WxeCoFYA+jLL3FDpi4ADFhA5F9mDY3rtN352Mc1\ng7xjO1J4JDqBGcJjSg9XEk7Pk1c4742SnoBYoEy+38hlggKbQ5+LeNj4+xPm0XsU\nHpYQBskPWQGvLlz5orwEkUjD5DJWJNlzx/NDJLpnAQKBgQDuSju2G9A2vz8GmRDV\n+BaLNyK8SLjIedD7SrzX+Gpd5wL+W1/lAx+uf7Ub0YK+xWLLTk2PXbeChQXOKOKY\njzFXoV0HdGRO2yhqJW9LtHrIsAuKrbrR8u789X9T662Fpy3TlgVU5PJqbuuJoDie\noHygjae4euZjgtd7sTJiBT9jHQKBgQDFA/gTOgTFfIreNDi2LiXZo6jMPG++YSZz\nmmFuOUqfIIeW2pWXHMEN+L5ihcGtH0BxNxiwdqX7eFc/OWKKWLI8vcN2V7uui2st\nt2CuyYeOvjdX6Wfc+J7meh1IPOo8btcqaQqB1mBDZiT7BXEiGNTrU1PHO9ytk2xi\nbEaDy9ygYQKBgFpnj3/nzXb319GJAPosxWDL6kHE1VY54S91i2/kr3YwztHxmNAp\n/zsU+IE1W4VFHdZEPujFhXnfPfSZTl7S9MVqUwEhB21jeFHNIgx2zJ6XK8nRX6+H\nm2QdP9F2+L5cTuaXZC5xLgdzTalJQDHucVn4ZEl5Vy8p1Nb4w0Ss+P+BAoGAUZEE\nGwmxQgX/BGIAfMR8XS/ZybzX0q0sGz52SgkkMN9p43XZ6vc3ok4ynF2eQsumhXj3\nGs/0hjlbfcyHVJnGKUmzbAKErI4CMKo0OAktu1ZbWWVD4AN63hb+mpLFs4F8SY21\nkO2taxoWA2tMXH6FYGxeSiUphx97BwCm7Rfw3uECgYBoLUnb4pvJTp0k6ux38GGh\ndXkI6M5VicQP9JGkX7CIoXPjIeF0xfQ+Tl0hCBWoVFsGElO9JIiPJxYYThA6FcFs\nyAoL2f3ofa7Y+xYAydvsxEEft78I2ysuSv4V7A1fy7as0oxxzlKYITaF8pNB8xsS\nL0eDTdinPdLwSDPRT/W9Ew==\n-----END PRIVATE KEY-----\n",
+  "client_email": "[email protected]",
+  "client_id": "107872192335592257166",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/compute-viewer-opencost%40jetstack-david.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
diff --git a/chart/templates/opencost/gmp.opencost-exporter-podmonitoring.yaml b/chart/templates/opencost/gmp.opencost-exporter-podmonitoring.yaml
@@ -0,0 +1,16 @@
+{{ if and .Values.gke .Values.gke.podmonitoring (get .Values.feature "opencost-exporter") }}
+---
+apiVersion: monitoring.googleapis.com/v1
+kind: PodMonitoring
+metadata:
+  name: opencost-exporter
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: prometheus-opencost-exporter
+  endpoints:
+  - port: http
+    interval: 60s
+  targetLabels:
+    metadata: []
+{{end}}
diff --git a/chart/templates/opencost/gmp.opencost-podmonitoring.yaml b/chart/templates/opencost/gmp.opencost-podmonitoring.yaml
@@ -0,0 +1,16 @@
+{{ if and .Values.gke .Values.gke.podmonitoring .Values.feature.opencost }}
+---
+apiVersion: monitoring.googleapis.com/v1
+kind: PodMonitoring
+metadata:
+  name: opencost
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opencost
+  endpoints:
+  - port: http
+    interval: 60s
+  targetLabels:
+    metadata: []
+{{end}}
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -10,11 +10,13 @@ feature:
   # -- Enable / Disable the installation of Kyverno
   kyverno: true
   # -- Enable / Disable the installation of Kyverno FinOps Policies
-  finops-policies: false
+  finops-policies: true
   # -- Enable / Disable the installation of the VPA Controller
   vpa: false
   # -- Enable / Disable the installation of the Grafana
   grafana: true
+  # -- Enable / Disable the installation of Grafana FinOps Dashboards
+  finops-dashboards: true
   # -- Enable / Disable the installation of OpenCost
   opencost: true
   # -- Enable / Disable the installation of OpenCost Exporter
@@ -62,6 +64,20 @@ vpa:
 #   image:
 #     tag: main
 
+# @ignore
+kyverno:
+  reportsController:
+    rbac:
+      clusterRole:
+        extraResources:
+          - apiGroups: [events.k8s.io]
+            resources: ["events"]
+            verbs: [create]
+  grafana:
+    enabled: true
+    labels:
+      grafana_dashboard: "finops"
+
 # @ignored
 grafana:
   rbac:
@@ -89,3 +105,13 @@ grafana:
   sidecar:
     dashboards:
       enabled: true
+      labelValue: finops
+
+# @ignored
+prometheus-opencost-exporter:
+  podSecurityContext:
+    fsGroup: 2000
+  opencost:
+    prometheus:
+      amp: {}
+      thanos: {}
diff --git a/scripts/chart-dep-updater.go b/scripts/chart-dep-updater.go
@@ -2,15 +2,16 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+
 	"gopkg.in/yaml.v3"
+
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/cli"
 	"helm.sh/helm/v3/pkg/downloader"
@@ -48,7 +49,7 @@ func run(cmd *cobra.Command, args []string) {
 	chartPath := args[0]
 
 	// Load the Chart.yaml using yaml.Node to preserve structure
-	content, err := ioutil.ReadFile(chartPath)
+	content, err := os.ReadFile(chartPath)
 	if err != nil {
 		logger.Fatalf("Error reading Chart.yaml: %v", err)
 	}