Bump MKS version to 1.31

Author: sguyennet

use-cases/kubeflow/README.md

@@ -5,8 +5,9 @@ The purpose of this tutorial is to deploy KubeFlow in an OVHcloud Managed Kubern
 This Terraform will create and configure:
 
 * A private network
+* A gateway
 * A managed Kubernetes cluster
-* A load balancer for Kubernetes with a public IP
+* A Public Cloud load balancer with a public IP
 * A MySQL managed database
 * An object storage bucket
 * A Kubeflow deployment

use-cases/kubeflow/modules/kubeflow/ovh_private_network.tf

@@ -12,4 +12,12 @@ resource "ovh_cloud_project_network_private_subnet" "private-subnet" {
   network      = "192.168.168.0/24"
   dhcp         = true
   no_gateway   = false
+}
+
+resource "ovh_cloud_project_gateway" "gateway" {
+  name          = "${var.ovh_kube_cluster_name}-gateway"
+  model         = "${var.ovh_gateway_size}"
+  region        = "${var.ovh_os_region_name}"
+  network_id    = tolist(ovh_cloud_project_network_private.private-net.regions_attributes[*].openstackid)[0]
+  subnet_id     = ovh_cloud_project_network_private_subnet.private-subnet.id
 }

use-cases/kubeflow/modules/kubeflow/variables.tf

@@ -8,14 +8,19 @@ variable ovh_os_private_network_vlan_id {
   default     = "10"
 }
 
+variable ovh_gateway_size {
+  type        = string
+  default     = "s"
+}
+
 variable ovh_kube_cluster_name {
   type        = string
   default     = "mks-kubeflow"
 }
 
 variable ovh_kube_version {
   type        = string
-  default     = "1.29"
+  default     = "1.31"
 }
 
 variable ovh_s3_access_key {

use-cases/kubeflow/root.tf

@@ -4,36 +4,37 @@ module "s3_user" {
 
 module "kubeflow" {
   source = "./modules/kubeflow"
-  ovh_s3_access_key = module.s3_user.access_key_id
-  ovh_s3_secret_key = module.s3_user.secret_access_key
-  ovh_dns_domain = var.ovh_dns_domain
-  ovh_api_dns_application_key = var.ovh_api_dns_application_key
-  ovh_api_dns_consumer_key = var.ovh_api_dns_consumer_key
-  ovh_api_dns_application_secret = var.ovh_api_dns_application_secret
-  ovh_os_region_name = var.ovh_os_region_name
-  ovh_os_private_network_vlan_id = var.ovh_os_private_network_vlan_id
-  ovh_kube_cluster_name = var.ovh_kube_cluster_name
-  ovh_kube_version = var.ovh_kube_version
-  kubeflow_control_plane_flavor = var.kubeflow_control_plane_flavor
-  kubeflow_control_plane_autoscale = var.kubeflow_control_plane_autoscale
+  ovh_s3_access_key                    = module.s3_user.access_key_id
+  ovh_s3_secret_key                    = module.s3_user.secret_access_key
+  ovh_dns_domain                       = var.ovh_dns_domain
+  ovh_api_dns_application_key          = var.ovh_api_dns_application_key
+  ovh_api_dns_consumer_key             = var.ovh_api_dns_consumer_key
+  ovh_api_dns_application_secret       = var.ovh_api_dns_application_secret
+  ovh_os_region_name                   = var.ovh_os_region_name
+  ovh_os_private_network_vlan_id       = var.ovh_os_private_network_vlan_id
+  ovh_gateway_size                     = var.ovh_gateway_size
+  ovh_kube_cluster_name                = var.ovh_kube_cluster_name
+  ovh_kube_version                     = var.ovh_kube_version
+  kubeflow_control_plane_flavor        = var.kubeflow_control_plane_flavor
+  kubeflow_control_plane_autoscale     = var.kubeflow_control_plane_autoscale
   kubeflow_control_plane_desired_nodes = var.kubeflow_control_plane_desired_nodes
-  kubeflow_control_plane_max_nodes = var.kubeflow_control_plane_max_nodes
-  kubeflow_control_plane_min_nodes = var.kubeflow_control_plane_min_nodes
-  kubeflow_cpu_worker_flavor = var.kubeflow_cpu_worker_flavor
-  kubeflow_cpu_worker_autoscale = var.kubeflow_cpu_worker_autoscale
-  kubeflow_cpu_worker_desired_nodes = var.kubeflow_cpu_worker_desired_nodes
-  kubeflow_cpu_worker_max_nodes = var.kubeflow_cpu_worker_max_nodes
-  kubeflow_cpu_worker_min_nodes = var.kubeflow_cpu_worker_min_nodes
-  kubeflow_gpu_worker_flavor = var.kubeflow_gpu_worker_flavor
-  kubeflow_gpu_worker_autoscale = var.kubeflow_gpu_worker_autoscale
-  kubeflow_gpu_worker_max_nodes = var.kubeflow_gpu_worker_max_nodes
-  kubeflow_gpu_worker_min_nodes = var.kubeflow_gpu_worker_min_nodes
-  letsencrypt_issuer = var.letsencrypt_issuer
-  ovh_mysql_name = var.ovh_mysql_name
-  ovh_mysql_version = var.ovh_mysql_version
-  ovh_mysql_region = var.ovh_mysql_region
-  ovh_s3_bucket_name = var.ovh_s3_bucket_name
-  ovh_s3_region_name = var.ovh_s3_region_name
-  kubeflow_default_user_name = var.kubeflow_default_user_name
-  kubeflow_default_user_password_hash = var.kubeflow_default_user_password_hash
+  kubeflow_control_plane_max_nodes     = var.kubeflow_control_plane_max_nodes
+  kubeflow_control_plane_min_nodes     = var.kubeflow_control_plane_min_nodes
+  kubeflow_cpu_worker_flavor           = var.kubeflow_cpu_worker_flavor
+  kubeflow_cpu_worker_autoscale        = var.kubeflow_cpu_worker_autoscale
+  kubeflow_cpu_worker_desired_nodes    = var.kubeflow_cpu_worker_desired_nodes
+  kubeflow_cpu_worker_max_nodes        = var.kubeflow_cpu_worker_max_nodes
+  kubeflow_cpu_worker_min_nodes        = var.kubeflow_cpu_worker_min_nodes
+  kubeflow_gpu_worker_flavor           = var.kubeflow_gpu_worker_flavor
+  kubeflow_gpu_worker_autoscale        = var.kubeflow_gpu_worker_autoscale
+  kubeflow_gpu_worker_max_nodes        = var.kubeflow_gpu_worker_max_nodes
+  kubeflow_gpu_worker_min_nodes        = var.kubeflow_gpu_worker_min_nodes
+  letsencrypt_issuer                   = var.letsencrypt_issuer
+  ovh_mysql_name                       = var.ovh_mysql_name
+  ovh_mysql_version                    = var.ovh_mysql_version
+  ovh_mysql_region                     = var.ovh_mysql_region
+  ovh_s3_bucket_name                   = var.ovh_s3_bucket_name
+  ovh_s3_region_name                   = var.ovh_s3_region_name
+  kubeflow_default_user_name           = var.kubeflow_default_user_name
+  kubeflow_default_user_password_hash  = var.kubeflow_default_user_password_hash
 }

use-cases/kubeflow/variables.tf

@@ -8,14 +8,19 @@ variable ovh_os_private_network_vlan_id {
   default     = "10"
 }
 
+variable ovh_gateway_size {
+  type        = string
+  default     = "s"
+}
+
 variable ovh_kube_cluster_name {
   type        = string
   default     = "mks-kubeflow"
 }
 
 variable ovh_kube_version {
   type        = string
-  default     = "1.29"
+  default     = "1.31"
 }
 
 variable kubeflow_control_plane_flavor {