mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-24 19:12:02 +00:00
Add option to control SSL chain completion
This commit is contained in:
parent
47a12e3ab0
commit
31598860e3
@ -58,6 +58,15 @@ options:
|
|||||||
|
|
||||||
The value for this config must be a JSON array of credential objects, like this:
|
The value for this config must be a JSON array of credential objects, like this:
|
||||||
[{"server": "my.registry", "username": "myUser", "password": "myPass"}]
|
[{"server": "my.registry", "username": "myUser", "password": "myPass"}]
|
||||||
|
ingress-ssl-chain-completion:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
description: |
|
||||||
|
Enable chain completion for TLS certificates used by the nginx ingress
|
||||||
|
controller. Set this to true if you would like the ingress controller
|
||||||
|
to attempt auto-retrieval of intermediate certificates. The default
|
||||||
|
(false) is recommended for all production kubernetes installations, and
|
||||||
|
any environment which does not have outbound Internet access.
|
||||||
nginx-image:
|
nginx-image:
|
||||||
type: string
|
type: string
|
||||||
default: "auto"
|
default: "auto"
|
||||||
|
@ -686,6 +686,7 @@ def create_kubeconfig(kubeconfig, server, ca, key=None, certificate=None,
|
|||||||
|
|
||||||
|
|
||||||
@when_any('config.changed.default-backend-image',
|
@when_any('config.changed.default-backend-image',
|
||||||
|
'config.changed.ingress-ssl-chain-completion',
|
||||||
'config.changed.nginx-image')
|
'config.changed.nginx-image')
|
||||||
@when('kubernetes-worker.config.created')
|
@when('kubernetes-worker.config.created')
|
||||||
def launch_default_ingress_controller():
|
def launch_default_ingress_controller():
|
||||||
@ -728,6 +729,7 @@ def launch_default_ingress_controller():
|
|||||||
return
|
return
|
||||||
|
|
||||||
# Render the ingress daemon set controller manifest
|
# Render the ingress daemon set controller manifest
|
||||||
|
context['ssl_chain_completion'] = config.get('ingress-ssl-chain-completion')
|
||||||
context['ingress_image'] = config.get('nginx-image')
|
context['ingress_image'] = config.get('nginx-image')
|
||||||
if context['ingress_image'] == "" or context['ingress_image'] == "auto":
|
if context['ingress_image'] == "" or context['ingress_image'] == "auto":
|
||||||
if context['arch'] == 's390x':
|
if context['arch'] == 's390x':
|
||||||
|
@ -176,3 +176,4 @@ spec:
|
|||||||
- /nginx-ingress-controller
|
- /nginx-ingress-controller
|
||||||
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend
|
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend
|
||||||
- --configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf
|
- --configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf
|
||||||
|
- --enable-ssl-chain-completion={{ ssl_chain_completion }}
|
||||||
|
Loading…
Reference in New Issue
Block a user