mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #63845 from paulgear/master
Automatic merge from submit-queue (batch tested with PRs 65301, 65291, 65307, 63845, 65313). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add option to control SSL chain completion **What this PR does / why we need it**: This adds templated support to the kubernetes-worker juju charm for the --enable-ssl-chain-completion option on the ingress proxy. It defaults to false, to ensure that production sites are not reliant on OCSP or DNS in order to function. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note kubernetes-worker juju charm: Added support for setting the --enable-ssl-chain-completion option on the ingress proxy. "action required": if your installation relies on supplying incomplete certificate chains and using OCSP to fill them in, you must set "ingress-ssl-chain-completion" to "true" in your juju configuration. ```
This commit is contained in:
commit
5bde5a5ac8
@ -59,6 +59,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"
|
||||||
|
@ -700,6 +700,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():
|
||||||
@ -742,6 +743,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":
|
||||||
images = {'amd64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0', # noqa
|
images = {'amd64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0', # noqa
|
||||||
|
@ -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