Skip to content

Commit de2d71d

Browse files
kvapskvaps
committed
[kubernetes] Refactor controlPlane settings
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 8db92d5 commit de2d71d

9 files changed

Lines changed: 290 additions & 317 deletions

File tree

‎packages/apps/kubernetes/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ include ../../../scripts/package.mk
66

77
generate:
88
readme-generator -v values.yaml -s values.schema.json -r README.md
9+
yq -o json -i '.properties.controlPlane.properties.apiServer.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json
10+
yq -o json -i '.properties.controlPlane.properties.controllerManager.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json
11+
yq -o json -i '.properties.controlPlane.properties.scheduler.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json
12+
yq -o json -i '.properties.controlPlane.properties.konnectivity.properties.server.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json
913

1014
image: image-ubuntu-container-disk image-kubevirt-cloud-provider image-kubevirt-csi-driver image-cluster-autoscaler
1115

‎packages/apps/kubernetes/README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ kubectl get secret -n <namespace> kubernetes-<clusterName>-admin-kubeconfig -o g
5555
| `addons.monitoringAgents.valuesOverride` | Custom values to override | `{}` |
5656
| `addons.verticalPodAutoscaler.valuesOverride` | Custom values to override | `{}` |
5757

58-
### Kamaji control plane
59-
60-
| Name | Description | Value |
61-
| --------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
62-
| `kamajiControlPlane.apiServer.resources` | Resources | `{}` |
63-
| `kamajiControlPlane.apiServer.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if resources is set (resources is recommended for production). | `small` |
64-
| `kamajiControlPlane.controllerManager.resources` | Resources | `{}` |
65-
| `kamajiControlPlane.controllerManager.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if resources is set (resources is recommended for production). | `micro` |
66-
| `kamajiControlPlane.scheduler.resources` | Resources | `{}` |
67-
| `kamajiControlPlane.scheduler.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if resources is set (resources is recommended for production). | `micro` |
68-
| `kamajiControlPlane.addons.konnectivity.server.resources` | Resources | `{}` |
69-
| `kamajiControlPlane.addons.konnectivity.server.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if resources is set (resources is recommended for production). | `micro` |
58+
### Kubernetes control plane configuration
59+
60+
| Name | Description | Value |
61+
| -------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
62+
| `controlPlane.apiServer.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if resources is set (resources is recommended for production). | `small` |
63+
| `controlPlane.apiServer.resources` | Resources | `{}` |
64+
| `controlPlane.controllerManager.resources` | Resources | `{}` |
65+
| `controlPlane.controllerManager.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if resources is set (resources is recommended for production). | `micro` |
66+
| `controlPlane.scheduler.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if resources is set (resources is recommended for production). | `micro` |
67+
| `controlPlane.scheduler.resources` | Resources | `{}` |
68+
| `controlPlane.konnectivity.server.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if resources is set (resources is recommended for production). | `micro` |
69+
| `controlPlane.konnectivity.server.resources` | Resources | `{}` |
7070

7171

7272
## U Series

‎packages/apps/kubernetes/templates/cluster.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,22 @@ metadata:
110110
kamaji.clastix.io/kubeconfig-secret-key: "super-admin.svc"
111111
spec:
112112
apiServer:
113-
{{- if .Values.kamajiControlPlane.apiServer.resources }}
114-
resources: {{- toYaml .Values.kamajiControlPlane.apiServer.resources | nindent 6 }}
115-
{{- else if ne .Values.kamajiControlPlane.apiServer.resourcesPreset "none" }}
116-
resources: {{- include "resources.preset" (dict "type" .Values.kamajiControlPlane.apiServer.resourcesPreset "Release" .Release) | nindent 6 }}
113+
{{- if .Values.controlPlane.apiServer.resources }}
114+
resources: {{- toYaml .Values.controlPlane.apiServer.resources | nindent 6 }}
115+
{{- else if ne .Values.controlPlane.apiServer.resourcesPreset "none" }}
116+
resources: {{- include "resources.preset" (dict "type" .Values.controlPlane.apiServer.resourcesPreset "Release" .Release) | nindent 6 }}
117117
{{- end }}
118118
controllerManager:
119-
{{- if .Values.kamajiControlPlane.controllerManager.resources }}
120-
resources: {{- toYaml .Values.kamajiControlPlane.controllerManager.resources | nindent 6 }}
121-
{{- else if ne .Values.kamajiControlPlane.controllerManager.resourcesPreset "none" }}
122-
resources: {{- include "resources.preset" (dict "type" .Values.kamajiControlPlane.controllerManager.resourcesPreset "Release" .Release) | nindent 6 }}
119+
{{- if .Values.controlPlane.controllerManager.resources }}
120+
resources: {{- toYaml .Values.controlPlane.controllerManager.resources | nindent 6 }}
121+
{{- else if ne .Values.controlPlane.controllerManager.resourcesPreset "none" }}
122+
resources: {{- include "resources.preset" (dict "type" .Values.controlPlane.controllerManager.resourcesPreset "Release" .Release) | nindent 6 }}
123123
{{- end }}
124124
scheduler:
125-
{{- if .Values.kamajiControlPlane.scheduler.resources }}
126-
resources: {{- toYaml .Values.kamajiControlPlane.scheduler.resources | nindent 6 }}
127-
{{- else if ne .Values.kamajiControlPlane.scheduler.resourcesPreset "none" }}
128-
resources: {{- include "resources.preset" (dict "type" .Values.kamajiControlPlane.scheduler.resourcesPreset "Release" .Release) | nindent 6 }}
125+
{{- if .Values.controlPlane.scheduler.resources }}
126+
resources: {{- toYaml .Values.controlPlane.scheduler.resources | nindent 6 }}
127+
{{- else if ne .Values.controlPlane.scheduler.resourcesPreset "none" }}
128+
resources: {{- include "resources.preset" (dict "type" .Values.controlPlane.scheduler.resourcesPreset "Release" .Release) | nindent 6 }}
129129
{{- end }}
130130
dataStoreName: "{{ $etcd }}"
131131
addons:
@@ -135,10 +135,10 @@ spec:
135135
konnectivity:
136136
server:
137137
port: 8132
138-
{{- if .Values.kamajiControlPlane.addons.konnectivity.server.resources }}
139-
resources: {{- toYaml .Values.kamajiControlPlane.addons.konnectivity.server.resources | nindent 10 }}
140-
{{- else if ne .Values.kamajiControlPlane.addons.konnectivity.server.resourcesPreset "none" }}
141-
resources: {{- include "resources.preset" (dict "type" .Values.kamajiControlPlane.addons.konnectivity.server.resourcesPreset "Release" .Release) | nindent 10 }}
138+
{{- if .Values.controlPlane.konnectivity.server.resources }}
139+
resources: {{- toYaml .Values.controlPlane.konnectivity.server.resources | nindent 10 }}
140+
{{- else if ne .Values.controlPlane.konnectivity.server.resourcesPreset "none" }}
141+
resources: {{- include "resources.preset" (dict "type" .Values.controlPlane.konnectivity.server.resourcesPreset "Release" .Release) | nindent 10 }}
142142
{{- end }}
143143
kubelet:
144144
cgroupfs: systemd

‎packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ spec:
3030
upgrade:
3131
remediation:
3232
retries: -1
33-
{{- if .Values.addons.certManager.valuesOverride }}
34-
valuesFrom:
35-
- kind: Secret
36-
name: {{ .Release.Name }}-cert-manager-values-override
37-
valuesKey: values
33+
{{- with .Values.addons.certManager.valuesOverride }}
34+
values:
35+
{{- toYaml . | nindent 4 }}
3836
{{- end }}
3937

4038
dependsOn:
@@ -47,13 +45,3 @@ spec:
4745
- name: {{ .Release.Name }}-cert-manager-crds
4846
namespace: {{ .Release.Namespace }}
4947
{{- end }}
50-
{{- if .Values.addons.certManager.valuesOverride }}
51-
---
52-
apiVersion: v1
53-
kind: Secret
54-
metadata:
55-
name: {{ .Release.Name }}-cert-manager-values-override
56-
stringData:
57-
values: |
58-
{{- toYaml .Values.addons.certManager.valuesOverride | nindent 4 }}
59-
{{- end }}

‎packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ spec:
3030
upgrade:
3131
remediation:
3232
retries: -1
33-
{{- if .Values.addons.gpuOperator.valuesOverride }}
34-
valuesFrom:
35-
- kind: Secret
36-
name: {{ .Release.Name }}-gpu-operator-values-override
37-
valuesKey: values
33+
{{- with .Values.addons.gpuOperator.valuesOverride }}
34+
values:
35+
{{- toYaml . | nindent 4 }}
3836
{{- end }}
3937

4038
dependsOn:
@@ -45,13 +43,3 @@ spec:
4543
- name: {{ .Release.Name }}-cilium
4644
namespace: {{ .Release.Namespace }}
4745
{{- end }}
48-
{{- if .Values.addons.gpuOperator.valuesOverride }}
49-
---
50-
apiVersion: v1
51-
kind: Secret
52-
metadata:
53-
name: {{ .Release.Name }}-gpu-operator-values-override
54-
stringData:
55-
values: |
56-
{{- toYaml .Values.addons.gpuOperator.valuesOverride | nindent 4 }}
57-
{{- end }}

‎packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@ spec:
4040
enabled: false
4141
nodeSelector:
4242
node-role.kubernetes.io/ingress-nginx: ""
43-
{{- if .Values.addons.ingressNginx.valuesOverride }}
44-
valuesFrom:
45-
- kind: Secret
46-
name: {{ .Release.Name }}-ingress-nginx-values-override
47-
valuesKey: values
43+
{{- with .Values.addons.ingressNginx.valuesOverride }}
44+
values:
45+
{{- toYaml . | nindent 4 }}
4846
{{- end }}
4947
dependsOn:
5048
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
@@ -54,14 +52,3 @@ spec:
5452
- name: {{ .Release.Name }}-cilium
5553
namespace: {{ .Release.Namespace }}
5654
{{- end }}
57-
58-
{{- if .Values.addons.ingressNginx.valuesOverride }}
59-
---
60-
apiVersion: v1
61-
kind: Secret
62-
metadata:
63-
name: {{ .Release.Name }}-ingress-nginx-values-override
64-
stringData:
65-
values: |
66-
{{- toYaml .Values.addons.ingressNginx.valuesOverride | nindent 4 }}
67-
{{- end }}

‎packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ spec:
5353
requests:
5454
cpu: 100m
5555
memory: 1600Mi
56-
{{- if .Values.addons.verticalPodAutoscaler.valuesOverride }}
57-
valuesFrom:
58-
- kind: Secret
59-
name: {{ .Release.Name }}-vertical-pod-autoscaler-values-override
60-
valuesKey: values
56+
{{- with .Values.addons.verticalPodAutoscaler.valuesOverride }}
57+
values:
58+
{{- toYaml . | nindent 4 }}
6159
{{- end }}
6260
dependsOn:
6361
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}

0 commit comments

Comments
 (0)