Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kubespray
- Activity
- Members
- Model registry

Snippets Groups Projects

352fbd71

Unverified Commit 352fbd71 authored 6 years ago by Andreas Kruger

Downloads
- Plain Diff

Merge branch 'master' of github.com:kubernetes-sigs/kubespray into image_builder_1

parents 2706633f 39d75030

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

inventory/sample/group_vars/k8s-cluster/addons.yml 1 addition, 1 deletion

inventory/sample/group_vars/k8s-cluster/addons.yml
roles/bootstrap-os/defaults/main.yml 0 additions, 3 deletions

roles/bootstrap-os/defaults/main.yml
roles/bootstrap-os/tasks/main.yml 7 additions, 26 deletions

roles/bootstrap-os/tasks/main.yml
roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml 1 addition, 1 deletion

...s-apps/ingress_controller/ingress_nginx/defaults/main.yml

with 9 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment