move cert-manager and ingress-nginx from kubespray to separate modules, remove reset action and update observability template
This commit is contained in:
@@ -134,3 +134,8 @@ unsafe_show_logs: false
|
||||
|
||||
## If enabled it will allow kubespray to attempt setup even if the distribution is not supported. For unsupported distributions this can lead to unexpected failures in some cases.
|
||||
allow_unsupported_distribution_setup: false
|
||||
|
||||
## Containerd settings
|
||||
# containerd_metadata_root_dir: /app/lib/containerd
|
||||
# The state directory for containerd
|
||||
# containerd_state_dir: /app/run/containerd
|
||||
|
||||
@@ -83,9 +83,8 @@ rbd_provisioner_enabled: false
|
||||
# rbd_provisioner_reclaim_policy: Delete
|
||||
|
||||
# Nginx ingress controller deployment
|
||||
{{- if eq .Modules.Additional.Ingress.Type "nginx" }}
|
||||
ingress_nginx_enabled: {{ .Modules.Additional.Ingress.Install }}
|
||||
ingress_nginx_host_network: {{ .Modules.Additional.Ingress.HostNetwork }}
|
||||
ingress_nginx_enabled: false
|
||||
ingress_nginx_host_network: false
|
||||
ingress_publish_status_address: ""
|
||||
# ingress_nginx_nodeselector:
|
||||
# kubernetes.io/os: "linux"
|
||||
@@ -99,8 +98,8 @@ ingress_publish_status_address: ""
|
||||
# value: ""
|
||||
# effect: "NoSchedule"
|
||||
# ingress_nginx_namespace: "ingress-nginx"
|
||||
ingress_nginx_insecure_port: {{ .Modules.Additional.Ingress.InsecurePort }}
|
||||
ingress_nginx_secure_port: {{ .Modules.Additional.Ingress.SecurePort }}
|
||||
ingress_nginx_insecure_port: 80
|
||||
ingress_nginx_secure_port: 443
|
||||
# ingress_nginx_configmap:
|
||||
# map-hash-bucket-size: "128"
|
||||
# ssl-protocols: "TLSv1.2 TLSv1.3"
|
||||
@@ -111,8 +110,7 @@ ingress_nginx_secure_port: {{ .Modules.Additional.Ingress.SecurePort }}
|
||||
# ingress_nginx_extra_args:
|
||||
# - --default-ssl-certificate=default/foo-tls
|
||||
# ingress_nginx_termination_grace_period_seconds: 300
|
||||
ingress_nginx_class: {{ .Modules.Additional.Ingress.IngressClassName }}
|
||||
{{- end }}
|
||||
ingress_nginx_class: "nginx"
|
||||
|
||||
# ALB ingress controller deployment
|
||||
ingress_alb_enabled: false
|
||||
@@ -123,7 +121,7 @@ ingress_alb_enabled: false
|
||||
# alb_ingress_aws_debug: "false"
|
||||
|
||||
# Cert manager deployment
|
||||
cert_manager_enabled: {{ .Modules.Additional.CertManager.Install }}
|
||||
cert_manager_enabled: false
|
||||
# cert_manager_namespace: "cert-manager"
|
||||
# cert_manager_tolerations:
|
||||
# - key: node-role.kubernetes.io/master
|
||||
@@ -152,9 +150,8 @@ cert_manager_enabled: {{ .Modules.Additional.CertManager.Install }}
|
||||
# cert_manager_dns_policy: "ClusterFirst"
|
||||
cert_manager_dns_config:
|
||||
nameservers:
|
||||
{{- range .Modules.Additional.CertManager.DnsServers }}
|
||||
- "{{ . }}"
|
||||
{{- end }}
|
||||
- "8.8.8.8"
|
||||
- "8.8.4.4"
|
||||
|
||||
# MetalLB deployment
|
||||
{{- if and (eq .Modules.Additional.LoadBalancer.Type "metallb") .Modules.Additional.LoadBalancer.Install }}
|
||||
|
||||
@@ -247,7 +247,7 @@ kubernetes_audit: false
|
||||
default_kubelet_config_dir: {{ `"{{ kube_config_dir }}/dynamic_kubelet_dir"` }}
|
||||
|
||||
# pod security policy (RBAC must be enabled either by having 'RBAC' in authorization_modes or kubeadm enabled)
|
||||
podsecuritypolicy_enabled: {{ .Orchestrator.PodSecurotyPolicyEnabled }}
|
||||
podsecuritypolicy_enabled: {{ .Orchestrator.PodSecurityPolicyEnabled }}
|
||||
|
||||
# Custom PodSecurityPolicySpec for restricted policy
|
||||
# podsecuritypolicy_restricted_spec: {}
|
||||
|
||||
Reference in New Issue
Block a user