Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
31598860
Unverified
Commit
31598860
authored
Apr 13, 2018
by
Paul Gear
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add option to control SSL chain completion
parent
47a12e3a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
0 deletions
+12
-0
config.yaml
cluster/juju/layers/kubernetes-worker/config.yaml
+9
-0
kubernetes_worker.py
...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+2
-0
ingress-daemon-set.yaml
...ayers/kubernetes-worker/templates/ingress-daemon-set.yaml
+1
-0
No files found.
cluster/juju/layers/kubernetes-worker/config.yaml
View file @
31598860
...
@@ -58,6 +58,15 @@ options:
...
@@ -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"
...
...
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View file @
31598860
...
@@ -686,6 +686,7 @@ def create_kubeconfig(kubeconfig, server, ca, key=None, certificate=None,
...
@@ -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():
...
@@ -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'
:
...
...
cluster/juju/layers/kubernetes-worker/templates/ingress-daemon-set.yaml
View file @
31598860
...
@@ -176,3 +176,4 @@ spec:
...
@@ -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 }}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment