diff --git a/tofu/135a.tf-magnum-capi b/tofu/135a.tf-magnum-capi new file mode 100644 index 00000000..e9c88c54 --- /dev/null +++ b/tofu/135a.tf-magnum-capi @@ -0,0 +1,39 @@ +resource "openstack_containerinfra_cluster_v1" "k8s_135a" { + name = "paws${var.name[var.datacenter]}-135a" + cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_135a.id + master_count = 1 + node_count = var.workers[var.datacenter] +} + +resource "local_file" "kube_config" { + content = resource.openstack_containerinfra_cluster_v1.k8s_135a.kubeconfig.raw_config + filename = "kube.config" +} + +resource "openstack_containerinfra_clustertemplate_v1" "template_135a" { + name = "paws${var.name[var.datacenter]}-135a" + coe = "kubernetes" + dns_nameserver = "8.8.8.8" + docker_storage_driver = "overlay2" + docker_volume_size = var.volume_size[var.datacenter] + 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] + image = "47b0da60-68d3-42af-b8b2-d56ef809e041" + keypair_id = "abogottcodfw1dev" + master_flavor = var.control_flavor[var.datacenter] + network_driver = "calico" + + labels = { + kube_tag = "v1.35.4" + container_runtime = "containerd" + containerd_version = "1.6.28" + containerd_tarball_sha256 = "f70736e52d61e5ad225f4fd21643b5ca1220013ab8b6c380434caeefb572da9b" + cloud_provider_tag = "v1.35.0" + cinder_csi_plugin_tag = "v1.35.0" + k8s_keystone_auth_tag = "v1.35.0" + magnum_auto_healer_tag = "v1.35.0" + octavia_ingress_controller_tag = "v1.35.0" + } +} diff --git a/tofu/secrets.tf b/tofu/secrets.tf index cff36858..bee4ed43 100644 Binary files a/tofu/secrets.tf and b/tofu/secrets.tf differ diff --git a/tofu/vars.tf b/tofu/vars.tf index fd96c91d..e9ed8029 100644 --- a/tofu/vars.tf +++ b/tofu/vars.tf @@ -29,7 +29,7 @@ variable "tenant_id" { variable "application_credential_id" { type = map(any) default = { - "codfw1dev" = "6b404a11241446c7a52c04f39983eda6" + "codfw1dev" = "bf73b834dbde42d2885dba4731ffc82e" "eqiad1" = "bdd99e48bdac4b22813cb00c8d3ece67" } } @@ -45,7 +45,7 @@ variable "worker_flavor" { variable "control_flavor" { type = map(any) default = { - "codfw1dev" = "g4.cores1.ram2.disk20" + "codfw1dev" = "g4.cores2.ram4.disk20" "eqiad1" = "g4.cores2.ram4.disk20" } } @@ -73,7 +73,7 @@ variable "fixed_network" { variable "fixed_subnet" { type = map(any) default = { - "codfw1dev" = "vxlan-dualstack-ipv4" + "codfw1dev" = "cloud-flat-codfw1dev" "eqiad1" = "vxlan-dualstack-ipv4" } }