Switch to official images

This commit is contained in:
Nemo 2019-01-13 12:55:46 +05:30
parent 6deddebe48
commit 2a12c17948
3 changed files with 10 additions and 7 deletions

View File

@ -11,7 +11,7 @@ resource "docker_container" "render" {
command = [
"bootkube",
"render",
"--etcd-servers=http://${var.host_ip}:2379",
"--etcd-servers=https://${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}",
@ -53,7 +53,7 @@ resource "docker_container" "start" {
}
data "docker_registry_image" "image" {
name = "captn3m0/bootkube:v${var.version}"
name = "quay.io/coreos/bootkube:v${var.version}"
}
resource "docker_image" "image" {

View File

@ -83,9 +83,11 @@ resource "docker_container" "kubelet" {
"kubelet",
"--allow-privileged",
"--anonymous-auth=false",
"--authentication-token-webhook",
"--authorization-mode=Webhook",
"--cert-dir=/var/lib/kubelet/pki",
"--client-ca-file=/etc/kubernetes/ca.crt",
"--cni-conf-dir=/etc/kubernetes/cni/net.d",
"--cluster_dns=${var.dns_ip}",
"--exit-on-lock-contention=true",
"--hostname-override=${var.host_ip}",
"--kubeconfig=/etc/kubernetes/kubeconfig",
@ -94,11 +96,8 @@ resource "docker_container" "kubelet" {
"--network-plugin=cni",
"--node-labels=node-role.kubernetes.io/master",
"--pod-manifest-path=/etc/kubernetes/manifests",
"--read-only-port=0",
"--rotate-certificates",
// TODO: Change to var
"--cluster_dns=10.25.0.10",
"--cluster_domain=${var.k8s_host}",
]
host {

View File

@ -20,6 +20,10 @@ variable "asset_dir_volume_name" {
variable "host_ip" {}
variable "dns_ip" {
default = "10.25.0.10"
}
variable "k8s_host" {
description = "kubenetes hostname"
}