Merge branch 'main' into deploy-procedure

toolforge · Sep 2, 2024 · 33dc500 · 33dc500
2 parents c5a2d6a + ca4956c
commit 33dc500
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/helm-quarry/values.yaml b/helm-quarry/values.yaml
@@ -1,7 +1,8 @@
 web:
   repository: 'quay.io/wikimedia-quarry/quarry'
-  tag: pr-66 # web tag managed by github actions
+
+  tag: pr-68 # web tag managed by github actions
 
 worker:
   repository: 'quay.io/wikimedia-quarry/quarry'
-  tag: pr-66 # worker tag managed by github actions
+  tag: pr-68 # worker tag managed by github actions
diff --git a/tofu/124.tf → tofu/127a.tf b/tofu/124.tf → tofu/127a.tf
@@ -1,17 +1,17 @@
-resource "openstack_containerinfra_cluster_v1" "k8s_124" {
-  name                = "quarry-124"
-  cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_124.id
+resource "openstack_containerinfra_cluster_v1" "k8s_127a" {
+  name                = "quarry-127a"
+  cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_127a.id
   master_count        = 1
   node_count          = 2
 }
 
 resource "local_file" "kube_config" {
-  content  = resource.openstack_containerinfra_cluster_v1.k8s_124.kubeconfig.raw_config
+  content  = resource.openstack_containerinfra_cluster_v1.k8s_127a.kubeconfig.raw_config
   filename = "kube.config"
 }
 
-resource "openstack_containerinfra_clustertemplate_v1" "template_124" {
-  name                  = "quarry-124"
+resource "openstack_containerinfra_clustertemplate_v1" "template_127a" {
+  name                  = "quarry-127a"
   coe                   = "kubernetes"
   dns_nameserver        = "8.8.8.8"
   docker_storage_driver = "overlay2"
@@ -23,11 +23,18 @@ resource "openstack_containerinfra_clustertemplate_v1" "template_124" {
   floating_ip_enabled   = "false"
   image                 = "Fedora-CoreOS-38"
   master_flavor         = "g4.cores2.ram4.disk20"
-  network_driver        = "flannel"
+  network_driver        = "calico"
 
   labels = {
-    kube_tag               = "v1.23.15-rancher1-linux-amd64"
-    hyperkube_prefix       = "docker.io/rancher/"
-    cloud_provider_enabled = "true"
+    kube_tag                       = "v1.27.8-rancher2"
+    container_runtime              = "containerd"
+    containerd_version             = "1.6.28"
+    containerd_tarball_sha256      = "f70736e52d61e5ad225f4fd21643b5ca1220013ab8b6c380434caeefb572da9b"
+    cloud_provider_tag             = "v1.27.3"
+    cinder_csi_plugin_tag          = "v1.27.3"
+    k8s_keystone_auth_tag          = "v1.27.3"
+    magnum_auto_healer_tag         = "v1.27.3"
+    octavia_ingress_controller_tag = "v1.27.3"
+    calico_tag                     = "v3.26.4"
   }
 }