Update deployments to use values for image/tag and removed limits

angelonibo · Jul 13, 2020 · 629fe6e · 629fe6e
1 parent 3cbf704
commit 629fe6e
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 29 deletions.
diff --git a/kube/ion/templates/config.yaml b/kube/ion/templates/config.yaml
@@ -90,7 +90,7 @@ data:
 
     [webrtc]
     # Range of ports that ion accepts WebRTC traffic on
-    portrange = [5000, 5200]
+    portrange = [5000, 52000]
 
     [webrtc.iceserver]
     urls = ["stun:stun.l.google.com:19302"]

diff --git a/kube/ion/templates/deployment-biz.yaml b/kube/ion/templates/deployment-biz.yaml
@@ -34,16 +34,16 @@ spec:
         - name: {{ .Chart.Name }}-biz
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          image: pionwebrtc/ion-biz:v0.4.6
+          imagePullPolicy: {{ .Values.biz.image.pullPolicy }}
+          image: {{ .Values.biz.image.repository }}:{{ .Values.biz.image.tag}} 
           command: ["/usr/local/bin/biz", "-c", "/configs/biz.toml"]
           resources:
             requests:
-              cpu: 250m
+              cpu: 500m 
               memory: 200Mi
-            limits:
-              cpu: 500m
-              memory: 500Mi
+              #            limits:
+              #              cpu: 500m
+              #              memory: 500Mi
           env:
             - name: SERVICE
               value: biz

diff --git a/kube/ion/templates/deployment-islb.yaml b/kube/ion/templates/deployment-islb.yaml
@@ -34,16 +34,16 @@ spec:
         - name: {{ .Chart.Name }}-islb
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          image: pionwebrtc/ion-islb:v0.4.6
+          imagePullPolicy: {{ .Values.islb.image.pullPolicy }}
+          image: {{ .Values.islb.image.repository }}:{{ .Values.islb.image.tag}} 
           command: ["/usr/local/bin/islb", "-c", "/configs/islb.toml"]
           resources:
             requests:
               cpu: 250m
               memory: 200Mi
-            limits:
-              cpu: 500m
-              memory: 500Mi
+              #            limits:
+              #              cpu: 500m
+              #              memory: 500Mi
           env:
             - name: SERVICE
               value: islb

diff --git a/kube/ion/templates/deployment-sfu.yaml b/kube/ion/templates/deployment-sfu.yaml
@@ -34,16 +34,16 @@ spec:
         - name: {{ .Chart.Name }}-sfu
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          image: pionwebrtc/ion-sfu:v0.4.6
+          imagePullPolicy: {{ .Values.sfu.image.pullPolicy }}
+          image: {{ .Values.sfu.image.repository}}:{{.Values.sfu.image.tag}}
           command: ["/usr/local/bin/sfu", "-c", "/configs/sfu.toml"]
           resources:
             requests:
-              cpu: 250m
-              memory: 200Mi
-            limits:
-              cpu: 500m
-              memory: 500Mi
+              cpu: 2000m
+              memory: 2000Mi
+              #            limits:
+              #              cpu: 500m
+              #              memory: 500Mi
           env:
             - name: SERVICE
               value: sfu

diff --git a/kube/ion/templates/deployment-web.yaml b/kube/ion/templates/deployment-web.yaml
@@ -34,16 +34,16 @@ spec:
         - name: {{ .Chart.Name }}-web
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          image: pionwebrtc/ion-web:latest
+          imagePullPolicy: {{ .Values.web.image.pullPolicy }}
+          image: {{.Values.web.image.repository }}:{{.Values.web.image.tag}}
           command: ["caddy", "file-server", "--listen", ":80", "-root", "/app/dist"]
           resources:
             requests:
               cpu: 250m
               memory: 200Mi
-            limits:
-              cpu: 500m
-              memory: 500Mi
+              #            limits:
+              #              cpu: 500m
+              #              memory: 500Mi
           env:
             - name: SERVICE
               value: web

diff --git a/kube/ion/values.yaml b/kube/ion/values.yaml
@@ -6,11 +6,6 @@
 # TODO: At the moment this value needs to remain 1. Scaling the SFU instance is not configured / supported at the moment!!!
 replicaCount: 1
 
-image:
-  repository: nginx
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
 
 imagePullSecrets: []
 nameOverride: ""
@@ -71,15 +66,43 @@ nodeSelector: {}
 tolerations: []
 affinity: {}
 
+sfu:
+  image:
+    repository: pionwebrtc/ion-sfu 
+    pullPolicy: IfNotPresent
+    # Overrides the image tag whose default is the chart appVersion.
+    tag: "v0.4.6"
+biz:
+  image:
+    repository: pionwebrtc/ion-biz 
+    pullPolicy: IfNotPresent
+    # Overrides the image tag whose default is the chart appVersion.
+    tag: "v0.4.6"
+
+islb:
+  image:
+    repository: pionwebrtc/ion-islb 
+    pullPolicy: IfNotPresent
+    # Overrides the image tag whose default is the chart appVersion.
+    tag: "v0.4.6"
+
+web:
+  image:
+    repository: pionwebrtc/ion-web 
+    pullPolicy: IfNotPresent
+    # Overrides he image tag whose default is the chart appVersion.
+    tag: "latest"
 
 nats:
   auth:
     enabled: false
 
 redis:
   usePassword: false
+
 etcd:
   auth:
     rbac:
       enabled: false
 
+