From 2f8c92cd03c24e5ea30bd2398036d1394b570cb7 Mon Sep 17 00:00:00 2001 From: Vivian Rook Date: Fri, 23 Aug 2024 07:18:08 -0400 Subject: [PATCH 1/3] Update k8s cluster Bug: T373093 --- tofu/124.tf | 5 ----- tofu/126a.tf | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 tofu/126a.tf 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/126a.tf b/tofu/126a.tf new file mode 100644 index 0000000..d55584d --- /dev/null +++ b/tofu/126a.tf @@ -0,0 +1,36 @@ +resource "openstack_containerinfra_cluster_v1" "k8s_126a" { + name = "quarry-126a" + cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_126a.id + master_count = 1 + node_count = 2 +} + +resource "local_file" "kube_config" { + content = resource.openstack_containerinfra_cluster_v1.k8s_126a.kubeconfig.raw_config + filename = "kube.config" +} + +resource "openstack_containerinfra_clustertemplate_v1" "template_126a" { + name = "quarry-126a" + 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.26.8-rancher1" + container_runtime = "containerd" + containerd_version = "1.6.20" + containerd_tarball_sha256 = "1d86b534c7bba51b78a7eeb1b67dd2ac6c0edeb01c034cc5f590d5ccd824b416" + hyperkube_prefix = "docker.io/rancher/" + cloud_provider_enabled = "true" + } +} From aba9cbcecb1189f7ec780dc7d148c84348744c20 Mon Sep 17 00:00:00 2001 From: Vivian Rook Date: Mon, 26 Aug 2024 12:56:00 -0400 Subject: [PATCH 2/3] k8s 1.27 --- tofu/{126a.tf => 127a.tf} | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) rename tofu/{126a.tf => 127a.tf} (51%) diff --git a/tofu/126a.tf b/tofu/127a.tf similarity index 51% rename from tofu/126a.tf rename to tofu/127a.tf index d55584d..6dd4819 100644 --- a/tofu/126a.tf +++ b/tofu/127a.tf @@ -1,17 +1,17 @@ -resource "openstack_containerinfra_cluster_v1" "k8s_126a" { - name = "quarry-126a" - cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_126a.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_126a.kubeconfig.raw_config + content = resource.openstack_containerinfra_cluster_v1.k8s_127a.kubeconfig.raw_config filename = "kube.config" } -resource "openstack_containerinfra_clustertemplate_v1" "template_126a" { - name = "quarry-126a" +resource "openstack_containerinfra_clustertemplate_v1" "template_127a" { + name = "quarry-127a" coe = "kubernetes" dns_nameserver = "8.8.8.8" docker_storage_driver = "overlay2" @@ -23,14 +23,18 @@ resource "openstack_containerinfra_clustertemplate_v1" "template_126a" { floating_ip_enabled = "false" image = "Fedora-CoreOS-38" master_flavor = "g4.cores2.ram4.disk20" - network_driver = "flannel" + network_driver = "calico" labels = { - kube_tag = "v1.26.8-rancher1" - container_runtime = "containerd" - containerd_version = "1.6.20" - containerd_tarball_sha256 = "1d86b534c7bba51b78a7eeb1b67dd2ac6c0edeb01c034cc5f590d5ccd824b416" - 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" } } From 0cd0067038b1881c0612fd8f9fad0ec83fc63223 Mon Sep 17 00:00:00 2001 From: Github Action Date: Mon, 26 Aug 2024 16:56:31 +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 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