Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup: empty doks and doks-public Kubernetes clusters #198

Merged
merged 3 commits into from
May 21, 2024
Merged

cleanup: empty doks and doks-public Kubernetes clusters #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce0b13c
cleanup: empty doks and doks-public Kubernetes clusters as per https:…
dduportal May 21, 2024
4ee98fd
fixup
dduportal May 21, 2024
37412ca
fixup
dduportal May 21, 2024
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
2 changes: 1 addition & 1 deletion .shared-tools
Open in desktop
Submodule .shared-tools updated 10 files
+17 −0 README.adoc
+106 −0 adoptium/adoptium-get-jdk-link.sh
+55 −0 adoptium/adoptium-install-jdk.sh
+4 −0 terraform/modules/azure-jenkinsinfra-inbound-agents/locals.tf
+120 −0 terraform/modules/azure-jenkinsinfra-inbound-agents/main.tf
+7 −0 terraform/modules/azure-jenkinsinfra-inbound-agents/outputs.tf
+7 −0 terraform/modules/azure-jenkinsinfra-inbound-agents/providers.tf
+35 −0 terraform/modules/azure-jenkinsinfra-inbound-agents/variables.tf
+5 −0 terraform/modules/azure-nat-gateway/main.tf
+2 −2 terraform/modules/jenkins-infra-shared-data/outputs.tf
22 changes: 0 additions & 22 deletions .terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions dns.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 0 additions & 16 deletions doks-cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
24 changes: 0 additions & 24 deletions doks-public-cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}