Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
6a33411d
Commit
6a33411d
authored
6 years ago
by
Maxime Guyot
Committed by
Kubernetes Prow Robot
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add an option for helm init --wait (#4202)
parent
9a91ef86
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes-apps/helm/defaults/main.yml
+3
-0
3 additions, 0 deletions
roles/kubernetes-apps/helm/defaults/main.yml
roles/kubernetes-apps/helm/tasks/main.yml
+2
-0
2 additions, 0 deletions
roles/kubernetes-apps/helm/tasks/main.yml
with
5 additions
and
0 deletions
roles/kubernetes-apps/helm/defaults/main.yml
+
3
−
0
View file @
6a33411d
...
@@ -7,6 +7,9 @@ helm_home_dir: "/root/.helm"
...
@@ -7,6 +7,9 @@ helm_home_dir: "/root/.helm"
# Deployment mode: host or docker
# Deployment mode: host or docker
helm_deployment_type
:
host
helm_deployment_type
:
host
# Wait until Tiller is running and ready to receive requests
tiller_wait
:
false
# Do not download the local repository cache on helm init
# Do not download the local repository cache on helm init
helm_skip_refresh
:
false
helm_skip_refresh
:
false
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes-apps/helm/tasks/main.yml
+
2
−
0
View file @
6a33411d
...
@@ -50,6 +50,7 @@
...
@@ -50,6 +50,7 @@
{% if tiller_max_history is defined %} --history-max={{ tiller_max_history }}{% endif %}
{% if tiller_max_history is defined %} --history-max={{ tiller_max_history }}{% endif %}
{% if tiller_enable_tls %} --tiller-tls --tiller-tls-verify --tiller-tls-cert={{ tiller_tls_cert }} --tiller-tls-key={{ tiller_tls_key }} --tls-ca-cert={{ tiller_tls_ca_cert }} {% endif %}
{% if tiller_enable_tls %} --tiller-tls --tiller-tls-verify --tiller-tls-cert={{ tiller_tls_cert }} --tiller-tls-key={{ tiller_tls_key }} --tls-ca-cert={{ tiller_tls_ca_cert }} {% endif %}
{% if tiller_secure_release_info %} --override 'spec.template.spec.containers[0].command'='{/tiller,--storage=secret}' {% endif %}
{% if tiller_secure_release_info %} --override 'spec.template.spec.containers[0].command'='{/tiller,--storage=secret}' {% endif %}
{% if tiller_wait %} --wait{% endif %}
{% else %}
{% else %}
--client-only
--client-only
{% endif %}
{% endif %}
...
@@ -70,6 +71,7 @@
...
@@ -70,6 +71,7 @@
{% if tiller_max_history is defined %} --history-max={{ tiller_max_history }}{% endif %}
{% if tiller_max_history is defined %} --history-max={{ tiller_max_history }}{% endif %}
{% if tiller_enable_tls %} --tiller-tls --tiller-tls-verify --tiller-tls-cert={{ tiller_tls_cert }} --tiller-tls-key={{ tiller_tls_key }} --tls-ca-cert={{ tiller_tls_ca_cert }} {% endif %}
{% if tiller_enable_tls %} --tiller-tls --tiller-tls-verify --tiller-tls-cert={{ tiller_tls_cert }} --tiller-tls-key={{ tiller_tls_key }} --tls-ca-cert={{ tiller_tls_ca_cert }} {% endif %}
{% if tiller_secure_release_info %} --override 'spec.template.spec.containers[0].command'='{/tiller,--storage=secret}' {% endif %}
{% if tiller_secure_release_info %} --override 'spec.template.spec.containers[0].command'='{/tiller,--storage=secret}' {% endif %}
{% if tiller_wait %} --wait{% endif %}
--output yaml
--output yaml
| {{bin_dir}}/kubectl apply -f -
| {{bin_dir}}/kubectl apply -f -
changed_when
:
false
changed_when
:
false
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment