fix-alloy-vpa-value-usage (#46)

* fix-alloy-vpa-value-usage * Update helm/alloy/values.yaml
giantswarm · Sep 3, 2024 · 2d91891 · 2d91891
1 parent e4e68c1
commit 2d91891
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 3 deletions.
diff --git 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
+
+- Fix incorrect value path in vertical pod autoscaler.
+
 ## [0.5.0] - 2024-09-02
 
 ### Added

diff --git a/helm/alloy/templates/vertical-pod-autoscaler.yaml b/helm/alloy/templates/vertical-pod-autoscaler.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: availability
 spec:
-  {{- with .Values.verticalPodAutoscaler.vertical }}
+  {{- with .Values.verticalPodAutoscaler }}
   {{- with .recommenders }}
   recommenders:
     {{- toYaml . | nindent 4 }}
@@ -18,10 +18,8 @@ spec:
   resourcePolicy:
     {{- with .containerPolicies }}
     containerPolicies:
-    {{- range . }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- end }}
   {{- end }}
   {{- with .updatePolicy }}
   updatePolicy:

diff --git a/helm/alloy/values.schema.json b/helm/alloy/values.schema.json
@@ -17,6 +17,52 @@
                         "extraSecretEnv": {
                             "type": "array"
                         },
+                        "mounts": {
+                            "type": "object",
+                            "properties": {
+                                "extra": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "object",
+                                        "properties": {
+                                            "mountPath": {
+                                                "type": "string"
+                                            },
+                                            "name": {
+                                                "type": "string"
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "resources": {
+                            "type": "object",
+                            "properties": {
+                                "limits": {
+                                    "type": "object",
+                                    "properties": {
+                                        "cpu": {
+                                            "type": "string"
+                                        },
+                                        "memory": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
+                                "requests": {
+                                    "type": "object",
+                                    "properties": {
+                                        "cpu": {
+                                            "type": "string"
+                                        },
+                                        "memory": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            }
+                        },
                         "securityContext": {
                             "type": "object",
                             "properties": {
@@ -110,6 +156,30 @@
                         }
                     }
                 },
+                "controller": {
+                    "type": "object",
+                    "properties": {
+                        "volumes": {
+                            "type": "object",
+                            "properties": {
+                                "extra": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "object",
+                                        "properties": {
+                                            "emptyDir": {
+                                                "type": "object"
+                                            },
+                                            "name": {
+                                                "type": "string"
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
                 "enabled": {
                     "type": "boolean"
                 },
@@ -173,6 +243,51 @@
                     "type": "string"
                 }
             }
+        },
+        "verticalPodAutoscaler": {
+            "type": "object",
+            "properties": {
+                "enabled": {
+                    "type": "boolean"
+                },
+                "recommenders": {
+                    "type": "array"
+                },
+                "resourcePolicy": {
+                    "type": "object",
+                    "properties": {
+                        "containerPolicies": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "containerName": {
+                                        "type": "string"
+                                    },
+                                    "controlledResources": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "controlledValues": {
+                                        "type": "string"
+                                    },
+                                    "maxAllowed": {
+                                        "type": "object"
+                                    },
+                                    "minAllowed": {
+                                        "type": "object"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "updatePolicy": {
+                    "type": "null"
+                }
+            }
         }
     }
 }