Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

coredns use version tag #1203

Merged
merged 3 commits into from
Nov 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/terraform-modules/bootkube/assets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ resource "local_file" "kubernetes" {
kube_controller_manager_image = var.container_images["kube_controller_manager"]
kube_scheduler_image = var.container_images["kube_scheduler"]
kube_proxy_image = var.container_images["kube_proxy"]
coredns_image = "${var.container_images["coredns"]}${var.container_arch}"
coredns_image = var.container_images["coredns"]
control_plane_replicas = max(2, length(var.etcd_servers))
cloud_provider = var.cloud_provider
pod_cidr = var.pod_cidr
Expand Down Expand Up @@ -109,7 +109,7 @@ locals {
kubelet = var.disable_self_hosted_kubelet == false ? 1 : 0
# Render kubelet.yaml for kubelet chart
kubelet_content = templatefile("${path.module}/resources/charts/kubelet.yaml", {
kubelet_image = "${var.container_images["kubelet_image"]}-${var.container_arch}"
kubelet_image = var.container_images["kubelet_image"]
cluster_dns_service_ip = cidrhost(var.service_cidr, 10)
cluster_domain_suffix = var.cluster_domain_suffix
enable_tls_bootstrap = var.enable_tls_bootstrap
Expand Down
10 changes: 2 additions & 8 deletions assets/terraform-modules/bootkube/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,8 @@ variable "cluster_domain_suffix" {
default = "cluster.local"
}

variable "container_arch" {
description = "Architecture suffix for the container image coredns/coredns:coredns- (e.g., arm64)"
type = string
default = "amd64"
}

variable "container_images" {
description = "Container images to use (the coredns entry will get -$${var.container_arch} appended)"
description = "Container images to use"
type = map(string)

default = {
Expand All @@ -100,7 +94,7 @@ variable "container_images" {
calico_controllers = "calico/kube-controllers:v3.16.4"
flexvol_driver_image = "calico/pod2daemon-flexvol:v3.16.4"
kubelet_image = "quay.io/poseidon/kubelet:v1.19.4"
coredns = "coredns/coredns:coredns-"
coredns = "coredns/coredns:1.8.0"
pod_checkpointer = "kinvolk/pod-checkpointer:d1c58443fe7d7d33aa5bf7d80d65d299be6e5847"
kube_apiserver = "k8s.gcr.io/kube-apiserver:v1.19.4"
kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.19.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ module "bootkube" {

certs_validity_period_hours = var.certs_validity_period_hours

container_arch = var.os_arch

# Disable the self hosted kubelet.
disable_self_hosted_kubelet = var.disable_self_hosted_kubelet
# Extra flags to API server.
Expand Down
Loading