Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix-alloy-vpa-value-usage #46

Merged
merged 2 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions helm/alloy/templates/vertical-pod-autoscaler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -18,10 +18,8 @@ spec:
resourcePolicy:
{{- with .containerPolicies }}
containerPolicies:
{{- range . }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}
{{- with .updatePolicy }}
updatePolicy:
Expand Down
115 changes: 115 additions & 0 deletions helm/alloy/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
}
}
}
}
}
2 changes: 1 addition & 1 deletion helm/alloy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ alloy:

verticalPodAutoscaler:
# -- Creates a VerticalPodAutoscaler for the daemonset
enabled: false
enabled: true
QuentinBisson marked this conversation as resolved.
Show resolved Hide resolved

# -- List of recommenders to use for the Vertical Pod Autoscaler.
# Recommenders are responsible for generating recommendation for the object.
Expand Down