From 979672d11cd8275f75aab3eb3e3059774176e1d0 Mon Sep 17 00:00:00 2001
From: Laszlo Uveges <laszlo@giantswarm.io>
Date: Tue, 26 Sep 2023 15:57:58 +0200
Subject: [PATCH] Make cluster.proxy settings empty string by default (#1026)

---
 CHANGELOG.md                           |  4 ++++
 helm/chart-operator/values.schema.json | 12 ++++++------
 helm/chart-operator/values.yaml        | 12 ++++++------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45c9206db..00a263570 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed default values for `.proxy` and `.cluster.proxy` values and updated Helm values schema accordingly.
+
 ## [2.35.1] - 2023-09-21
 
 ### Changed
diff --git a/helm/chart-operator/values.schema.json b/helm/chart-operator/values.schema.json
index 71c411d27..05005ec41 100644
--- a/helm/chart-operator/values.schema.json
+++ b/helm/chart-operator/values.schema.json
@@ -41,13 +41,13 @@
                     "type": "object",
                     "properties": {
                         "http": {
-                            "type": "null"
+                            "type": "string"
                         },
                         "https": {
-                            "type": "null"
+                            "type": "string"
                         },
                         "noProxy": {
-                            "type": "null"
+                            "type": "string"
                         }
                     }
                 }
@@ -210,13 +210,13 @@
             "type": "object",
             "properties": {
                 "http": {
-                    "type": "null"
+                    "type": "string"
                 },
                 "https": {
-                    "type": "null"
+                    "type": "string"
                 },
                 "noProxy": {
-                    "type": "null"
+                    "type": "string"
                 }
             }
         },
diff --git a/helm/chart-operator/values.yaml b/helm/chart-operator/values.yaml
index c1cb09a87..af38f1498 100644
--- a/helm/chart-operator/values.yaml
+++ b/helm/chart-operator/values.yaml
@@ -9,9 +9,9 @@ cluster:
   # is getting overwritten by the top level proxy if set
   # These values are generated via cluster-apps-operator
   proxy:
-    noProxy:
-    http:
-    https:
+    noProxy: ""
+    http: ""
+    https: ""
 
 clusterDNSIP: 172.31.0.10
 
@@ -60,9 +60,9 @@ project:
 
 # set the HTTP_PROXY, HTTPS_PROXY and NO_PROXY variable
 proxy:
-  noProxy:
-  http:
-  https:
+  noProxy: ""
+  http: ""
+  https: ""
 
 # Resource names are truncated to 47 characters. Kubernetes allows 63 characters
 # limit for resource names. When pods for deployments are created they have