🔧(project) replace webrtc by yProvider
Replace webrtc by yProvider the project (docker, helm chart, etc).
This commit is contained in:
6
.github/workflows/docker-hub.yml
vendored
6
.github/workflows/docker-hub.yml
vendored
@@ -104,7 +104,7 @@ jobs:
|
|||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
||||||
build-and-push-y-webrtc-signaling:
|
build-and-push-y-provider:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
@@ -132,7 +132,7 @@ jobs:
|
|||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
images: lasuite/impress-y-webrtc-signaling
|
images: lasuite/impress-y-provider
|
||||||
-
|
-
|
||||||
name: Login to DockerHub
|
name: Login to DockerHub
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
@@ -143,7 +143,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./src/frontend/Dockerfile
|
file: ./src/frontend/Dockerfile
|
||||||
target: y-webrtc-signaling
|
target: y-provider
|
||||||
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
|||||||
4
.github/workflows/impress-frontend.yml
vendored
4
.github/workflows/impress-frontend.yml
vendored
@@ -139,7 +139,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
targets: |
|
targets: |
|
||||||
app-dev
|
app-dev
|
||||||
y-webrtc-signaling
|
y-provider
|
||||||
load: true
|
load: true
|
||||||
set: |
|
set: |
|
||||||
*.cache-from=type=gha,scope=cached-stage
|
*.cache-from=type=gha,scope=cached-stage
|
||||||
@@ -213,7 +213,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
targets: |
|
targets: |
|
||||||
app-dev
|
app-dev
|
||||||
y-webrtc-signaling
|
y-provider
|
||||||
load: true
|
load: true
|
||||||
set: |
|
set: |
|
||||||
*.cache-from=type=gha,scope=cached-stage
|
*.cache-from=type=gha,scope=cached-stage
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ and this project adheres to
|
|||||||
## Fixed
|
## Fixed
|
||||||
|
|
||||||
- 🐛 Fix emoticon in pdf export #225
|
- 🐛 Fix emoticon in pdf export #225
|
||||||
|
- 🐛 Fix collaboration on document #226
|
||||||
|
|
||||||
## Removed
|
## Removed
|
||||||
|
|
||||||
|
|||||||
4
Makefile
4
Makefile
@@ -104,7 +104,7 @@ logs: ## display app-dev logs (follow mode)
|
|||||||
|
|
||||||
run: ## start the wsgi (production) and development server
|
run: ## start the wsgi (production) and development server
|
||||||
@$(COMPOSE) up --force-recreate -d celery-dev
|
@$(COMPOSE) up --force-recreate -d celery-dev
|
||||||
@$(COMPOSE) up --force-recreate -d y-webrtc-signaling
|
@$(COMPOSE) up --force-recreate -d y-provider
|
||||||
@echo "Wait for postgresql to be up..."
|
@echo "Wait for postgresql to be up..."
|
||||||
@$(WAIT_DB)
|
@$(WAIT_DB)
|
||||||
.PHONY: run
|
.PHONY: run
|
||||||
@@ -319,7 +319,7 @@ bump-packages-version: ## bump the version of the project - VERSION_TYPE can be
|
|||||||
cd ./src/frontend/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
cd ./src/frontend/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
||||||
cd ./src/frontend/apps/e2e/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
cd ./src/frontend/apps/e2e/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
||||||
cd ./src/frontend/apps/impress/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
cd ./src/frontend/apps/impress/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
||||||
cd ./src/frontend/apps/y-webrtc-signaling/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
cd ./src/frontend/servers/y-provider/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
||||||
cd ./src/frontend/packages/eslint-config-impress/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
cd ./src/frontend/packages/eslint-config-impress/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
||||||
cd ./src/frontend/packages/i18n/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
cd ./src/frontend/packages/i18n/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
|
||||||
.PHONY: bump-packages-version
|
.PHONY: bump-packages-version
|
||||||
|
|||||||
@@ -18,13 +18,13 @@ docker_build(
|
|||||||
)
|
)
|
||||||
|
|
||||||
docker_build(
|
docker_build(
|
||||||
'localhost:5001/impress-y-webrtc-signaling:latest',
|
'localhost:5001/impress-y-provider:latest',
|
||||||
context='..',
|
context='..',
|
||||||
dockerfile='../src/frontend/Dockerfile',
|
dockerfile='../src/frontend/Dockerfile',
|
||||||
only=['./src/frontend/', './docker/', './.dockerignore'],
|
only=['./src/frontend/', './docker/', './.dockerignore'],
|
||||||
target = 'y-webrtc-signaling',
|
target = 'y-provider',
|
||||||
live_update=[
|
live_update=[
|
||||||
sync('../src/frontend/apps/y-webrtc-signaling/src', '/home/frontend/apps/y-webrtc-signaling/src'),
|
sync('../src/frontend/servers/y-provider/src', '/home/frontend/servers/y-provider/src'),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -141,19 +141,19 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ".:/app"
|
- ".:/app"
|
||||||
|
|
||||||
y-webrtc-signaling:
|
y-provider:
|
||||||
user: ${DOCKER_USER:-1000}
|
user: ${DOCKER_USER:-1000}
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./src/frontend/Dockerfile
|
dockerfile: ./src/frontend/Dockerfile
|
||||||
target: y-webrtc-signaling
|
target: y-provider
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "4444:4444"
|
- "4444:4444"
|
||||||
volumes:
|
volumes:
|
||||||
- ./src/frontend/apps/y-webrtc-signaling:/home/frontend/apps/y-webrtc-signaling
|
- ./src/frontend/servers/y-provider:/home/frontend/servers/y-provider
|
||||||
- /home/frontend/apps/y-webrtc-signaling/node_modules/
|
- /home/frontend/servers/y-provider/node_modules/
|
||||||
- /home/frontend/apps/y-webrtc-signaling/dist/
|
- /home/frontend/servers/y-provider/dist/
|
||||||
|
|
||||||
frontend-dev:
|
frontend-dev:
|
||||||
user: "${DOCKER_USER:-1000}"
|
user: "${DOCKER_USER:-1000}"
|
||||||
@@ -167,7 +167,7 @@ services:
|
|||||||
- ./src/frontend/apps/impress:/home/frontend/apps/impress
|
- ./src/frontend/apps/impress:/home/frontend/apps/impress
|
||||||
- /home/frontend/node_modules/
|
- /home/frontend/node_modules/
|
||||||
depends_on:
|
depends_on:
|
||||||
- y-webrtc-signaling
|
- y-provider
|
||||||
- celery-dev
|
- celery-dev
|
||||||
|
|
||||||
kc_postgresql:
|
kc_postgresql:
|
||||||
|
|||||||
@@ -23,9 +23,9 @@ Whenever we are cooking a new release (e.g. `4.18.1`) we should follow a standar
|
|||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "v4.18.1"
|
tag: "v4.18.1"
|
||||||
|
|
||||||
webrtc:
|
y-provider:
|
||||||
image:
|
image:
|
||||||
repository: lasuite/impress-y-webrtc-signaling
|
repository: lasuite/impress-y-provider
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "v4.18.1"
|
tag: "v4.18.1"
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
FROM node:20-alpine as frontend-deps-y-webrtc-signaling
|
FROM node:20-alpine as frontend-deps-y-provider
|
||||||
|
|
||||||
WORKDIR /home/frontend/
|
WORKDIR /home/frontend/
|
||||||
|
|
||||||
COPY ./src/frontend/package.json ./package.json
|
COPY ./src/frontend/package.json ./package.json
|
||||||
COPY ./src/frontend/yarn.lock ./yarn.lock
|
COPY ./src/frontend/yarn.lock ./yarn.lock
|
||||||
COPY ./src/frontend/apps/y-webrtc-signaling/package.json ./apps/y-webrtc-signaling/package.json
|
COPY ./src/frontend/servers/y-provider/package.json ./servers/y-provider/package.json
|
||||||
COPY ./src/frontend/packages/eslint-config-impress/package.json ./packages/eslint-config-impress/package.json
|
COPY ./src/frontend/packages/eslint-config-impress/package.json ./packages/eslint-config-impress/package.json
|
||||||
|
|
||||||
RUN yarn install
|
RUN yarn install
|
||||||
@@ -14,10 +14,10 @@ COPY ./src/frontend/ .
|
|||||||
# Copy entrypoint
|
# Copy entrypoint
|
||||||
COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
|
COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
|
||||||
|
|
||||||
# ---- y-webrtc-signaling ----
|
# ---- y-provider ----
|
||||||
FROM frontend-deps-y-webrtc-signaling as y-webrtc-signaling
|
FROM frontend-deps-y-provider as y-provider
|
||||||
|
|
||||||
WORKDIR /home/frontend/apps/y-webrtc-signaling
|
WORKDIR /home/frontend/servers/y-provider
|
||||||
RUN yarn build
|
RUN yarn build
|
||||||
|
|
||||||
# Un-privileged user running the application
|
# Un-privileged user running the application
|
||||||
@@ -64,8 +64,8 @@ WORKDIR /home/frontend/apps/impress
|
|||||||
ARG FRONTEND_THEME
|
ARG FRONTEND_THEME
|
||||||
ENV NEXT_PUBLIC_THEME=${FRONTEND_THEME}
|
ENV NEXT_PUBLIC_THEME=${FRONTEND_THEME}
|
||||||
|
|
||||||
ARG SIGNALING_URL
|
ARG Y_PROVIDER_URL
|
||||||
ENV NEXT_PUBLIC_SIGNALING_URL=${SIGNALING_URL}
|
ENV NEXT_PUBLIC_Y_PROVIDER_URL=${Y_PROVIDER_URL}
|
||||||
|
|
||||||
ARG API_ORIGIN
|
ARG API_ORIGIN
|
||||||
ENV NEXT_PUBLIC_API_ORIGIN=${API_ORIGIN}
|
ENV NEXT_PUBLIC_API_ORIGIN=${API_ORIGIN}
|
||||||
|
|||||||
@@ -84,11 +84,11 @@ frontend:
|
|||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "latest"
|
tag: "latest"
|
||||||
|
|
||||||
webrtc:
|
yProvider:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
|
||||||
image:
|
image:
|
||||||
repository: localhost:5001/impress-y-webrtc-signaling
|
repository: localhost:5001/impress-y-provider
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "latest"
|
tag: "latest"
|
||||||
|
|
||||||
|
|||||||
@@ -126,9 +126,9 @@ frontend:
|
|||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "v1.2.1"
|
tag: "v1.2.1"
|
||||||
|
|
||||||
webrtc:
|
yProvider:
|
||||||
image:
|
image:
|
||||||
repository: lasuite/impress-y-webrtc-signaling
|
repository: lasuite/impress-y-provider
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "v1.2.1"
|
tag: "v1.2.1"
|
||||||
|
|
||||||
|
|||||||
@@ -126,9 +126,9 @@ frontend:
|
|||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "v1.2.1"
|
tag: "v1.2.1"
|
||||||
|
|
||||||
webrtc:
|
yProvider:
|
||||||
image:
|
image:
|
||||||
repository: lasuite/impress-y-webrtc-signaling
|
repository: lasuite/impress-y-provider
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "v1.2.1"
|
tag: "v1.2.1"
|
||||||
|
|
||||||
|
|||||||
@@ -126,9 +126,9 @@ frontend:
|
|||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "main"
|
tag: "main"
|
||||||
|
|
||||||
webrtc:
|
yProvider:
|
||||||
image:
|
image:
|
||||||
repository: lasuite/impress-y-webrtc-signaling
|
repository: lasuite/impress-y-provider
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: "main"
|
tag: "main"
|
||||||
|
|
||||||
|
|||||||
@@ -149,12 +149,12 @@ Requires top level scope
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Full name for the webrtc
|
Full name for the yProvider
|
||||||
|
|
||||||
Requires top level scope
|
Requires top level scope
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "impress.webrtc.fullname" -}}
|
{{- define "impress.yProvider.fullname" -}}
|
||||||
{{ include "impress.fullname" . }}-webrtc
|
{{ include "impress.fullname" . }}-y-provider
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
|
|||||||
@@ -52,17 +52,17 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: {{ include "impress.webrtc.fullname" . }}
|
name: {{ include "impress.yProvider.fullname" . }}
|
||||||
port:
|
port:
|
||||||
number: {{ .Values.webrtc.service.port }}
|
number: {{ .Values.yProvider.service.port }}
|
||||||
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
|
||||||
service:
|
service:
|
||||||
name: {{ include "impress.webrtc.fullname" . }}
|
name: {{ include "impress.yProvider.fullname" . }}
|
||||||
port:
|
port:
|
||||||
number: {{ .Values.webrtc.service.port }}
|
number: {{ .Values.yProvider.service.port }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
serviceName: {{ include "impress.webrtc.fullname" . }}
|
serviceName: {{ include "impress.yProvider.fullname" . }}
|
||||||
servicePort: {{ .Values.webrtc.service.port }}
|
servicePort: {{ .Values.yProvider.service.port }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.ingressWS.customBackends }}
|
{{- with .Values.ingressWS.customBackends }}
|
||||||
{{- toYaml . | nindent 10 }}
|
{{- toYaml . | nindent 10 }}
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
{{- $envVars := include "impress.common.env" (list . .Values.webrtc) -}}
|
|
||||||
{{- $fullName := include "impress.webrtc.fullname" . -}}
|
|
||||||
{{- $component := "webrtc" -}}
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: {{ $fullName }}
|
|
||||||
namespace: {{ .Release.Namespace | quote }}
|
|
||||||
labels:
|
|
||||||
{{- include "impress.common.labels" (list . $component) | nindent 4 }}
|
|
||||||
annotations:
|
|
||||||
{{- toYaml $.Values.webrtc.service.annotations | nindent 4 }}
|
|
||||||
spec:
|
|
||||||
type: {{ .Values.webrtc.service.type }}
|
|
||||||
ports:
|
|
||||||
- port: {{ .Values.webrtc.service.port }}
|
|
||||||
targetPort: {{ .Values.webrtc.service.targetPort }}
|
|
||||||
protocol: TCP
|
|
||||||
name: http
|
|
||||||
selector:
|
|
||||||
{{- include "impress.common.selectorLabels" (list . $component) | nindent 4 }}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{{- $envVars := include "impress.common.env" (list . .Values.webrtc) -}}
|
{{- $envVars := include "impress.common.env" (list . .Values.yProvider) -}}
|
||||||
{{- $fullName := include "impress.webrtc.fullname" . -}}
|
{{- $fullName := include "impress.yProvider.fullname" . -}}
|
||||||
{{- $component := "webrtc" -}}
|
{{- $component := "yProvider" -}}
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
@@ -9,14 +9,14 @@ metadata:
|
|||||||
labels:
|
labels:
|
||||||
{{- include "impress.common.labels" (list . $component) | nindent 4 }}
|
{{- include "impress.common.labels" (list . $component) | nindent 4 }}
|
||||||
spec:
|
spec:
|
||||||
replicas: {{ .Values.webrtc.replicas }}
|
replicas: {{ .Values.yProvider.replicas }}
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
{{- include "impress.common.selectorLabels" (list . $component) | nindent 6 }}
|
{{- include "impress.common.selectorLabels" (list . $component) | nindent 6 }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
{{- with .Values.webrtc.podAnnotations }}
|
{{- with .Values.yProvider.podAnnotations }}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
@@ -26,19 +26,19 @@ spec:
|
|||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
- name: {{ include "impress.secret.dockerconfigjson.name" (dict "fullname" (include "impress.fullname" .) "imageCredentials" $.Values.image.credentials) }}
|
- name: {{ include "impress.secret.dockerconfigjson.name" (dict "fullname" (include "impress.fullname" .) "imageCredentials" $.Values.image.credentials) }}
|
||||||
{{- end}}
|
{{- end}}
|
||||||
shareProcessNamespace: {{ .Values.webrtc.shareProcessNamespace }}
|
shareProcessNamespace: {{ .Values.yProvider.shareProcessNamespace }}
|
||||||
containers:
|
containers:
|
||||||
{{- with .Values.webrtc.sidecars }}
|
{{- with .Values.yProvider.sidecars }}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: {{ .Chart.Name }}
|
- name: {{ .Chart.Name }}
|
||||||
image: "{{ (.Values.webrtc.image | default dict).repository | default .Values.image.repository }}:{{ (.Values.webrtc.image | default dict).tag | default .Values.image.tag }}"
|
image: "{{ (.Values.yProvider.image | default dict).repository | default .Values.image.repository }}:{{ (.Values.yProvider.image | default dict).tag | default .Values.image.tag }}"
|
||||||
imagePullPolicy: {{ (.Values.webrtc.image | default dict).pullPolicy | default .Values.image.pullPolicy }}
|
imagePullPolicy: {{ (.Values.yProvider.image | default dict).pullPolicy | default .Values.image.pullPolicy }}
|
||||||
{{- with .Values.webrtc.command }}
|
{{- with .Values.yProvider.command }}
|
||||||
command:
|
command:
|
||||||
{{- toYaml . | nindent 12 }}
|
{{- toYaml . | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.webrtc.args }}
|
{{- with .Values.yProvider.args }}
|
||||||
args:
|
args:
|
||||||
{{- toYaml . | nindent 12 }}
|
{{- toYaml . | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
@@ -46,27 +46,27 @@ spec:
|
|||||||
{{- if $envVars}}
|
{{- if $envVars}}
|
||||||
{{- $envVars | indent 12 }}
|
{{- $envVars | indent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.webrtc.securityContext }}
|
{{- with .Values.yProvider.securityContext }}
|
||||||
securityContext:
|
securityContext:
|
||||||
{{- toYaml . | nindent 12 }}
|
{{- toYaml . | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: {{ .Values.webrtc.service.targetPort }}
|
containerPort: {{ .Values.yProvider.service.targetPort }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
{{- if .Values.webrtc.probes.liveness }}
|
{{- if .Values.yProvider.probes.liveness }}
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
{{- include "impress.probes.abstract" (merge .Values.webrtc.probes.liveness (dict "targetPort" .Values.webrtc.service.targetPort )) | nindent 12 }}
|
{{- include "impress.probes.abstract" (merge .Values.yProvider.probes.liveness (dict "targetPort" .Values.yProvider.service.targetPort )) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.webrtc.probes.readiness }}
|
{{- if .Values.yProvider.probes.readiness }}
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
{{- include "impress.probes.abstract" (merge .Values.webrtc.probes.readiness (dict "targetPort" .Values.webrtc.service.targetPort )) | nindent 12 }}
|
{{- include "impress.probes.abstract" (merge .Values.yProvider.probes.readiness (dict "targetPort" .Values.yProvider.service.targetPort )) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.webrtc.probes.startup }}
|
{{- if .Values.yProvider.probes.startup }}
|
||||||
startupProbe:
|
startupProbe:
|
||||||
{{- include "impress.probes.abstract" (merge .Values.webrtc.probes.startup (dict "targetPort" .Values.webrtc.service.targetPort )) | nindent 12 }}
|
{{- include "impress.probes.abstract" (merge .Values.yProvider.probes.startup (dict "targetPort" .Values.yProvider.service.targetPort )) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.webrtc.resources }}
|
{{- with .Values.yProvider.resources }}
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml . | nindent 12 }}
|
{{- toYaml . | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
@@ -76,25 +76,25 @@ spec:
|
|||||||
mountPath: {{ $value.path }}
|
mountPath: {{ $value.path }}
|
||||||
subPath: content
|
subPath: content
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- range $name, $volume := .Values.webrtc.persistence }}
|
{{- range $name, $volume := .Values.yProvider.persistence }}
|
||||||
- name: "{{ $name }}"
|
- name: "{{ $name }}"
|
||||||
mountPath: "{{ $volume.mountPath }}"
|
mountPath: "{{ $volume.mountPath }}"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- range .Values.webrtc.extraVolumeMounts }}
|
{{- range .Values.yProvider.extraVolumeMounts }}
|
||||||
- name: {{ .name }}
|
- name: {{ .name }}
|
||||||
mountPath: {{ .mountPath }}
|
mountPath: {{ .mountPath }}
|
||||||
subPath: {{ .subPath | default "" }}
|
subPath: {{ .subPath | default "" }}
|
||||||
readOnly: {{ .readOnly }}
|
readOnly: {{ .readOnly }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.webrtc.nodeSelector }}
|
{{- with .Values.yProvider.nodeSelector }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.webrtc.affinity }}
|
{{- with .Values.yProvider.affinity }}
|
||||||
affinity:
|
affinity:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.webrtc.tolerations }}
|
{{- with .Values.yProvider.tolerations }}
|
||||||
tolerations:
|
tolerations:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
@@ -104,7 +104,7 @@ spec:
|
|||||||
configMap:
|
configMap:
|
||||||
name: "{{ include "impress.fullname" $ }}-files-{{ $index }}"
|
name: "{{ include "impress.fullname" $ }}-files-{{ $index }}"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- range $name, $volume := .Values.webrtc.persistence }}
|
{{- range $name, $volume := .Values.yProvider.persistence }}
|
||||||
- name: "{{ $name }}"
|
- name: "{{ $name }}"
|
||||||
{{- if eq $volume.type "emptyDir" }}
|
{{- if eq $volume.type "emptyDir" }}
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
@@ -113,7 +113,7 @@ spec:
|
|||||||
claimName: "{{ $fullName }}-{{ $name }}"
|
claimName: "{{ $fullName }}-{{ $name }}"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- range .Values.webrtc.extraVolumes }}
|
{{- range .Values.yProvider.extraVolumes }}
|
||||||
- name: {{ .name }}
|
- name: {{ .name }}
|
||||||
{{- if .existingClaim }}
|
{{- if .existingClaim }}
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
21
src/helm/impress/templates/yprovider_svc.yaml
Normal file
21
src/helm/impress/templates/yprovider_svc.yaml
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
{{- $envVars := include "impress.common.env" (list . .Values.yProvider) -}}
|
||||||
|
{{- $fullName := include "impress.yProvider.fullname" . -}}
|
||||||
|
{{- $component := "yProvider" -}}
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: {{ $fullName }}
|
||||||
|
namespace: {{ .Release.Namespace | quote }}
|
||||||
|
labels:
|
||||||
|
{{- include "impress.common.labels" (list . $component) | nindent 4 }}
|
||||||
|
annotations:
|
||||||
|
{{- toYaml $.Values.yProvider.service.annotations | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
type: {{ .Values.yProvider.service.type }}
|
||||||
|
ports:
|
||||||
|
- port: {{ .Values.yProvider.service.port }}
|
||||||
|
targetPort: {{ .Values.yProvider.service.targetPort }}
|
||||||
|
protocol: TCP
|
||||||
|
name: http
|
||||||
|
selector:
|
||||||
|
{{- include "impress.common.selectorLabels" (list . $component) | nindent 4 }}
|
||||||
@@ -320,96 +320,96 @@ frontend:
|
|||||||
## @param frontend.extraVolumes Additional volumes to mount on the frontend.
|
## @param frontend.extraVolumes Additional volumes to mount on the frontend.
|
||||||
extraVolumes: []
|
extraVolumes: []
|
||||||
|
|
||||||
## @section webrtc
|
## @section yProvider
|
||||||
|
|
||||||
webrtc:
|
yProvider:
|
||||||
## @param webrtc.image.repository Repository to use to pull impress's webrtc container image
|
## @param yProvider.image.repository Repository to use to pull impress's yProvider container image
|
||||||
## @param webrtc.image.tag impress's webrtc container tag
|
## @param yProvider.image.tag impress's yProvider container tag
|
||||||
## @param webrtc.image.pullPolicy webrtc container image pull policy
|
## @param yProvider.image.pullPolicy yProvider container image pull policy
|
||||||
image:
|
image:
|
||||||
repository: lasuite/impress-y-webrtc-signaling
|
repository: lasuite/impress-y-provider
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
tag: "latest"
|
tag: "latest"
|
||||||
|
|
||||||
## @param webrtc.command Override the webrtc container command
|
## @param yProvider.command Override the yProvider container command
|
||||||
command: []
|
command: []
|
||||||
|
|
||||||
## @param webrtc.args Override the webrtc container args
|
## @param yProvider.args Override the yProvider container args
|
||||||
args: []
|
args: []
|
||||||
|
|
||||||
## @param webrtc.replicas Amount of webrtc replicas
|
## @param yProvider.replicas Amount of yProvider replicas
|
||||||
replicas: 3
|
replicas: 3
|
||||||
|
|
||||||
## @param webrtc.shareProcessNamespace Enable share process namewebrtc between containers
|
## @param yProvider.shareProcessNamespace Enable share process nameyProvider between containers
|
||||||
shareProcessNamespace: false
|
shareProcessNamespace: false
|
||||||
|
|
||||||
## @param webrtc.sidecars Add sidecars containers to webrtc deployment
|
## @param yProvider.sidecars Add sidecars containers to yProvider deployment
|
||||||
sidecars: []
|
sidecars: []
|
||||||
|
|
||||||
## @param webrtc.securityContext Configure webrtc Pod security context
|
## @param yProvider.securityContext Configure yProvider Pod security context
|
||||||
securityContext: null
|
securityContext: null
|
||||||
|
|
||||||
## @param webrtc.envVars Configure webrtc container environment variables
|
## @param yProvider.envVars Configure yProvider container environment variables
|
||||||
## @extra webrtc.envVars.BY_VALUE Example environment variable by setting value directly
|
## @extra yProvider.envVars.BY_VALUE Example environment variable by setting value directly
|
||||||
## @extra webrtc.envVars.FROM_CONFIGMAP.configMapKeyRef.name Name of a ConfigMap when configuring env vars from a ConfigMap
|
## @extra yProvider.envVars.FROM_CONFIGMAP.configMapKeyRef.name Name of a ConfigMap when configuring env vars from a ConfigMap
|
||||||
## @extra webrtc.envVars.FROM_CONFIGMAP.configMapKeyRef.key Key within a ConfigMap when configuring env vars from a ConfigMap
|
## @extra yProvider.envVars.FROM_CONFIGMAP.configMapKeyRef.key Key within a ConfigMap when configuring env vars from a ConfigMap
|
||||||
## @extra webrtc.envVars.FROM_SECRET.secretKeyRef.name Name of a Secret when configuring env vars from a Secret
|
## @extra yProvider.envVars.FROM_SECRET.secretKeyRef.name Name of a Secret when configuring env vars from a Secret
|
||||||
## @extra webrtc.envVars.FROM_SECRET.secretKeyRef.key Key within a Secret when configuring env vars from a Secret
|
## @extra yProvider.envVars.FROM_SECRET.secretKeyRef.key Key within a Secret when configuring env vars from a Secret
|
||||||
## @skip webrtc.envVars
|
## @skip yProvider.envVars
|
||||||
envVars:
|
envVars:
|
||||||
<<: *commonEnvVars
|
<<: *commonEnvVars
|
||||||
|
|
||||||
## @param webrtc.podAnnotations Annotations to add to the webrtc Pod
|
## @param yProvider.podAnnotations Annotations to add to the yProvider Pod
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
|
|
||||||
## @param webrtc.service.type webrtc Service type
|
## @param yProvider.service.type yProvider Service type
|
||||||
## @param webrtc.service.port webrtc Service listening port
|
## @param yProvider.service.port yProvider Service listening port
|
||||||
## @param webrtc.service.targetPort webrtc container listening port
|
## @param yProvider.service.targetPort yProvider container listening port
|
||||||
## @param webrtc.service.annotations Annotations to add to the webrtc Service
|
## @param yProvider.service.annotations Annotations to add to the yProvider Service
|
||||||
service:
|
service:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
port: 443
|
port: 443
|
||||||
targetPort: 4444
|
targetPort: 4444
|
||||||
annotations: {}
|
annotations: {}
|
||||||
|
|
||||||
## @param webrtc.probes Configure probe for webrtc
|
## @param yProvider.probes Configure probe for yProvider
|
||||||
## @extra webrtc.probes.liveness.path Configure path for webrtc HTTP liveness probe
|
## @extra yProvider.probes.liveness.path Configure path for yProvider HTTP liveness probe
|
||||||
## @extra webrtc.probes.liveness.targetPort Configure port for webrtc HTTP liveness probe
|
## @extra yProvider.probes.liveness.targetPort Configure port for yProvider HTTP liveness probe
|
||||||
## @extra webrtc.probes.liveness.initialDelaySeconds Configure initial delay for webrtc liveness probe
|
## @extra yProvider.probes.liveness.initialDelaySeconds Configure initial delay for yProvider liveness probe
|
||||||
## @extra webrtc.probes.liveness.initialDelaySeconds Configure timeout for webrtc liveness probe
|
## @extra yProvider.probes.liveness.initialDelaySeconds Configure timeout for yProvider liveness probe
|
||||||
## @extra webrtc.probes.startup.path Configure path for webrtc HTTP startup probe
|
## @extra yProvider.probes.startup.path Configure path for yProvider HTTP startup probe
|
||||||
## @extra webrtc.probes.startup.targetPort Configure port for webrtc HTTP startup probe
|
## @extra yProvider.probes.startup.targetPort Configure port for yProvider HTTP startup probe
|
||||||
## @extra webrtc.probes.startup.initialDelaySeconds Configure initial delay for webrtc startup probe
|
## @extra yProvider.probes.startup.initialDelaySeconds Configure initial delay for yProvider startup probe
|
||||||
## @extra webrtc.probes.startup.initialDelaySeconds Configure timeout for webrtc startup probe
|
## @extra yProvider.probes.startup.initialDelaySeconds Configure timeout for yProvider startup probe
|
||||||
## @extra webrtc.probes.readiness.path Configure path for webrtc HTTP readiness probe
|
## @extra yProvider.probes.readiness.path Configure path for yProvider HTTP readiness probe
|
||||||
## @extra webrtc.probes.readiness.targetPort Configure port for webrtc HTTP readiness probe
|
## @extra yProvider.probes.readiness.targetPort Configure port for yProvider HTTP readiness probe
|
||||||
## @extra webrtc.probes.readiness.initialDelaySeconds Configure initial delay for webrtc readiness probe
|
## @extra yProvider.probes.readiness.initialDelaySeconds Configure initial delay for yProvider readiness probe
|
||||||
## @extra webrtc.probes.readiness.initialDelaySeconds Configure timeout for webrtc readiness probe
|
## @extra yProvider.probes.readiness.initialDelaySeconds Configure timeout for yProvider readiness probe
|
||||||
probes:
|
probes:
|
||||||
liveness:
|
liveness:
|
||||||
path: /ping
|
path: /ping
|
||||||
initialDelaySeconds: 10
|
initialDelaySeconds: 10
|
||||||
|
|
||||||
## @param webrtc.resources Resource requirements for the webrtc container
|
## @param yProvider.resources Resource requirements for the yProvider container
|
||||||
resources: {}
|
resources: {}
|
||||||
|
|
||||||
## @param webrtc.nodeSelector Node selector for the webrtc Pod
|
## @param yProvider.nodeSelector Node selector for the yProvider Pod
|
||||||
nodeSelector: {}
|
nodeSelector: {}
|
||||||
|
|
||||||
## @param webrtc.tolerations Tolerations for the webrtc Pod
|
## @param yProvider.tolerations Tolerations for the yProvider Pod
|
||||||
tolerations: []
|
tolerations: []
|
||||||
|
|
||||||
## @param webrtc.affinity Affinity for the webrtc Pod
|
## @param yProvider.affinity Affinity for the yProvider Pod
|
||||||
affinity: {}
|
affinity: {}
|
||||||
|
|
||||||
## @param webrtc.persistence Additional volumes to create and mount on the webrtc. Used for debugging purposes
|
## @param yProvider.persistence Additional volumes to create and mount on the yProvider. Used for debugging purposes
|
||||||
## @extra webrtc.persistence.volume-name.size Size of the additional volume
|
## @extra yProvider.persistence.volume-name.size Size of the additional volume
|
||||||
## @extra webrtc.persistence.volume-name.type Type of the additional volume, persistentVolumeClaim or emptyDir
|
## @extra yProvider.persistence.volume-name.type Type of the additional volume, persistentVolumeClaim or emptyDir
|
||||||
## @extra webrtc.persistence.volume-name.mountPath Path where the volume should be mounted to
|
## @extra yProvider.persistence.volume-name.mountPath Path where the volume should be mounted to
|
||||||
persistence: {}
|
persistence: {}
|
||||||
|
|
||||||
## @param webrtc.extraVolumeMounts Additional volumes to mount on the webrtc.
|
## @param yProvider.extraVolumeMounts Additional volumes to mount on the yProvider.
|
||||||
extraVolumeMounts: []
|
extraVolumeMounts: []
|
||||||
|
|
||||||
## @param webrtc.extraVolumes Additional volumes to mount on the webrtc.
|
## @param yProvider.extraVolumes Additional volumes to mount on the yProvider.
|
||||||
extraVolumes: []
|
extraVolumes: []
|
||||||
Reference in New Issue
Block a user