Resolve DNS issues by bypassing DNS for now
This commit is contained in:
parent
524949c8e5
commit
6deddebe48
|
@ -13,7 +13,10 @@ module "etcd" {
|
|||
}
|
||||
|
||||
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 = {
|
||||
|
|
11
main.tf
11
main.tf
|
@ -67,12 +67,11 @@ module "resilio" {
|
|||
}
|
||||
|
||||
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" {
|
||||
|
|
|
@ -60,12 +60,15 @@ module "airsonic" {
|
|||
]
|
||||
}
|
||||
|
||||
data "template_file" "airsonic-properties-file" {
|
||||
template = "${file("${path.module}/conf/airsonic.properties.tpl")}"
|
||||
# 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}"
|
||||
}
|
||||
}
|
||||
# vars {
|
||||
# smtp-password = "${var.airsonic-smtp-password}"
|
||||
|
||||
|
||||
# # db-password = "${var.airsonic-db-password}"
|
||||
# }
|
||||
# }
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ variable "domain" {
|
|||
type = "string"
|
||||
}
|
||||
|
||||
variable "airsonic-smtp-password" {}
|
||||
# variable "airsonic-smtp-password" {}
|
||||
|
||||
variable "traefik-labels" {
|
||||
type = "map"
|
||||
|
|
|
@ -11,7 +11,7 @@ resource "docker_container" "render" {
|
|||
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}",
|
||||
|
|
|
@ -81,29 +81,45 @@ resource "docker_container" "kubelet" {
|
|||
}
|
||||
command = [
|
||||
"kubelet",
|
||||
"--kubeconfig=/etc/kubernetes/kubeconfig",
|
||||
"--client-ca-file=/etc/kubernetes/ca.crt",
|
||||
"--anonymous-auth=false",
|
||||
"--cni-conf-dir=/etc/kubernetes/cni/net.d",
|
||||
"--network-plugin=cni",
|
||||
"--lock-file=/var/run/lock/kubelet.lock",
|
||||
"--exit-on-lock-contention",
|
||||
"--pod-manifest-path=/etc/kubernetes/manifests",
|
||||
"--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",
|
||||
"--exit-on-lock-contention=true",
|
||||
"--hostname-override=${var.host_ip}",
|
||||
"--kubeconfig=/etc/kubernetes/kubeconfig",
|
||||
"--lock-file=/var/run/lock/kubelet.lock",
|
||||
"--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
|
||||
max_retry_count = 1
|
||||
network_mode = "host"
|
||||
privileged = true
|
||||
restart = "no"
|
||||
must_run = false
|
||||
|
||||
# max_retry_count = 1
|
||||
}
|
||||
|
||||
data "docker_registry_image" "image" {
|
||||
|
|
|
@ -17,3 +17,9 @@ variable "depends_on" {
|
|||
variable "asset_dir_volume_name" {
|
||||
default = "k8s-assets"
|
||||
}
|
||||
|
||||
variable "host_ip" {}
|
||||
|
||||
variable "k8s_host" {
|
||||
description = "kubenetes hostname"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue