Skip to content

feat(t8s-cluster): make apiserver resources configurable #1485

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.

Sign up for GitHub

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

Merged
cwrau merged 1 commit into from
May 28, 2025
Merged

feat(t8s-cluster): make apiserver resources configurable #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions charts/t8s-cluster/ci/cp-with-resources-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
controlPlane:
resources:
requests:
memory: 4Gi
limits:
memory: 8Gi
7 changes: 7 additions & 0 deletions charts/t8s-cluster/ci/hcp-with-resources-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
controlPlane:
hosted: true
resources:
requests:
memory: 4Gi
limits:
memory: 8Gi
1 change: 1 addition & 0 deletions ...luster/clusterClass/k0smotronControlPlaneTemplate/_k0smotronControlPlaneTemplateSpec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ This function needs the whole `$` context to be able to use `.Files.Get`
*/}}
{{- define "t8s-cluster.clusterClass.k0smotronControlPlaneTemplate.spec" -}}
replicas: {{ $.Values.controlPlane.singleNode | ternary 1 3 }}
resources: {{- include "common.resources" .Values.controlPlane | nindent 2 }}
Comment thread
marvinWolff marked this conversation as resolved.
service:
type: LoadBalancer
apiPort: 6443
Expand Down
2 changes: 1 addition & 1 deletion ...luster/templates/management-cluster/clusterClass/kubeadmControlPlaneTemplate/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{{- range $name, $file := $dynamicFiles -}}
{{- $files = append $files (dict "content" (get $file "content" | required (printf "missing content for %s" $name)) "path" (get $file "path" | required (printf "missing path for %s" $name))) -}}
{{- end -}}
{{- $apiserverPatch := dict "spec" (dict "containers" (list (dict "name" "kube-apiserver" "resources" (dict "requests" (dict "memory" "2Gi") "limits" (dict "memory" "4Gi"))))) -}}
{{- $apiserverPatch := dict "spec" (dict "containers" (list (dict "name" "kube-apiserver" "resources" (include "common.resources" .Values.controlPlane | fromYaml)))) -}}
Comment thread
marvinWolff marked this conversation as resolved.
{{- $files = append $files (include "t8s-cluster.patches.patchFile" (dict "values" $apiserverPatch "target" "kube-apiserver" "component" "memory") | fromYaml) -}}
{{- toYaml $files -}}
{{- end -}}
6 changes: 6 additions & 0 deletions charts/t8s-cluster/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@
"pattern": "^((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(/([0-9]|[1-2][0-9]|3[0-2]))?$"
},
"uniqueItems": true
},
"resources": {
"$ref": "#/$defs/resourceRequirements"
}
},
"required": [
Expand Down Expand Up @@ -300,6 +303,9 @@
],
"additionalProperties": false,
"$defs": {
"resourceRequirements": {
"$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master-standalone-strict/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
},
Comment thread
marvinWolff marked this conversation as resolved.
"securityGroups": {
"type": "array",
"items": {
Expand Down
5 changes: 5 additions & 0 deletions charts/t8s-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ controlPlane:
flavor: standard.2.1905
singleNode: false
allowedCIDRs: []
resources:
requests:
memory: 2Gi
limits:
memory: 4Gi

version:
major: 1
Expand Down