diff --git a/helm-quarry/values.yaml b/helm-quarry/values.yaml index f164041..2044ced 100644 --- a/helm-quarry/values.yaml +++ b/helm-quarry/values.yaml @@ -1,7 +1,7 @@ web: repository: 'quay.io/wikimedia-quarry/quarry' - tag: pr-61 # web tag managed by github actions + tag: pr-67 # web tag managed by github actions worker: repository: 'quay.io/wikimedia-quarry/quarry' - tag: pr-61 # worker tag managed by github actions + tag: pr-67 # worker tag managed by github actions diff --git a/tofu/124.tf b/tofu/124.tf index d4ce436..83d8f5f 100644 --- a/tofu/124.tf +++ b/tofu/124.tf @@ -5,11 +5,6 @@ resource "openstack_containerinfra_cluster_v1" "k8s_124" { 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" diff --git a/tofu/127a.tf b/tofu/127a.tf new file mode 100644 index 0000000..6dd4819 --- /dev/null +++ b/tofu/127a.tf @@ -0,0 +1,40 @@ +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_127a.kubeconfig.raw_config + filename = "kube.config" +} + +resource "openstack_containerinfra_clustertemplate_v1" "template_127a" { + name = "quarry-127a" + 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 = "calico" + + labels = { + 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" + } +}