From af1c54c34eaf7fe17e671efadacd048accf88eb2 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Mon, 2 Nov 2020 13:03:04 +0100
Subject: [PATCH] Remove secure-runner2
As it turns out, secure-runner2 isn't fast enough to serve as CI/CD and if we keep rescaling it to be
large enough, it'll be more expensive than secure-runner1 which is a lot faster. So, it'd be most
useful to just get rid of this VPS.
---
docs/ssh-hostkeys.txt | 11 -----------
docs/ssh-known_hosts.txt | 5 -----
hosts | 2 --
tf-stage1/archlinux.tf | 35 -----------------------------------
4 files changed, 53 deletions(-)
diff --git a/docs/ssh-hostkeys.txt b/docs/ssh-hostkeys.txt
index 5bbabbb7b..dbda2f6ea 100644
--- a/docs/ssh-hostkeys.txt
+++ b/docs/ssh-hostkeys.txt
@@ -262,17 +262,6 @@
256 MD5:ae:29:1d:79:35:95:58:df:fe:0b:3a:d7:0e:78:21:83 root@secure-runner1.archlinux.org (ED25519)
3072 MD5:e2:d2:34:cb:4d:d4:03:da:02:00:14:79:25:03:0c:00 root@secure-runner1.archlinux.org (RSA)
-# secure-runner2.archlinux.org
-1024 SHA256:tHv5yztps9GNQ+7ZHn4SyZek2wdRSZzyWB3gCrg5+kM root@archlinux-packer (DSA)
-256 SHA256:xNfocKLXobbP2GNj8mz5Ymw2QSkETdLmhK5gAHhx8kQ root@archlinux-packer (ECDSA)
-256 SHA256:KZBmB6CIFenj2NsJ889BW7ud04HHUiG1MCqRE3YNG1w root@archlinux-packer (ED25519)
-3072 SHA256:cb20RgqouDfYOFZhtadCyh6csbRZuckQe+LADXujJp0 root@archlinux-packer (RSA)
-
-1024 MD5:f0:b7:05:fa:22:20:1e:75:ab:c4:78:d4:2d:b9:e8:5b root@archlinux-packer (DSA)
-256 MD5:c4:d0:03:fd:e4:dc:7a:ac:04:3a:42:5d:55:86:1c:e3 root@archlinux-packer (ECDSA)
-256 MD5:2f:40:55:7a:04:22:fe:58:a5:cf:49:a4:e6:64:da:09 root@archlinux-packer (ED25519)
-3072 MD5:9f:4c:13:48:d2:93:aa:6e:9c:ac:2a:bc:69:69:2c:e3 root@archlinux-packer (RSA)
-
# state.archlinux.org
1024 SHA256:4oNX8CksPEgIzibu+ETa2OVVPBX2pzcvcVUa60NbHiQ root@archlinux-packer (DSA)
256 SHA256:uR7EDdVrvkZf43eNmumOeu2MeZn4oMB39ad9kHoobkk root@archlinux-packer (ECDSA)
diff --git a/docs/ssh-known_hosts.txt b/docs/ssh-known_hosts.txt
index 288efd106..4db62a887 100644
--- a/docs/ssh-known_hosts.txt
+++ b/docs/ssh-known_hosts.txt
@@ -118,11 +118,6 @@ secure-runner1.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTY
secure-runner1.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMpWQvhycZ9ptNJWaEZ9I8fuOQgC1rH6MVIs5G8dzxUP
secure-runner1.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4TpbxQujXurVnFtUEE/icvF0/scqpGxAiCN2gzgnoqHidk+60yOgqE5FZnCr2vG6l0pZQKcY0NYRmcJN7PJqI9Kg0OVBByubXeWEadErgxWa1yYloFF9biHvFe21xdTCBFfeVz4ImUGEUNHzzUgcbjBnxJ2kBQpj0c87LlPbPNqW5T01xZHHojsGR/eeQ4P1G4ljn1gABgAaFtdGQGySsx7W3VakNRUMih0H7q8Q1dyMnqodObRn9PMPCx+kMu9yGkS5a9Q18Il9GmKEb+u2gPFg79CSHpmYq3qHwX86aR6DnAALT0WhlB9nvt1tn6pbAw5rEmo7KxefDWsj4es+DZ8Dh/oO5tA0qz+5j3n12ZOlC0r1+9EmnhrKDdH1SkEyScV+RZfuGiJzyIDVCxv6yCVcoVMFF6MLnr2qmVSXGYGiNItG7Mv3yckWr2mNNJruSN6uzjTmOXsyuekBjnADVi0/UCHD97VnaAcHgE0Glb+yeby780xWo2LG8uOCtbF8=
-# secure-runner2.archlinux.org
-secure-runner2.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOZ7lzKShZoXOYorQqFc1gw7i+NhkVh8+r4DegIvhyDUpTDYKU1fHAHe4g1RZPkRAeDpKD0aq3pnCL+jSiCGDW4=
-secure-runner2.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILH01KTUwdFtvVND1GQ99zeiIjOJ/YJA6YZbh+Eg3avQ
-secure-runner2.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC1RCVkgXt38bPZGRqXu+NlR6uVVLfa5YNYhAj6hsDaKBjLnLLi4EZRxxfrBA8qkihMTzeDNswZNTa7Vu8ce+lhVxGvtYuu/48wnSgVLeabMI2di/nKNH/OB68l1ruQIyE+g1Ncef9zxMRDB5qcX1lfzzsIQRNt/152I9cITSwVvabcy/8b9cce1oZPAJdK6ajWWDVJGrSS34g+ot0W6Aa569kZOkXuPGNBgs1R25RJPeYMvFKVLQHlD52Uzl+QCJmOtRaHL0+af/Hm7AD+xSjDfhKjwEG0yO0ZLUAWoIALn5P5FnhWfrqeNYhqDRSMjo1Si2Il4Sm2r5OQVWK7OKHrnPEBtwrDIF3/g8w8aJBHJmaZiFvMnIBlVVkLKswcqAuq5IdJy+7yU9aeFeYe1yJHsocl0ATDJyxaVvqSFJhKI5qP8L71iUs4ZdHCwycGNhjiKEVcJjF4uBsKkp22Fqdvyeu5ezbrMhp5YYCWN3w2Wrs1CfYuRp0eDWk6B0WfKx0=
-
# state.archlinux.org
state.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB2HL4mX0ma/+jI39lCn0V8+5V+C2kz8BoWxJUME8VYFP8yQo93t0mYylUWRTfcK58RhFsfHfRuEflndeRlLqEk=
state.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFbZyVxaIdyd5f/dhPN7qGBnOSpLCYzoEqAKuakhi5ou
diff --git a/hosts b/hosts
index 81ea85c31..03e543b53 100644
--- a/hosts
+++ b/hosts
@@ -74,7 +74,6 @@ dragon.archlinux.org
[gitlab_runners]
runner2.archlinux.org
secure-runner1.archlinux.org
-secure-runner2.archlinux.org
[reproduciblebuilds]
repro3.pkgbuild.com
@@ -97,7 +96,6 @@ gitlab.archlinux.org
reproducible.archlinux.org
runner2.archlinux.org
secure-runner1.archlinux.org
-secure-runner2.archlinux.org
phrik.archlinux.org
quassel.archlinux.org
state.archlinux.org
diff --git a/tf-stage1/archlinux.tf b/tf-stage1/archlinux.tf
index 8d3757def..98d5010f4 100644
--- a/tf-stage1/archlinux.tf
+++ b/tf-stage1/archlinux.tf
@@ -597,20 +597,6 @@ resource "hetznerdns_record" "archlinux_org_secure_runner1_aaaa" {
type = "AAAA"
}
-resource "hetznerdns_record" "archlinux_org_secure_runner2_a" {
- zone_id = hetznerdns_zone.archlinux.id
- name = "secure-runner2"
- value = hcloud_server.secure-runner2.ipv4_address
- type = "A"
-}
-
-resource "hetznerdns_record" "archlinux_org_secure_runner2_aaaa" {
- zone_id = hetznerdns_zone.archlinux.id
- name = "secure-runner2"
- value = hcloud_server.secure-runner2.ipv6_address
- type = "AAAA"
-}
-
resource "hetznerdns_record" "archlinux_org_svn2gittest_a" {
zone_id = hetznerdns_zone.archlinux.id
name = "svn2gittest"
@@ -1205,27 +1191,6 @@ resource "hcloud_server" "monitoring" {
}
}
-resource "hcloud_rdns" "secure-runner2_ipv4" {
- server_id = hcloud_server.secure-runner2.id
- ip_address = hcloud_server.secure-runner2.ipv4_address
- dns_ptr = "secure-runner2.archlinux.org"
-}
-
-resource "hcloud_rdns" "secure-runner2_ipv6" {
- server_id = hcloud_server.secure-runner2.id
- ip_address = hcloud_server.secure-runner2.ipv6_address
- dns_ptr = "secure-runner2.archlinux.org"
-}
-
-resource "hcloud_server" "secure-runner2" {
- name = "secure-runner2.archlinux.org"
- image = data.hcloud_image.archlinux.id
- server_type = "cpx31"
- lifecycle {
- ignore_changes = [image]
- }
-}
-
resource "hcloud_rdns" "svn2gittest_ipv4" {
server_id = hcloud_server.svn2gittest.id
ip_address = hcloud_server.svn2gittest.ipv4_address
--
GitLab