From b0a335e65bad5c5159f45e61753ea496e261bcc5 Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Sat, 23 Jul 2022 08:25:04 +0200 Subject: [PATCH 1/2] Unbundle Nginx ingress from starters * the version was constantly outdated * it simplifies bootstrapping (no --target apply) * the new nginx ingress guide is a better option for users --- .../configurations/aks/aks_zero_ingress.tf | 27 ----------------- .../configurations/eks/eks_zero_ingress.tf | 29 ------------------- .../configurations/gke/gke_zero_ingress.tf | 27 ----------------- .../multi-cloud/aks_zero_ingress.tf | 27 ----------------- .../multi-cloud/eks_zero_ingress.tf | 29 ------------------- .../multi-cloud/gke_zero_ingress.tf | 27 ----------------- 6 files changed, 166 deletions(-) delete mode 100644 quickstart/src/configurations/aks/aks_zero_ingress.tf delete mode 100644 quickstart/src/configurations/eks/eks_zero_ingress.tf delete mode 100644 quickstart/src/configurations/gke/gke_zero_ingress.tf delete mode 100644 quickstart/src/configurations/multi-cloud/aks_zero_ingress.tf delete mode 100644 quickstart/src/configurations/multi-cloud/eks_zero_ingress.tf delete mode 100644 quickstart/src/configurations/multi-cloud/gke_zero_ingress.tf diff --git a/quickstart/src/configurations/aks/aks_zero_ingress.tf b/quickstart/src/configurations/aks/aks_zero_ingress.tf deleted file mode 100644 index 2cde75f8..00000000 --- a/quickstart/src/configurations/aks/aks_zero_ingress.tf +++ /dev/null @@ -1,27 +0,0 @@ -module "aks_zero_nginx" { - providers = { - kustomization = kustomization.aks_zero - } - source = "kbst.xyz/catalog/nginx/kustomization" - version = "1.1.3-kbst.1" - - configuration = { - apps = { - patches = [{ - patch = <<-EOF - apiVersion: v1 - kind: Service - metadata: - name: ingress-nginx-controller - namespace: ingress-nginx - spec: - loadBalancerIP: ${module.aks_zero.default_ingress_ip} - EOF - }] - } - - ops = {} - - loc = {} - } -} diff --git a/quickstart/src/configurations/eks/eks_zero_ingress.tf b/quickstart/src/configurations/eks/eks_zero_ingress.tf deleted file mode 100644 index 95ce8c79..00000000 --- a/quickstart/src/configurations/eks/eks_zero_ingress.tf +++ /dev/null @@ -1,29 +0,0 @@ -module "eks_zero_nginx" { - providers = { - kustomization = kustomization.eks_zero - } - source = "kbst.xyz/catalog/nginx/kustomization" - version = "1.1.3-kbst.1" - - configuration = { - apps = {} - - ops = {} - - loc = {} - } -} - -module "eks_zero_dns_zone" { - providers = { - aws = aws.eks_zero - kubernetes = kubernetes.eks_zero - } - - source = "github.com/kbst/terraform-kubestack//aws/cluster/elb-dns?ref={{version}}" - - ingress_service_name = "ingress-nginx-controller" - ingress_service_namespace = "ingress-nginx" - - metadata_fqdn = module.eks_zero.current_metadata["fqdn"] -} diff --git a/quickstart/src/configurations/gke/gke_zero_ingress.tf b/quickstart/src/configurations/gke/gke_zero_ingress.tf deleted file mode 100644 index c5166436..00000000 --- a/quickstart/src/configurations/gke/gke_zero_ingress.tf +++ /dev/null @@ -1,27 +0,0 @@ -module "gke_zero_nginx" { - providers = { - kustomization = kustomization.gke_zero - } - source = "kbst.xyz/catalog/nginx/kustomization" - version = "1.1.3-kbst.1" - - configuration = { - apps = { - patches = [{ - patch = <<-EOF - apiVersion: v1 - kind: Service - metadata: - name: ingress-nginx-controller - namespace: ingress-nginx - spec: - loadBalancerIP: ${module.gke_zero.default_ingress_ip} - EOF - }] - } - - ops = {} - - loc = {} - } -} diff --git a/quickstart/src/configurations/multi-cloud/aks_zero_ingress.tf b/quickstart/src/configurations/multi-cloud/aks_zero_ingress.tf deleted file mode 100644 index 2cde75f8..00000000 --- a/quickstart/src/configurations/multi-cloud/aks_zero_ingress.tf +++ /dev/null @@ -1,27 +0,0 @@ -module "aks_zero_nginx" { - providers = { - kustomization = kustomization.aks_zero - } - source = "kbst.xyz/catalog/nginx/kustomization" - version = "1.1.3-kbst.1" - - configuration = { - apps = { - patches = [{ - patch = <<-EOF - apiVersion: v1 - kind: Service - metadata: - name: ingress-nginx-controller - namespace: ingress-nginx - spec: - loadBalancerIP: ${module.aks_zero.default_ingress_ip} - EOF - }] - } - - ops = {} - - loc = {} - } -} diff --git a/quickstart/src/configurations/multi-cloud/eks_zero_ingress.tf b/quickstart/src/configurations/multi-cloud/eks_zero_ingress.tf deleted file mode 100644 index 95ce8c79..00000000 --- a/quickstart/src/configurations/multi-cloud/eks_zero_ingress.tf +++ /dev/null @@ -1,29 +0,0 @@ -module "eks_zero_nginx" { - providers = { - kustomization = kustomization.eks_zero - } - source = "kbst.xyz/catalog/nginx/kustomization" - version = "1.1.3-kbst.1" - - configuration = { - apps = {} - - ops = {} - - loc = {} - } -} - -module "eks_zero_dns_zone" { - providers = { - aws = aws.eks_zero - kubernetes = kubernetes.eks_zero - } - - source = "github.com/kbst/terraform-kubestack//aws/cluster/elb-dns?ref={{version}}" - - ingress_service_name = "ingress-nginx-controller" - ingress_service_namespace = "ingress-nginx" - - metadata_fqdn = module.eks_zero.current_metadata["fqdn"] -} diff --git a/quickstart/src/configurations/multi-cloud/gke_zero_ingress.tf b/quickstart/src/configurations/multi-cloud/gke_zero_ingress.tf deleted file mode 100644 index c5166436..00000000 --- a/quickstart/src/configurations/multi-cloud/gke_zero_ingress.tf +++ /dev/null @@ -1,27 +0,0 @@ -module "gke_zero_nginx" { - providers = { - kustomization = kustomization.gke_zero - } - source = "kbst.xyz/catalog/nginx/kustomization" - version = "1.1.3-kbst.1" - - configuration = { - apps = { - patches = [{ - patch = <<-EOF - apiVersion: v1 - kind: Service - metadata: - name: ingress-nginx-controller - namespace: ingress-nginx - spec: - loadBalancerIP: ${module.gke_zero.default_ingress_ip} - EOF - }] - } - - ops = {} - - loc = {} - } -} From e606b6e4b78bf099e6c3942445e8cc031faa047b Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Sat, 23 Jul 2022 08:55:57 +0200 Subject: [PATCH 2/2] Lock tls provider version Upstream issue: https://github.com/hashicorp/terraform-provider-tls/issues/244 --- aws/_modules/eks/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/_modules/eks/versions.tf b/aws/_modules/eks/versions.tf index f0279bf5..208168ee 100644 --- a/aws/_modules/eks/versions.tf +++ b/aws/_modules/eks/versions.tf @@ -16,7 +16,7 @@ terraform { tls = { # https://registry.terraform.io/providers/hashicorp/tls/latest source = "hashicorp/tls" - version = ">= 3.1.0" + version = "3.4.0" } }