diff --git a/infrastructure/app/image/Dockerfile b/infrastructure/app/image/Dockerfile index a70d9b7..6995476 100644 --- a/infrastructure/app/image/Dockerfile +++ b/infrastructure/app/image/Dockerfile @@ -1,4 +1,4 @@ -FROM jitsi/web:stable-8719 +FROM jitsi/web:stable-8922-1 # Prepare Configuration ADD resources /tmp diff --git a/jitsi.yaml b/jitsi.yaml deleted file mode 100644 index 324b488..0000000 --- a/jitsi.yaml +++ /dev/null @@ -1,233 +0,0 @@ -kind: Ingress -apiVersion: networking.k8s.io/v1 -metadata: - name: jitsi - annotations: - cert-manager.io/cluster-issuer: letsencrypt-staging-issuer - ingress.kubernetes.io/ssl-redirect: 'true' - kubernetes.io/ingress.class: '' -spec: - tls: - - hosts: - - fqdn - secretName: tls-jitsi - rules: - - host: jitsi.test.meissa-gmbh.de - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: web - port: - number: 80 - ---- -apiVersion: v1 -kind: Secret -metadata: - name: jitsi-config -type: Opaque -data: - JVB_AUTH_PASSWORD: SnZiQXV0aA== - JICOFO_AUTH_PASSWORD: Smljb2ZvQXV0aA== - JICOFO_COMPONENT_SECRET: Smljb2ZvQ29tcFNlYw== - ---- -apiVersion: v1 -kind: Service -metadata: - labels: - service: jvb - name: jvb-udp -spec: - type: NodePort - externalTrafficPolicy: Cluster - ports: - - port: 30300 - protocol: UDP - targetPort: 30300 - nodePort: 30300 - selector: - app: jitsi - ---- -apiVersion: v1 -kind: Service -metadata: - labels: - service: web - name: web -spec: - ports: - - name: http - port: 80 - targetPort: 80 - - name: https - port: 443 - targetPort: 443 - selector: - app: jitsi - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: jitsi - name: jitsi -spec: - strategy: - type: Recreate - selector: - matchLabels: - app: jitsi - template: - metadata: - labels: - app: jitsi - spec: - containers: - - name: jicofo - image: jitsi/jicofo:stable-6826 - imagePullPolicy: IfNotPresent - env: - - name: XMPP_SERVER - value: localhost - - name: XMPP_DOMAIN - value: meet.jitsi - - name: XMPP_AUTH_DOMAIN - value: auth.meet.jitsi - - name: XMPP_MUC_DOMAIN - value: muc.meet.jitsi - - name: XMPP_INTERNAL_MUC_DOMAIN - value: internal-muc.meet.jitsi - - name: JICOFO_COMPONENT_SECRET - valueFrom: - secretKeyRef: - name: jitsi-config - key: JICOFO_COMPONENT_SECRET - - name: JICOFO_AUTH_USER - value: focus - - name: JICOFO_AUTH_PASSWORD - valueFrom: - secretKeyRef: - name: jitsi-config - key: JICOFO_AUTH_PASSWORD - - name: TZ - value: Europe/Berlin - - name: JVB_BREWERY_MUC - value: jvbbrewery - - name: prosody - image: jitsi/prosody:stable-6826 - imagePullPolicy: IfNotPresent - env: - - name: PUBLIC_URL - value: jitsi.test.meissa-gmbh.de - - name: XMPP_DOMAIN - value: meet.jitsi - - name: XMPP_AUTH_DOMAIN - value: auth.meet.jitsi - - name: XMPP_MUC_DOMAIN - value: muc.meet.jitsi - - name: XMPP_INTERNAL_MUC_DOMAIN - value: internal-muc.meet.jitsi - - name: JICOFO_COMPONENT_SECRET - valueFrom: - secretKeyRef: - name: jitsi-config - key: JICOFO_COMPONENT_SECRET - - name: JVB_AUTH_USER - value: jvb - - name: JVB_AUTH_PASSWORD - valueFrom: - secretKeyRef: - name: jitsi-config - key: JVB_AUTH_PASSWORD - - name: JICOFO_AUTH_USER - value: focus - - name: JICOFO_AUTH_PASSWORD - valueFrom: - secretKeyRef: - name: jitsi-config - key: JICOFO_AUTH_PASSWORD - - name: TZ - value: Europe/Berlin - - name: JVB_TCP_HARVESTER_DISABLED - value: 'true' - - name: web - image: domaindrivenarchitecture/c4k-jitsi - imagePullPolicy: IfNotPresent - env: - - name: PUBLIC_URL - value: jitsi.test.meissa-gmbh.de - - name: XMPP_SERVER - value: localhost - - name: JICOFO_AUTH_USER - value: focus - - name: XMPP_DOMAIN - value: meet.jitsi - - name: XMPP_AUTH_DOMAIN - value: auth.meet.jitsi - - name: XMPP_INTERNAL_MUC_DOMAIN - value: internal-muc.meet.jitsi - - name: XMPP_BOSH_URL_BASE - value: http://127.0.0.1:5280 - - name: XMPP_MUC_DOMAIN - value: muc.meet.jitsi - - name: TZ - value: Europe/Berlin - - name: JVB_TCP_HARVESTER_DISABLED - value: 'true' - - name: DEFAULT_LANGUAGE - value: de - - name: RESOLUTION - value: '480' - - name: RESOLUTION_MIN - value: '240' - - name: RESOLUTION_WIDTH - value: '853' - - name: RESOLUTION_WIDTH_MIN - value: '427' - - name: DISABLE_AUDIO_LEVELS - value: 'true' - - name: jvb - image: jitsi/jvb:stable-6826 - imagePullPolicy: IfNotPresent - env: - - name: XMPP_SERVER - value: localhost - - name: DOCKER_HOST_ADDRESS - value: localhost - - name: XMPP_DOMAIN - value: meet.jitsi - - name: XMPP_AUTH_DOMAIN - value: auth.meet.jitsi - - name: XMPP_INTERNAL_MUC_DOMAIN - value: internal-muc.meet.jitsi - - name: JVB_STUN_SERVERS - value: stun.1und1.de:3478,stun.t-online.de:3478,stun.hosteurope.de:3478 - - name: JICOFO_AUTH_USER - value: focus - - name: JVB_TCP_HARVESTER_DISABLED - value: 'true' - - name: JVB_AUTH_USER - value: jvb - - name: JVB_PORT - value: '30300' - - name: JVB_AUTH_PASSWORD - valueFrom: - secretKeyRef: - name: jitsi-config - key: JVB_AUTH_PASSWORD - - name: JICOFO_AUTH_PASSWORD - valueFrom: - secretKeyRef: - name: jitsi-config - key: JICOFO_AUTH_PASSWORD - - name: JVB_BREWERY_MUC - value: jvbbrewery - - name: TZ - value: Europe/Berlin - diff --git a/src/main/resources/jitsi/deployment.yaml b/src/main/resources/jitsi/deployment.yaml index 00d3cd6..4ee0d78 100644 --- a/src/main/resources/jitsi/deployment.yaml +++ b/src/main/resources/jitsi/deployment.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: jicofo - image: jitsi/jicofo:stable-8615 + image: jitsi/jicofo:stable-8922-1 imagePullPolicy: IfNotPresent env: - name: XMPP_SERVER @@ -47,7 +47,7 @@ spec: - name: JVB_BREWERY_MUC value: jvbbrewery - name: prosody - image: jitsi/prosody:stable-7287 + image: jitsi/prosody:stable-8922-1 imagePullPolicy: IfNotPresent env: - name: PUBLIC_URL @@ -122,7 +122,7 @@ spec: - name: ETHERPAD_PUBLIC_URL value: REPLACE_ETHERPAD_URL - name: jvb - image: jitsi/jvb:stable-8719 + image: jitsi/jvb:stable-8922-1 imagePullPolicy: IfNotPresent env: - name: PUBLIC_URL @@ -160,7 +160,7 @@ spec: - name: TZ value: Europe/Berlin - name: etherpad - image: etherpad/etherpad:1.9.1 + image: etherpad/etherpad:1.9.2 env: - name: XMPP_SERVER value: localhost