🔧(core) configure kube too work with recent version

prepare terraform for newer version of k8s
openfun · Nov 29, 2022 · ccecd16 · ccecd16
1 parent b25f5c5
commit ccecd16
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/k8s/base/env/jvb.env b/k8s/base/env/jvb.env
@@ -27,4 +27,3 @@ SHUTDOWN_REST_ENABLED=true
 # Bind address and port for the OCTO protocol
 JVB_OCTO_BIND_ADDRESS=0.0.0.0
 JVB_OCTO_BIND_PORT=4096
-
diff --git a/k8s/base/jitsi-meet-front-ingress.yml b/k8s/base/jitsi-meet-front-ingress.yml
@@ -10,6 +10,7 @@ metadata:
   annotations:
     cert-manager.io/issuer: "letsencrypt-jitsi-issuer"
 spec:
+  ingressClassName: "nginx"
   rules:
   - host: "placeholder.domain.example"
     http:

diff --git a/terraform/kubernetes.tf b/terraform/kubernetes.tf
@@ -102,7 +102,7 @@ resource "helm_release" "ingress-nginx" {
 
  repository = "https://kubernetes.github.io/ingress-nginx"
  chart = "ingress-nginx"
- version = "3.39.0"
+ version = lookup(var.k8s_ingress_nginx_version, terraform.workspace, "3.39.0")
 
  set {
    name = "controller.service.type"

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -271,3 +271,13 @@ variable "k8s_jvb_nodepool_size" {
   default = {
   }
 }
+
+
+variable "k8s_ingress_nginx_version" {
+  type = map(string)
+  description = "ingress-nginx version to install"
+
+  default = {
+    preprod = "3.39.0"
+  }
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,3 @@ SHUTDOWN_REST_ENABLED=true
		# Bind address and port for the OCTO protocol
		JVB_OCTO_BIND_ADDRESS=0.0.0.0
		JVB_OCTO_BIND_PORT=4096