From 311c80158eac4067f779d73b654ec5ecfe0050a9 Mon Sep 17 00:00:00 2001
From: QuentinBisson <quentin@giantswarm.io>
Date: Wed, 15 Nov 2023 10:43:27 +0100
Subject: [PATCH] Extend prometheus-operator-app timeout

---
 CHANGELOG.md                                  |  4 ++
 helm/observability-bundle/templates/apps.yaml |  4 +-
 helm/observability-bundle/values.schema.json  | 46 +++++++++++++++++++
 helm/observability-bundle/values.yaml         |  1 +
 4 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1c4c6..1dcfc3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Extend `prometheus-operator-app` timeout to avoid race condition with VPA causing the app to be stuck in `pending-install` state.
+
 ## [0.10.0] - 2023-11-08
 
 ### Changed
diff --git a/helm/observability-bundle/templates/apps.yaml b/helm/observability-bundle/templates/apps.yaml
index 65af828..a292a62 100644
--- a/helm/observability-bundle/templates/apps.yaml
+++ b/helm/observability-bundle/templates/apps.yaml
@@ -31,9 +31,9 @@ spec:
   {{- end }}
   install:
     skipCRDs: {{.skipCRDs | default false }}
-    timeout: 10m
+    timeout: {{ .timeout | default "10m" }}
   upgrade: 
-    timeout: 10m
+    timeout: {{ .timeout | default "10m" }}
   kubeConfig:
     ## Vintage MCs do not have a kubeconfig secret
     {{- if eq $.Release.Namespace "giantswarm" }}
diff --git a/helm/observability-bundle/values.schema.json b/helm/observability-bundle/values.schema.json
index 30dbdaf..c2c1e85 100644
--- a/helm/observability-bundle/values.schema.json
+++ b/helm/observability-bundle/values.schema.json
@@ -5,6 +5,49 @@
         "apps": {
             "type": "object",
             "properties": {
+                "grafanaAgent": {
+                    "type": "object",
+                    "properties": {
+                        "appName": {
+                            "type": "string"
+                        },
+                        "catalog": {
+                            "type": "string"
+                        },
+                        "chartName": {
+                            "type": "string"
+                        },
+                        "enabled": {
+                            "type": "boolean"
+                        },
+                        "extraConfigs": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "kind": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "namespace": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        },
+                        "namespace": {
+                            "type": "string"
+                        },
+                        "userConfig": {
+                            "type": "object"
+                        },
+                        "version": {
+                            "type": "string"
+                        }
+                    }
+                },
                 "prometheus-agent": {
                     "type": "object",
                     "properties": {
@@ -92,6 +135,9 @@
                         "skipCRDs": {
                             "type": "boolean"
                         },
+                        "timeout": {
+                            "type": "string"
+                        },
                         "userConfig": {
                             "type": "object"
                         },
diff --git a/helm/observability-bundle/values.yaml b/helm/observability-bundle/values.yaml
index efe3163..e85a47b 100644
--- a/helm/observability-bundle/values.yaml
+++ b/helm/observability-bundle/values.yaml
@@ -33,6 +33,7 @@ apps:
     enabled: true
     namespace: kube-system
     skipCRDs: true
+    timeout: 15m
     # used by renovate
     # repo: giantswarm/prometheus-operator-app
     version: 6.2.1