Move quarry deployment to ovs (via g4 flavors) (#60)

* Update openstack app cred ID

In theory this uses the same secret as before.

* Update instance flavors from g3 to g4

This will cause the next deployment to land on OVS.

* auto update of  tag

---------

Co-authored-by: Andrew Bogott <[email protected]>
Co-authored-by: Github Action <[email protected]>

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
+  tag: pr-60 # worker tag managed by github actions

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"

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"
+  }
+}

tofu/vars.tf

@@ -9,5 +9,5 @@ variable "tenant_id" {
 }
 variable "application_credential_id" {
   type = string
-  default = "4917ce71b98e498e8a6c5814b095b28e"
+  default = "446ab9c3713b4a0b8c2da540021dd314"
 }