From 4c8486f6b922f57aa54aa53e83db57651b362ed8 Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Thu, 10 May 2018 03:22:40 +0530
Subject: [PATCH] switch to 10.2 series
---
main.tf | 6 ------
docker/kube-image-bouncer.tf | 24 ------------------------
docker/variables.tf | 2 +-
3 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/main.tf b/main.tf
index b22d30b..8e1e742 100644
--- a/main.tf
+++ a/main.tf
@@ -73,12 +73,6 @@
ips = "${var.ips}"
}
-module "mylar" {
- source = "mylar"
- domain = "mylar.bb8.fun"
- traefik-labels = "${var.traefik-common-labels}"
-}
-
module "heimdall" {
source = "heimdall"
domain = "bb8.fun"
diff --git a/docker/kube-image-bouncer.tf b/docker/kube-image-bouncer.tf
deleted file mode 100644
index 8c16e80..0000000 100644
--- a/docker/kube-image-bouncer.tf
+++ /dev/null
@@ -1,24 +1,0 @@
-data "docker_registry_image" "kib" {
- name = "flavio/kube-image-bouncer:latest"
-}
-
-resource "docker_image" "kib" {
- name = "${data.docker_registry_image.kib.name}"
- pull_triggers = ["${data.docker_registry_image.kib.sha256_digest}"]
-}
-
-resource "docker_container" "kib" {
- name = "kib"
- image = "${docker_image.kib.latest}"
-
- labels = "${merge(
- local.traefik_common_labels,
- map(
- "traefik.port", 1323,
- "traefik.frontend.rule","Host:kib.b88.fun"
- ))}"
-
- restart = "unless-stopped"
- destroy_grace_seconds = 10
- must_run = true
-}
diff --git a/docker/variables.tf b/docker/variables.tf
index 14c5900..e64d81c 100644
--- a/docker/variables.tf
+++ a/docker/variables.tf
@@ -56,5 +56,5 @@
variable "mariadb-version" {
description = "mariadb version to use for fetching the docker image"
- default = "10.1.32"
+ default = "10.2.14"
}
--
rgit 0.1.5