diff --git a/tofu/126-2.tf b/tofu/126-2.tf index 4421ce6..d08ff78 100644 --- a/tofu/126-2.tf +++ b/tofu/126-2.tf @@ -5,11 +5,6 @@ resource "openstack_containerinfra_cluster_v1" "k8s_126_2" { node_count = var.workers[var.datacenter] } -resource "local_file" "kube_config" { - content = resource.openstack_containerinfra_cluster_v1.k8s_126_2.kubeconfig.raw_config - filename = "kube.config" -} - resource "openstack_containerinfra_clustertemplate_v1" "template_126_2" { name = "superset${var.name[var.datacenter]}-126-2" coe = "kubernetes" @@ -19,10 +14,10 @@ resource "openstack_containerinfra_clustertemplate_v1" "template_126_2" { external_network_id = var.external_network_id[var.datacenter] fixed_subnet = var.fixed_subnet[var.datacenter] fixed_network = var.fixed_network[var.datacenter] - flavor = var.worker_flavor[var.datacenter] + flavor = "g3.cores2.ram4.disk20" floating_ip_enabled = "false" image = "Fedora-CoreOS-38" - master_flavor = var.control_flavor[var.datacenter] + master_flavor = "g3.cores2.ram4.disk20" network_driver = "flannel" labels = { diff --git a/tofu/127.tf b/tofu/127.tf new file mode 100644 index 0000000..d54b17b --- /dev/null +++ b/tofu/127.tf @@ -0,0 +1,36 @@ +resource "openstack_containerinfra_cluster_v1" "k8s_127" { + name = "superset${var.name[var.datacenter]}-127" + cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_127.id + master_count = 1 + node_count = var.workers[var.datacenter] +} + +resource "local_file" "kube_config" { + content = resource.openstack_containerinfra_cluster_v1.k8s_127.kubeconfig.raw_config + filename = "kube.config" +} + +resource "openstack_containerinfra_clustertemplate_v1" "template_127" { + name = "superset${var.name[var.datacenter]}-127" + coe = "kubernetes" + dns_nameserver = "8.8.8.8" + docker_storage_driver = "overlay2" + docker_volume_size = "50" + external_network_id = var.external_network_id[var.datacenter] + fixed_subnet = var.fixed_subnet[var.datacenter] + fixed_network = var.fixed_network[var.datacenter] + flavor = var.worker_flavor[var.datacenter] + floating_ip_enabled = "false" + image = "Fedora-CoreOS-38" + master_flavor = var.control_flavor[var.datacenter] + network_driver = "flannel" + + labels = { + kube_tag = "v1.26.8-rancher1" + container_runtime = "containerd" + containerd_version = "1.6.20" + containerd_tarball_sha256 = "1d86b534c7bba51b78a7eeb1b67dd2ac6c0edeb01c034cc5f590d5ccd824b416" + hyperkube_prefix = "docker.io/rancher/" + cloud_provider_enabled = "true" + } +} diff --git a/tofu/vars.tf b/tofu/vars.tf index 26632c9..8e7ce59 100644 --- a/tofu/vars.tf +++ b/tofu/vars.tf @@ -38,15 +38,15 @@ variable "application_credential_id" { variable "worker_flavor" { type = map(any) default = { - "codfw1dev" = "g3.cores1.ram2.disk20" - "eqiad1" = "g3.cores2.ram4.disk20" + "codfw1dev" = "g4.cores1.ram2.disk20" + "eqiad1" = "g4.cores2.ram4.disk20" } } variable "control_flavor" { type = map(any) default = { - "codfw1dev" = "g3.cores1.ram2.disk20" - "eqiad1" = "g3.cores2.ram4.disk20" + "codfw1dev" = "g4.cores1.ram2.disk20" + "eqiad1" = "g4.cores2.ram4.disk20" } } variable "external_network_id" {