cleanup: remove `temp-privatek8s` remaining references (#262)

pull/265/head
Hervé Le Meur 2 months ago committed by GitHub
parent 065dd7834e
commit 838d382472
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -40,9 +40,6 @@ locals {
smerle33 = "82.64.5.129"
}
# TODO: remove when switching infra.ci.jenkins.io from temp-privatek8s to privatek8s
temp_privatek8s_pod_ip = "20.72.105.159"
default_tags = {
scope = "terraform-managed"
repository = "jenkins-infra/azure"

@ -28,14 +28,11 @@ resource "azurerm_kubernetes_cluster" "privatek8s" {
kubernetes_version = var.kubernetes_version
dns_prefix = "privatek8s-${random_pet.suffix_privatek8s.id}"
role_based_access_control_enabled = true # default value, added to please tfsec
api_server_access_profile {
authorized_ip_ranges = setunion(
values(local.admin_allowed_ips),
data.azurerm_subnet.private_vnet_data_tier.address_prefixes,
# temp-privatek8s nodes subnet
data.azurerm_subnet.default.address_prefixes,
[local.temp_privatek8s_pod_ip]
)
}

@ -47,14 +47,6 @@ data "azurerm_virtual_network" "private" {
## SUB NETWORKS
################################################################################
# Deprecation notice: not included in https://github.com/jenkins-infra/azure-net
# temp-privatek8s subnet
data "azurerm_subnet" "default" {
name = "default"
virtual_network_name = data.azurerm_virtual_network.private_prod.name
resource_group_name = data.azurerm_resource_group.private_prod.name
}
# Defined in https://github.com/jenkins-infra/azure-net/blob/main/vpn.tf
data "azurerm_subnet" "private_vnet_data_tier" {
name = "${data.azurerm_virtual_network.private.name}-data-tier"

Loading…
Cancel
Save