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

hotfix(publick8s) #432

Merged
merged 1 commit into from
Jul 7, 2023
Merged

hotfix(publick8s) #432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 26 additions & 15 deletions publick8s.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,22 @@ resource "azurerm_kubernetes_cluster" "publick8s" {
#tfsec:ignore:azure-container-configured-network-policy
network_profile {
network_plugin = "kubenet"
ip_versions = ["IPv4", "IPv6"]
# These ranges must NOT overlap with any of the subnets
pod_cidrs = ["10.100.0.0/16", "fd12:3456:789a::/64"]
ip_versions = ["IPv4", "IPv6"]
}

default_node_pool {
name = "systempool"
vm_size = "Standard_D2as_v4" # 2 vCPU, 8 GB RAM, 16 GB disk, 4000 IOPS
os_disk_type = "Ephemeral"
os_disk_size_gb = 30
orchestrator_version = local.kubernetes_versions["publick8s"]
node_count = 1
vnet_subnet_id = data.azurerm_subnet.publick8s_tier.id
pod_subnet_id = data.azurerm_subnet.publick8s_tier.id
tags = local.default_tags
zones = [3]
name = "systempool"
vm_size = "Standard_D2as_v4" # 2 vCPU, 8 GB RAM, 16 GB disk, 4000 IOPS
os_disk_type = "Ephemeral"
os_disk_size_gb = 30
orchestrator_version = local.kubernetes_versions["publick8s"]
node_count = 1
vnet_subnet_id = data.azurerm_subnet.publick8s_tier.id
tags = local.default_tags
temporary_name_for_rotation = "systempool2"
zones = [3]
}

identity {
Expand All @@ -81,7 +83,6 @@ resource "azurerm_kubernetes_cluster_node_pool" "publicpool" {
max_count = 10
zones = [3]
vnet_subnet_id = data.azurerm_subnet.publick8s_tier.id
pod_subnet_id = data.azurerm_subnet.publick8s_tier.id
tags = local.default_tags
}

Expand All @@ -97,7 +98,6 @@ resource "azurerm_kubernetes_cluster_node_pool" "x86medium" {
max_count = 10
zones = [3]
vnet_subnet_id = data.azurerm_subnet.publick8s_tier.id
pod_subnet_id = data.azurerm_subnet.publick8s_tier.id
tags = local.default_tags
}

Expand All @@ -113,7 +113,6 @@ resource "azurerm_kubernetes_cluster_node_pool" "arm64small" {
max_count = 10
zones = [1]
vnet_subnet_id = data.azurerm_subnet.publick8s_tier.id
pod_subnet_id = data.azurerm_subnet.publick8s_tier.id
tags = local.default_tags
}

Expand All @@ -129,7 +128,6 @@ resource "azurerm_kubernetes_cluster_node_pool" "arm64small2" {
max_count = 10
zones = [1]
vnet_subnet_id = data.azurerm_subnet.publick8s_tier.id
pod_subnet_id = data.azurerm_subnet.publick8s_tier.id
tags = local.default_tags
node_taints = [
"kubernetes.io/arch=arm64:NoSchedule",
Expand Down Expand Up @@ -165,6 +163,19 @@ resource "kubernetes_storage_class" "managed_csi_premium_retain_public" {
allow_volume_expansion = true
}

resource "kubernetes_storage_class" "azurefile_csi_premium_retain_public" {
metadata {
name = "azurefile-csi-premium-retain"
}
storage_provisioner = "file.csi.azure.com"
reclaim_policy = "Retain"
parameters = {
skuname = "Premium_LRS"
}
mount_options = ["dir_mode=0777", "file_mode=0777", "uid=1000", "gid=1000", "mfsymlinks", "nobrl"]
provider = kubernetes.publick8s
}

# Used later by the load balancer deployed on the cluster, see https://github.com/jenkins-infra/kubernetes-management/config/publick8s.yaml
resource "azurerm_public_ip" "publick8s_ipv4" {
name = "public-publick8s-ipv4"
Expand Down