feat(platform): add configurable Kubernetes API server settings for non-Talos deployments
Add networking.apiServer.host and networking.apiServer.port to platform values to allow overriding the default Talos KubePrism settings (localhost:7445). Also add networking.cilium.cgroup.autoMount for non-Talos clusters that need Cilium to mount cgroups automatically. Changes: - packages/core/platform/values.yaml: Add apiServer and cilium.cgroup settings - packages/core/platform/templates/bundles/system.yaml: Pass cilium values - packages/core/installer/values.yaml: Add kubernetesServiceHost/Port - packages/core/installer/templates/cozystack-operator.yaml: Template env vars Closes: #1933 Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Aleksei Sviridkin <f@lex.la>
This commit is contained in:
parent
00bfde9078
commit
083ce14609
3 changed files with 17 additions and 2 deletions
|
|
@ -65,9 +65,9 @@ spec:
|
|||
{{- end }}
|
||||
env:
|
||||
- name: KUBERNETES_SERVICE_HOST
|
||||
value: localhost
|
||||
value: {{ .Values.cozystackOperator.kubernetesServiceHost | quote }}
|
||||
- name: KUBERNETES_SERVICE_PORT
|
||||
value: "7445"
|
||||
value: {{ .Values.cozystackOperator.kubernetesServicePort | quote }}
|
||||
hostNetwork: true
|
||||
tolerations:
|
||||
- key: "node.kubernetes.io/not-ready"
|
||||
|
|
|
|||
|
|
@ -11,6 +11,11 @@
|
|||
"SVC_CIDR" .Values.networking.serviceCIDR
|
||||
"JOIN_CIDR" .Values.networking.joinCIDR)) -}}
|
||||
{{- $_ := set $networkingComponents "kubeovn" (dict "values" $kubeovnValues) -}}
|
||||
{{- $ciliumValues := dict "cilium" (dict
|
||||
"k8sServiceHost" .Values.networking.apiServer.host
|
||||
"k8sServicePort" .Values.networking.apiServer.port
|
||||
"cgroup" (dict "autoMount" (dict "enabled" .Values.networking.cilium.cgroup.autoMount))) -}}
|
||||
{{- $_ := set $networkingComponents "cilium" (dict "values" $ciliumValues) -}}
|
||||
{{- end -}}
|
||||
{{include "cozystack.platform.package" (list "cozystack.networking" "kubeovn-cilium" $ $networkingComponents) }}
|
||||
{{include "cozystack.platform.package.default" (list "cozystack.kubeovn-webhook" $) }}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,16 @@ networking:
|
|||
podGateway: "10.244.0.1"
|
||||
serviceCIDR: "10.96.0.0/16"
|
||||
joinCIDR: "100.64.0.0/16"
|
||||
# Kubernetes API server configuration for Cilium
|
||||
# Defaults are for Talos KubePrism; override for non-Talos clusters
|
||||
apiServer:
|
||||
host: "localhost"
|
||||
port: "7445"
|
||||
# Cilium cgroup configuration
|
||||
# Set autoMount to true for non-Talos clusters
|
||||
cilium:
|
||||
cgroup:
|
||||
autoMount: false
|
||||
# Service publishing and ingress configuration
|
||||
publishing:
|
||||
host: "example.org"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue