🏡 index : github.com/captn3m0/nebula.git

author Nemo <me@captnemo.in> 2019-01-13 5:24:50.0 +05:30:00
committer Nemo <me@captnemo.in> 2019-01-27 2:49:55.0 +05:30:00
commit
6deddebe48c6506de85a92a5cbebdb0f548c0257 [patch]
tree
48905f10920b72ca4a1ea1e0a29e936c155f0975
parent
524949c8e5ef1641ac73e87157888dfa674f8004
download
6deddebe48c6506de85a92a5cbebdb0f548c0257.tar.gz

Resolve DNS issues by bypassing DNS for now



Diff

 kubernetes.tf                |  5 ++++-
 main.tf                      | 11 +++++------
 media/airsonic.tf            | 21 ++++++++++++++-------
 media/variables.tf           |  2 +-
 modules/bootkube/main.tf     |  2 +-
 modules/kubelet/main.tf      | 40 +++++++++++++++++++++++++++++++++++-----
 modules/kubelet/variables.tf |  6 ++++++
 7 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/kubernetes.tf b/kubernetes.tf
index ed5d3f8..0011d03 100644
--- a/kubernetes.tf
+++ a/kubernetes.tf
@@ -13,7 +13,10 @@
}

module "kubelet-master" {

  source     = "modules/kubelet"
  source   = "modules/kubelet"
  host_ip  = "${var.ips["dovpn"]}"
  k8s_host = "k8s.${var.root-domain}"

  depends_on = "${module.bootkube-start.image}"

  providers = {

diff --git a/main.tf b/main.tf
index 1b3d938..1329e2f 100644
--- a/main.tf
+++ a/main.tf
@@ -67,12 +67,11 @@
}

module "media" {

  source                 = "media"
  domain                 = "bb8.fun"
  traefik-labels         = "${var.traefik-common-labels}"
  airsonic-smtp-password = "${var.airsonic-smtp-password}"
  ips                    = "${var.ips}"
  traefik-network-id     = "${module.docker.traefik-network-id}"
  source             = "media"
  domain             = "bb8.fun"
  traefik-labels     = "${var.traefik-common-labels}"
  ips                = "${var.ips}"
  traefik-network-id = "${module.docker.traefik-network-id}"
}

module "monitoring" {

diff --git a/media/airsonic.tf b/media/airsonic.tf
index 695e5a0..8de3640 100644
--- a/media/airsonic.tf
+++ a/media/airsonic.tf
@@ -60,12 +60,15 @@
  ]
}

data "template_file" "airsonic-properties-file" {

  template = "${file("${path.module}/conf/airsonic.properties.tpl")}"

  vars {

    smtp-password = "${var.airsonic-smtp-password}"

    # db-password   = "${var.airsonic-db-password}"
  }
}
# data "template_file" "airsonic-properties-file" {
#   template = "${file("${path.module}/conf/airsonic.properties.tpl")}"


#   vars {
#     smtp-password = "${var.airsonic-smtp-password}"


#     # db-password   = "${var.airsonic-db-password}"
#   }
# }

diff --git a/media/variables.tf b/media/variables.tf
index 0fdd605..1d66838 100644
--- a/media/variables.tf
+++ a/media/variables.tf
@@ -1,8 +1,8 @@
variable "domain" {

  type = "string"
}

variable "airsonic-smtp-password" {}
# variable "airsonic-smtp-password" {}

variable "traefik-labels" {

  type = "map"
diff --git a/modules/bootkube/main.tf b/modules/bootkube/main.tf
index cb9d95f..403796f 100644
--- a/modules/bootkube/main.tf
+++ a/modules/bootkube/main.tf
@@ -11,7 +11,7 @@
  command = [

    "bootkube",
    "render",
    "--etcd-servers=http://${host_ip}:2379",
    "--etcd-servers=http://${var.host_ip}:2379",
    "--asset-dir=/home/.bootkube",
    "--api-servers=https://kubernetes.default:${var.host_port},https://${var.k8s_host}:${var.host_port},https://${var.host_ip}:${var.host_port}",
    "--pod-cidr=${var.pod_cidr}",
diff --git a/modules/kubelet/main.tf b/modules/kubelet/main.tf
index 2ca7012..76d918c 100644
--- a/modules/kubelet/main.tf
+++ a/modules/kubelet/main.tf
@@ -81,29 +81,45 @@
  }
  command = [

    "kubelet",
    "--kubeconfig=/etc/kubernetes/kubeconfig",
    "--client-ca-file=/etc/kubernetes/ca.crt",
    "--allow-privileged",
    "--anonymous-auth=false",
    "--cert-dir=/var/lib/kubelet/pki",
    "--client-ca-file=/etc/kubernetes/ca.crt",
    "--cni-conf-dir=/etc/kubernetes/cni/net.d",
    "--network-plugin=cni",
    "--exit-on-lock-contention=true",
    "--hostname-override=${var.host_ip}",
    "--kubeconfig=/etc/kubernetes/kubeconfig",
    "--lock-file=/var/run/lock/kubelet.lock",
    "--exit-on-lock-contention",
    "--pod-manifest-path=/etc/kubernetes/manifests",
    "--allow-privileged",
    "--minimum-container-ttl-duration=10m0s",
    "--network-plugin=cni",
    "--node-labels=node-role.kubernetes.io/master",
    "--pod-manifest-path=/etc/kubernetes/manifests",
    "--rotate-certificates",

    // TODO: Change to var
    "--cluster_dns=10.25.0.10",
    "--cluster_domain=k8s.bb8.fun",

    "--cluster_domain=${var.k8s_host}",
  ]
  host {

    host = "kubernetes.default"
    ip   = "${var.host_ip}"
  }
  host {

    host = "${var.k8s_host}"
    ip   = "${var.host_ip}"
  }

  # TODO
  # "--register-with-taints=${var.node_taints}",
  # "--node-labels=${var.node_label}",

  network_mode = "host"
  privileged   = true
  restart      = "no"
  must_run     = false

  network_mode    = "host"
  privileged      = true
  restart         = "no"
  must_run        = false
  max_retry_count = 1
  # max_retry_count = 1
}

data "docker_registry_image" "image" {

diff --git a/modules/kubelet/variables.tf b/modules/kubelet/variables.tf
index b754c86..ca3025d 100644
--- a/modules/kubelet/variables.tf
+++ a/modules/kubelet/variables.tf
@@ -17,3 +17,9 @@
variable "asset_dir_volume_name" {

  default = "k8s-assets"
}

variable "host_ip" {}

variable "k8s_host" {

  description = "kubenetes hostname"
}