From 320e05e7fe0e6e9249d5894a1bd26b7b420c2fbb Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Tue, 18 Jun 2024 12:01:51 -0500 Subject: [PATCH 1/3] Update openstack app cred ID In theory this uses the same secret as before. --- tofu/vars.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/vars.tf b/tofu/vars.tf index 8087a3e..3511734 100644 --- a/tofu/vars.tf +++ b/tofu/vars.tf @@ -9,5 +9,5 @@ variable "tenant_id" { } variable "application_credential_id" { type = string - default = "4917ce71b98e498e8a6c5814b095b28e" + default = "446ab9c3713b4a0b8c2da540021dd314" } From de625a6c41db206b57114b7d15f8b98163b70792 Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Tue, 18 Jun 2024 12:06:11 -0500 Subject: [PATCH 2/3] Update instance flavors from g3 to g4 This will cause the next deployment to land on OVS. --- tofu/123.tf | 5 ----- tofu/124.tf | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 tofu/124.tf diff --git a/tofu/123.tf b/tofu/123.tf index d29dcac..7d0f29f 100644 --- a/tofu/123.tf +++ b/tofu/123.tf @@ -5,11 +5,6 @@ resource "openstack_containerinfra_cluster_v1" "k8s_123_2" { node_count = 2 } -resource "local_file" "kube_config" { - content = resource.openstack_containerinfra_cluster_v1.k8s_123_2.kubeconfig.raw_config - filename = "kube.config" -} - resource "openstack_containerinfra_clustertemplate_v1" "template_123_2" { name = "quarry-123-2" coe = "kubernetes" diff --git a/tofu/124.tf b/tofu/124.tf new file mode 100644 index 0000000..d4ce436 --- /dev/null +++ b/tofu/124.tf @@ -0,0 +1,33 @@ +resource "openstack_containerinfra_cluster_v1" "k8s_124" { + name = "quarry-124" + cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_124.id + master_count = 1 + node_count = 2 +} + +resource "local_file" "kube_config" { + content = resource.openstack_containerinfra_cluster_v1.k8s_124.kubeconfig.raw_config + filename = "kube.config" +} + +resource "openstack_containerinfra_clustertemplate_v1" "template_124" { + name = "quarry-124" + coe = "kubernetes" + dns_nameserver = "8.8.8.8" + docker_storage_driver = "overlay2" + docker_volume_size = 20 + external_network_id = "wan-transport-eqiad" + fixed_subnet = "cloud-instances2-b-eqiad" + fixed_network = "lan-flat-cloudinstances2b" + flavor = "g4.cores4.ram8.disk20" + floating_ip_enabled = "false" + image = "Fedora-CoreOS-38" + master_flavor = "g4.cores2.ram4.disk20" + network_driver = "flannel" + + labels = { + kube_tag = "v1.23.15-rancher1-linux-amd64" + hyperkube_prefix = "docker.io/rancher/" + cloud_provider_enabled = "true" + } +} From 96135d566ee3368545f14b9f660f3ec94a12f8af Mon Sep 17 00:00:00 2001 From: Github Action Date: Tue, 18 Jun 2024 17:16:20 +0000 Subject: [PATCH 3/3] auto update of tag --- helm-quarry/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-quarry/values.yaml b/helm-quarry/values.yaml index dda704f..95ca165 100644 --- a/helm-quarry/values.yaml +++ b/helm-quarry/values.yaml @@ -1,7 +1,7 @@ web: repository: 'quay.io/wikimedia-quarry/quarry' - tag: pr-58 # web tag managed by github actions + tag: pr-60 # web tag managed by github actions worker: repository: 'quay.io/wikimedia-quarry/quarry' - tag: pr-58 # worker tag managed by github actions \ No newline at end of file + tag: pr-60 # worker tag managed by github actions \ No newline at end of file