From df4e1f0d5c9cd0c8d4861b12250764a5cea0a178 Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Wed, 6 May 2026 15:02:43 -0500 Subject: [PATCH 1/4] Update codfw1dev app credentials --- tofu/secrets.tf | Bin 317 -> 317 bytes tofu/vars.tf | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/secrets.tf b/tofu/secrets.tf index cff368583052da539b5c013797b5eb14b0d879e4..bee4ed43c35df97496240089eaa6b53e4ff6cc39 100644 GIT binary patch literal 317 zcmV-D0mA+OM@dveQdv+`0N&r-tx~?53Y=FWc8>b60RnA7(Ni@)UMP z7m?;qYQp`uY*su(l;~>wPX3w3wJY}~e$1&xyAzPuPsPPZiu zNMgS1p1V7ZNYjqI(qmv4PuN-6f~oKm#X~nGQFm{rnz9 zla#?G6LTGFy8_esqPvEU*m2?v`g8Ljj}?)X&7Zd1^hWcsdFy|Z%*%@#!7s9+XMDZ| zk75Gd{t&vA2M{+$l|a7F-8-7+c*7e=8d*gVA6;ao=MvOzi)aPTW=WGU)5BZsMHkgN zcBhLfXvfJ~^HxM=ET4N8wq#s#wJHNxjb@OZN^hO+1sE?ev~CDZ)5P9Eq3qQK@vPvE P^`pVY=>7d8a4TJ@H<6m` diff --git a/tofu/vars.tf b/tofu/vars.tf index fd96c91d..67da51e8 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" } } From b3d15f9ac9617462f0c5e3d7e21531cc5c5e0f03 Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Wed, 6 May 2026 15:07:59 -0500 Subject: [PATCH 2/4] Added sample tofu config for magnum-cluster-api --- tofu/135a.tf-magnum-capi | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 tofu/135a.tf-magnum-capi 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" + } +} From 2b29bfc2ef1c813887e33509bac783dbc9eaaadc Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Wed, 6 May 2026 19:01:38 -0500 Subject: [PATCH 3/4] Update vars.tf to work in codfw1dev w/magnum-cluster-api --- tofu/vars.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tofu/vars.tf b/tofu/vars.tf index 67da51e8..5d3ac8f9 100644 --- a/tofu/vars.tf +++ b/tofu/vars.tf @@ -38,7 +38,7 @@ variable "application_credential_id" { variable "worker_flavor" { type = map(any) default = { - "codfw1dev" = "g4.cores1.ram2.disk20" + "codfw1dev" = "g4.cores2.ram4.disk20" "eqiad1" = "g4.cores8.ram32.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" } } From bb99ef4c4c653b9681894fda26cf79570df528f5 Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Wed, 6 May 2026 21:35:09 -0500 Subject: [PATCH 4/4] vars.tf: adjust node side in codfw1dev The controller seems to need more than 2G of RAM. --- tofu/vars.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tofu/vars.tf b/tofu/vars.tf index 5d3ac8f9..e9ed8029 100644 --- a/tofu/vars.tf +++ b/tofu/vars.tf @@ -38,14 +38,14 @@ variable "application_credential_id" { variable "worker_flavor" { type = map(any) default = { - "codfw1dev" = "g4.cores2.ram4.disk20" + "codfw1dev" = "g4.cores1.ram2.disk20" "eqiad1" = "g4.cores8.ram32.disk20" } } variable "control_flavor" { type = map(any) default = { - "codfw1dev" = "g4.cores1.ram2.disk20" + "codfw1dev" = "g4.cores2.ram4.disk20" "eqiad1" = "g4.cores2.ram4.disk20" } }