[stable/insights-agent] Add enableClosedBeta flag, also make it the c…

…ondition for the VPA subchart (#1448) * add flag to the chart, also make it the condition for the VPA subchart * add check to ensure goldilocks and right-sizer VPAs are not installed together
FairwindsOps · Mar 25, 2024 · 10b86af · 10b86af
1 parent 42751a0
commit 10b86af
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/stable/insights-agent/CHANGELOG.md b/stable/insights-agent/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.0.3
+* add `enableClosedBeta` flag to the `right-sizer` chart, also make it the condition for the VPA subchart
+
 ## 4.0.2
 * update nova to v3.8.0
 

diff --git a/stable/insights-agent/Chart.yaml b/stable/insights-agent/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to run the Fairwinds Insights agent
 name: insights-agent
-version: 4.0.2
+version: 4.0.3
 appVersion: 9.2.1
 kubeVersion: ">= 1.22.0-0"
 icon: https://raw.githubusercontent.com/FairwindsOps/charts/master/stable/insights-agent/icon.png

diff --git a/stable/insights-agent/requirements.yaml b/stable/insights-agent/requirements.yaml
@@ -19,5 +19,5 @@ dependencies:
 - name: vpa
   version: '4.4.5'
   repository: https://charts.fairwinds.com/stable
-  condition: right-sizer.enabled
+  condition: right-sizer.enableClosedBeta
   alias: right-sizer-vpa
diff --git a/stable/insights-agent/templates/right-sizer/configmap.yaml b/stable/insights-agent/templates/right-sizer/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if (index .Values "right-sizer" "enabled") }}
+{{- if and (index .Values "right-sizer" "enabled") (index .Values "right-sizer" "enableClosedBeta") }}
 {{- with (index .Values "right-sizer" "config") }}
 apiVersion: v1
 kind: ConfigMap

diff --git a/stable/insights-agent/templates/right-sizer/controller-deployment.yaml b/stable/insights-agent/templates/right-sizer/controller-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if (index .Values "right-sizer" "enabled") }}
+{{- if and (index .Values "right-sizer" "enabled") (index .Values "right-sizer" "enableClosedBeta") }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/stable/insights-agent/templates/vpa-conflict-check.yaml b/stable/insights-agent/templates/vpa-conflict-check.yaml
@@ -0,0 +1,3 @@
+{{- if and (index .Values "right-sizer" "enableClosedBeta") (.Values.goldilocks.installVPA) }}
+{{- fail "Cannot install VPA for both right-sizer and goldilocks in insights-agent" }}
+{{- end }}
diff --git a/stable/insights-agent/values.yaml b/stable/insights-agent/values.yaml
@@ -454,6 +454,7 @@ cloudcosts:
 # requires a custom VPA configuration to work properly, see `right-sizer-vpa` section below in this values file
 right-sizer:
   enabled: false
+  enableClosedBeta: false
   image:
     repository: quay.io/fairwinds/insights-right-sizer
     tag: v0.0.2-dev