MarcusVRP pushed to branch main at Root / Kubernetes / FluxCD

Commits:

2 changed files:

Changes:

  • apps/base/matrix/es.yaml
    ... ... @@ -11,47 +11,19 @@ spec:
    11 11
       target:
    
    12 12
         name: matrix
    
    13 13
       data:
    
    14
    -    # - secretKey: oidcClientId
    
    15
    -    #   remoteRef:
    
    16
    -    #     key: matrix
    
    17
    -    #     property: oidcClientId
    
    18
    -    # - secretKey: oidcClientSecret
    
    19
    -    #   remoteRef:
    
    20
    -    #     key: matrix
    
    21
    -    #     property: oidcClientSecret
    
    22
    -    # - secretKey: postgresHost
    
    23
    -    #   remoteRef:
    
    24
    -    #     key: matrix
    
    25
    -    #     property: postgresHost
    
    26
    -    # - secretKey: postgresPassword
    
    27
    -    #   remoteRef:
    
    28
    -    #     key: matrix
    
    29
    -    #     property: postgresPassword
    
    30
    -    # - secretKey: postgresUser
    
    31
    -    #   remoteRef:
    
    32
    -    #     key: matrix
    
    33
    -    #     property: postgresUser
    
    34
    -    # - secretKey: s3AccessKey
    
    35
    -    #   remoteRef:
    
    36
    -    #     key: matrix
    
    37
    -    #     property: s3AccessKey
    
    38
    -    # - secretKey: s3Bucket
    
    39
    -    #   remoteRef:
    
    40
    -    #     key: matrix
    
    41
    -    #     property: s3Bucket
    
    42
    -    # - secretKey: s3Endpoint
    
    43
    -    #   remoteRef:
    
    44
    -    #     key: matrix
    
    45
    -    #     property: s3Endpoint
    
    46
    -    # - secretKey: s3SecretAccessKey
    
    47
    -    #   remoteRef:
    
    48
    -    #     key: matrix
    
    49
    -    #     property: s3SecretAccessKey
    
    50 14
         - secretKey: masOidcConfig
    
    51 15
           remoteRef:
    
    52 16
             key: matrix
    
    53 17
             property: masOidcConfig
    
    54
    -    - secretKey: synapseOidcConfig
    
    18
    +    - secretKey: synapseS3Config
    
    55 19
           remoteRef:
    
    56 20
             key: matrix
    
    57
    -        property: synapseOidcConfig
    21
    +        property: synapseS3Config
    
    22
    +    - secretKey: synapsePostgresPassword
    
    23
    +      remoteRef:
    
    24
    +        key: matrix
    
    25
    +        property: synapsePostgresPassword
    
    26
    +    - secretKey: masPostgresPassword
    
    27
    +      remoteRef:
    
    28
    +        key: matrix
    
    29
    +        property: masPostgresPassword

  • apps/base/matrix/helmrelease.yaml
    ... ... @@ -19,12 +19,28 @@ spec:
    19 19
             cert-manager.io/cluster-issuer: letsencrypt-wildcard
    
    20 20
           tlsSecret: matrix-tls
    
    21 21
         postgres:
    
    22
    -      enabled: true
    
    22
    +      # do not use **internal** postgres db
    
    23
    +      enabled: false
    
    23 24
         synapse:
    
    25
    +      image: harbor.c3sl.ufpr.br/root/synapse
    
    24 26
           ingress:
    
    25 27
             host: synapse.matrix.c3sl.ufpr.br
    
    26 28
             tlsSecret: synapse-tls
    
    29
    +      postgres:
    
    30
    +        host: postgres.c3sl.ufpr.br
    
    31
    +        user: matrix-synapse
    
    32
    +        database: matrix-synapse
    
    33
    +        password:
    
    34
    +          secret: matrix
    
    35
    +          secretKey: synapsePostgresPassword
    
    27 36
           additional:
    
    37
    +        allow-search-users:
    
    38
    +          config: |
    
    39
    +            user_directory:
    
    40
    +              enabled: true
    
    41
    +              search_all_users: true
    
    42
    +              prefer_local_users: true
    
    43
    +              show_locked_users: false
    
    28 44
             custom-config:
    
    29 45
               config: |
    
    30 46
                 report_stats: false
    
    ... ... @@ -44,10 +60,20 @@ spec:
    44 60
                  enable_notifs: true
    
    45 61
                  notif_for_new_users: true
    
    46 62
                  validation_token_lifetime: 15m
    
    63
    +        s3-config:
    
    64
    +          configSecret: matrix
    
    65
    +          configSecretKey: synapseS3Config
    
    47 66
         matrixAuthenticationService:
    
    48 67
           ingress:
    
    49 68
             host: auth.matrix.c3sl.ufpr.br
    
    50 69
             tlsSecret: mas-tls
    
    70
    +      postgres:
    
    71
    +        host: postgres.c3sl.ufpr.br
    
    72
    +        user: matrix-auth
    
    73
    +        database: matrix-auth
    
    74
    +        password:
    
    75
    +          secret: matrix
    
    76
    +          secretKey: masPostgresPassword
    
    51 77
           additional:
    
    52 78
             button-text:
    
    53 79
               config: |