CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix null_resource ordering constraints 

* Ensure etcd TLS assets and kubeconfig are copied before
any attempt is made to run bootkube start
This commit is contained in:
Dalton Hubble 2017-11-06 00:39:02 -08:00
parent 10b977d54a
commit 47a9989927
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
digital-ocean/container-linux/kubernetes/ssh.tf
View File

@ -69,7 +69,7 @@ resource "null_resource" "copy-secrets" {
# Secure copy bootkube assets to ONE controller and start bootkube to perform # Secure copy bootkube assets to ONE controller and start bootkube to perform
# one-time self-hosted cluster bootstrapping. # one-time self-hosted cluster bootstrapping.
resource "null_resource" "bootkube-start" { resource "null_resource" "bootkube-start" {
depends_on = ["module.bootkube", "null_resource.copy-secrets", "digitalocean_droplet.controllers"] depends_on = ["module.bootkube", "null_resource.copy-secrets"]
connection { connection {
type = "ssh" type = "ssh"

4
google-cloud/container-linux/kubernetes/ssh.tf
View File

@ -1,6 +1,6 @@
# Secure copy etcd TLS assets and kubeconfig to controllers. Activates kubelet.service # Secure copy etcd TLS assets and kubeconfig to controllers. Activates kubelet.service
resource "null_resource" "copy-secrets" { resource "null_resource" "copy-secrets" {
depends_on = ["module.controllers", "module.bootkube"] depends_on = ["module.bootkube"]
count = "${var.controller_count}" count = "${var.controller_count}"
connection { connection {
@ -70,7 +70,7 @@ resource "null_resource" "copy-secrets" {
# Secure copy bootkube assets to ONE controller and start bootkube to perform # Secure copy bootkube assets to ONE controller and start bootkube to perform
# one-time self-hosted cluster bootstrapping. # one-time self-hosted cluster bootstrapping.
resource "null_resource" "bootkube-start" { resource "null_resource" "bootkube-start" {
depends_on = ["module.controllers", "module.workers", "module.bootkube"] depends_on = ["module.bootkube", "module.workers", "null_resource.copy-secrets"]
connection { connection {
type = "ssh" type = "ssh"