diff --git a/src/main/cljc/dda/c4k_jitsi/core.cljc b/src/main/cljc/dda/c4k_jitsi/core.cljc index 521f9ae..561a699 100644 --- a/src/main/cljc/dda/c4k_jitsi/core.cljc +++ b/src/main/cljc/dda/c4k_jitsi/core.cljc @@ -20,7 +20,7 @@ (jitsi/generate-secret config) (jitsi/generate-jvb-service) (jitsi/generate-web-service) - (jitsi/generate-deployment)])) + (jitsi/generate-deployment config)])) (defn-spec generate any? [my-config config? diff --git a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc index 9015ca1..b10baf8 100644 --- a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc +++ b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc @@ -20,9 +20,13 @@ "jitsi/jvb-service.yaml" (rc/inline "jitsi/jvb-service.yaml") "jitsi/secret.yaml" (rc/inline "jitsi/secret.yaml") "jitsi/web-service.yaml" (rc/inline "jitsi/web-service.yaml") + ;; TODO - dat gibt es nicht, oder? "jitsi/pod-security-policy.yaml" (rc/inline "jitsi/pod-security-policy.yaml") + ;; TODO - dat gibt es nicht, oder? "jitsi/role-binding.yaml" (rc/inline "jitsi/role-binding.yaml") + ;; TODO - dat gibt es nicht, oder? "jitsi/role.yaml" (rc/inline "jitsi/role.yaml") + ;; TODO - dat gibt es nicht, oder? "jitsi/service-account.yaml" (rc/inline "jitsi/service-account.yaml") (throw (js/Error. "Undefined Resource!"))))) @@ -35,7 +39,7 @@ (yaml/from-string (yaml/load-resource "jitsi/ingress.yaml")) (assoc-in [:metadata :annotations :cert-manager.io/cluster-issuer] letsencrypt-issuer) (assoc-in [:metadata :annotations :kubernetes.io/ingress.class] ingress-kind) - (cm/replace-all-matching-values-by-new-value "fqdn" fqdn)))) + (cm/replace-all-matching-values-by-new-value "FQDN" fqdn)))) (defn generate-secret [config] (let [{:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} config] @@ -51,5 +55,8 @@ (defn generate-web-service [] (yaml/from-string (yaml/load-resource "jitsi/web-service.yaml"))) -(defn generate-deployment [] - (yaml/from-string (yaml/load-resource "jitsi/deployment.yaml"))) \ No newline at end of file +(defn generate-deployment [config] + (let [{:keys [fqdn]} config] + (-> + (yaml/from-string (yaml/load-resource "jitsi/deployment.yaml")) + (cm/replace-all-matching-values-by-new-value "FQDN" fqdn)))) \ No newline at end of file diff --git a/src/main/resources/jitsi/deployment.yaml b/src/main/resources/jitsi/deployment.yaml index 3e55d19..45ec893 100644 --- a/src/main/resources/jitsi/deployment.yaml +++ b/src/main/resources/jitsi/deployment.yaml @@ -51,7 +51,7 @@ spec: imagePullPolicy: IfNotPresent env: - name: PUBLIC_URL - value: "https://jitsi.test.meissa-gmbh.de" + value: FQDN - name: XMPP_DOMAIN value: meet.jitsi - name: XMPP_AUTH_DOMAIN @@ -88,7 +88,7 @@ spec: imagePullPolicy: IfNotPresent env: - name: PUBLIC_URL - value: "https://jitsi.test.meissa-gmbh.de" + value: FQDN - name: XMPP_SERVER value: localhost - name: JICOFO_AUTH_USER diff --git a/src/main/resources/jitsi/ingress.yaml b/src/main/resources/jitsi/ingress.yaml index 70c0d80..05495b3 100644 --- a/src/main/resources/jitsi/ingress.yaml +++ b/src/main/resources/jitsi/ingress.yaml @@ -4,13 +4,14 @@ metadata: name: jitsi annotations: cert-manager.io/cluster-issuer: letsencrypt-staging-issuer + ingress.kubernetes.io/ssl-redirect: "true" spec: tls: - hosts: - fqdn secretName: tls-jitsi rules: - - host: fqdn + - host: FQDN http: paths: - path: /