Skip to content

Commit ccecd16

Browse files
committed
🔧(core) configure kube too work with recent version
prepare terraform for newer version of k8s
1 parent b25f5c5 commit ccecd16

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

k8s/base/env/jvb.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ SHUTDOWN_REST_ENABLED=true
2727
# Bind address and port for the OCTO protocol
2828
JVB_OCTO_BIND_ADDRESS=0.0.0.0
2929
JVB_OCTO_BIND_PORT=4096
30-

k8s/base/jitsi-meet-front-ingress.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
annotations:
1111
cert-manager.io/issuer: "letsencrypt-jitsi-issuer"
1212
spec:
13+
ingressClassName: "nginx"
1314
rules:
1415
- host: "placeholder.domain.example"
1516
http:

terraform/kubernetes.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ resource "helm_release" "ingress-nginx" {
102102

103103
repository = "https://kubernetes.github.io/ingress-nginx"
104104
chart = "ingress-nginx"
105-
version = "3.39.0"
105+
version = lookup(var.k8s_ingress_nginx_version, terraform.workspace, "3.39.0")
106106

107107
set {
108108
name = "controller.service.type"

terraform/variables.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,3 +271,13 @@ variable "k8s_jvb_nodepool_size" {
271271
default = {
272272
}
273273
}
274+
275+
276+
variable "k8s_ingress_nginx_version" {
277+
type = map(string)
278+
description = "ingress-nginx version to install"
279+
280+
default = {
281+
preprod = "3.39.0"
282+
}
283+
}

0 commit comments

Comments
 (0)