diff --git a/.shared-tools b/.shared-tools index bff6ffc..5296c68 160000 --- a/.shared-tools +++ b/.shared-tools @@ -1 +1 @@ -Subproject commit bff6ffc20b36d0ee4ce9dce68560e671e7065f2a +Subproject commit 5296c68197ad5bf924fdd8220f032f1e260dc634 diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 015b76d..ecac6c6 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -27,28 +27,6 @@ provider "registry.terraform.io/digitalocean/digitalocean" { ] } -provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.30.0" - hashes = [ - "h1:+Je5UPTWMmO4eG5ep1WfujkXQI9tDk0OsMU4olU76Bg=", - "h1:UNl9l/iN6mrImpC7PNxdx93ycl3iLQdBKoYmCw8rYDc=", - "h1:wRVWY3sK32BNInDOlQnoGSmL638f3jjLFypCAotwpc8=", - "h1:z0Gy1p59XfS9MawIqCck7m2eeEEhAj6D7n8Ngglu8vE=", - "zh:06531333a72fe6d2829f37a328e08a3fc4ed66226344a003b62418a834ac6c69", - "zh:34480263939ef5007ce65c9f4945df5cab363f91e5260ae552bcd9f2ffeed444", - "zh:59e71f9177da570c33507c44828288264c082d512138c5755800f2cd706c62bc", - "zh:6e979b0c07326f9c8d1999096a920322d22261ca61d346b3a9775283d00a2fa5", - "zh:73e3f228de0077b5c0a84ec5b1ada507fbb3456cba35a6b5758723f77715b7af", - "zh:79e0de985159c056f001cc47a654620d51f5d55f554bcbcde1fe7d52f667db40", - "zh:8accb9100f609377db42e3ced42cc9d5c36065a06644dfb21d3893bb8d4797fd", - "zh:9f99aa0bf5caa4223a7dbf5d22d71c16083e782c4eea4b0130abfd6e6f1cec18", - "zh:bcb2ad76ad05ec23f8da62231a2360d1f70bbcd28abd06b8458a9e2f17da7873", - "zh:bce317d7790c2d3c4e724726dc78070db28daf7d861faa646fc891fe28842a29", - "zh:ed0a8e7fa8a1c419a19840b421d18200c3a63cf16ccbcbc400cb375d5397f615", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} - provider "registry.terraform.io/hashicorp/local" { version = "2.5.1" hashes = [ diff --git a/dns.tf b/dns.tf index 0f04abd..f1cdaa2 100644 --- a/dns.tf +++ b/dns.tf @@ -4,13 +4,6 @@ resource "digitalocean_domain" "do_jenkins_io" { name = "do.jenkins.io" } -resource "digitalocean_record" "repo_ipv4" { - domain = digitalocean_domain.do_jenkins_io.id - type = "A" - name = "repo" - value = data.digitalocean_loadbalancer.doks_public.ip -} - resource "digitalocean_record" "archives_ipv4" { domain = digitalocean_domain.do_jenkins_io.id type = "A" diff --git a/doks-cluster.tf b/doks-cluster.tf index 4cd485b..f618901 100644 --- a/doks-cluster.tf +++ b/doks-cluster.tf @@ -53,19 +53,3 @@ provider "kubernetes" { "--version=v1beta1", digitalocean_kubernetes_cluster.doks_cluster.id] } } - -# Configure the jenkins-infra/kubernetes-management admin service account -module "doks_admin_sa" { - providers = { - kubernetes = kubernetes.doks - } - source = "./.shared-tools/terraform/modules/kubernetes-admin-sa" - cluster_name = local.cluster_name - cluster_hostname = digitalocean_kubernetes_cluster.doks_cluster.kube_config.0.host - cluster_ca_certificate_b64 = digitalocean_kubernetes_cluster.doks_cluster.kube_config.0.cluster_ca_certificate -} - -output "kubeconfig_doks" { - sensitive = true - value = module.doks_admin_sa.kubeconfig -} diff --git a/doks-public-cluster.tf b/doks-public-cluster.tf index 190cfb6..52531f9 100644 --- a/doks-public-cluster.tf +++ b/doks-public-cluster.tf @@ -40,27 +40,3 @@ provider "kubernetes" { "--version=v1beta1", digitalocean_kubernetes_cluster.doks_public_cluster.id] } } - -# Configure the jenkins-infra/kubernetes-management admin service account -module "doks_public_admin_sa" { - providers = { - kubernetes = kubernetes.doks_public - } - source = "./.shared-tools/terraform/modules/kubernetes-admin-sa" - cluster_name = local.public_cluster_name - cluster_hostname = digitalocean_kubernetes_cluster.doks_public_cluster.kube_config.0.host - cluster_ca_certificate_b64 = digitalocean_kubernetes_cluster.doks_public_cluster.kube_config.0.cluster_ca_certificate -} - -output "kubeconfig_doks_public" { - sensitive = true - value = module.doks_public_admin_sa.kubeconfig -} - -data "digitalocean_loadbalancer" "doks_public" { - name = "a04ff19a8410b4ac5a2b5c383b23a8b2" -} - -output "doks_public_public_ipv4_address" { - value = data.digitalocean_loadbalancer.doks_public.ip -}