MarcusVRP pushed to branch main at Root / Kubernetes / FluxCD
Commits:
-
4a374606
by marcusvrp at 2025-07-31T22:45:24-03:00
13 changed files:
- − apps/base/matrix/deploy.yaml
- apps/base/matrix/es.yaml
- apps/base/matrixtest/helmrelease.yaml → apps/base/matrix/helmrelease.yaml
- apps/base/matrixtest/helmrepo.yaml → apps/base/matrix/helmrepo.yaml
- − apps/base/matrix/ing.yaml
- apps/base/matrix/kustomization.yaml
- − apps/base/matrix/pvc.yaml
- − apps/base/matrix/svc.yaml
- − apps/base/matrixtest/es.yaml
- − apps/base/matrixtest/kustomization.yaml
- − apps/base/matrixtest/ns.yaml
- − apps/base/matrixtest/pvc.yaml
- apps/stage/kustomization.yaml
Changes:
1 | -apiVersion: apps/v1
|
|
2 | -kind: Deployment
|
|
3 | -metadata:
|
|
4 | - name: synapse
|
|
5 | - namespace: matrix
|
|
6 | - labels:
|
|
7 | - app: synapse
|
|
8 | -spec:
|
|
9 | - selector:
|
|
10 | - matchLabels:
|
|
11 | - app: synapse
|
|
12 | - tier: backend
|
|
13 | - strategy:
|
|
14 | - type: Recreate
|
|
15 | - template:
|
|
16 | - metadata:
|
|
17 | - labels:
|
|
18 | - app: synapse
|
|
19 | - tier: backend
|
|
20 | - spec:
|
|
21 | - containers:
|
|
22 | - - image: harbor.c3sl.ufpr.br/root/synapse
|
|
23 | - name: synapse
|
|
24 | - env:
|
|
25 | - - name: SYNAPSE_SERVER_NAME
|
|
26 | - value: matrix.c3sl.ufpr.br
|
|
27 | - - name: SYNAPSE_REPORT_STATS
|
|
28 | - value: 'no'
|
|
29 | - - containerPort: 8008
|
|
30 | - name: synapse
|
|
31 | - # ======== POSTGRES ======== #
|
|
32 | - - name: POSTGRES_HOST
|
|
33 | - valueFrom:
|
|
34 | - secretKeyRef:
|
|
35 | - name: matrix
|
|
36 | - key: synapsePostgresHost
|
|
37 | - - name: POSTGRES_USER
|
|
38 | - valueFrom:
|
|
39 | - secretKeyRef:
|
|
40 | - name: matrix
|
|
41 | - key: synapsePostgresUser
|
|
42 | - - name: POSTGRES_DB
|
|
43 | - valueFrom:
|
|
44 | - secretKeyRef:
|
|
45 | - name: matrix
|
|
46 | - key: synapsePostgresDatabase
|
|
47 | - - name: POSTGRES_PASSWORD
|
|
48 | - valueFrom:
|
|
49 | - secretKeyRef:
|
|
50 | - name: matrix
|
|
51 | - key: synapsePostgresPassword
|
|
52 | - # ======== OPENID ======== #
|
|
53 | - - name: OIDC_IDP_NAME
|
|
54 | - value: DInf/C3SL
|
|
55 | - - name: OIDC_ISSUER
|
|
56 | - value: https://keycloak.c3sl.ufpr.br/realms/DInfC3SL
|
|
57 | - - name: OIDC_CLIENT_ID
|
|
58 | - valueFrom:
|
|
59 | - secretKeyRef:
|
|
60 | - name: matrix
|
|
61 | - key: synapseOidcClientId
|
|
62 | - - name: OIDC_CLIENT_SECRET
|
|
63 | - valueFrom:
|
|
64 | - secretKeyRef:
|
|
65 | - name: matrix
|
|
66 | - key: synapseOidcClientSecret
|
|
67 | - # ======== S3 ======== #
|
|
68 | - - name: S3_BUCKET_NAME
|
|
69 | - valueFrom:
|
|
70 | - secretKeyRef:
|
|
71 | - name: matrix
|
|
72 | - key: synapseS3BucketName
|
|
73 | - - name: S3_REGION_NAME
|
|
74 | - valueFrom:
|
|
75 | - secretKeyRef:
|
|
76 | - name: matrix
|
|
77 | - key: synapseS3RegionName
|
|
78 | - - name: S3_ENDPOINT_URL
|
|
79 | - valueFrom:
|
|
80 | - secretKeyRef:
|
|
81 | - name: matrix
|
|
82 | - key: synapseS3EndpointURL
|
|
83 | - - name: S3_ACCESS_KEY_ID
|
|
84 | - valueFrom:
|
|
85 | - secretKeyRef:
|
|
86 | - name: matrix
|
|
87 | - key: synapseS3AccessKeyId
|
|
88 | - - name: S3_SECRET_ACCESS_KEY
|
|
89 | - valueFrom:
|
|
90 | - secretKeyRef:
|
|
91 | - name: matrix
|
|
92 | - key: synapseS3SecretAccessKey
|
|
93 | - volumeMounts:
|
|
94 | - - name: synapse-data
|
|
95 | - mountPath: /data
|
|
96 | - volumes:
|
|
97 | - - name: synapse-data
|
|
98 | - persistentVolumeClaim:
|
|
99 | - claimName: synapse
|
|
100 | ----
|
|
101 | -apiVersion: apps/v1
|
|
102 | -kind: Deployment
|
|
103 | -metadata:
|
|
104 | - name: element
|
|
105 | - namespace: matrix
|
|
106 | - labels:
|
|
107 | - app: element
|
|
108 | - tier: frontend
|
|
109 | -spec:
|
|
110 | - selector:
|
|
111 | - matchLabels:
|
|
112 | - app: element
|
|
113 | - tier: frontend
|
|
114 | - strategy:
|
|
115 | - type: Recreate
|
|
116 | - template:
|
|
117 | - metadata:
|
|
118 | - labels:
|
|
119 | - app: element
|
|
120 | - tier: frontend
|
|
121 | - spec:
|
|
122 | - containers:
|
|
123 | - - image: vectorim/element-web
|
|
124 | - name: element
|
|
125 | - ports:
|
|
126 | - - containerPort: 80
|
|
127 | - name: element
|
|
128 | - volumeMounts:
|
|
129 | - - name: element-config
|
|
130 | - mountPath: /app/config.json
|
|
131 | - subPath: elementConfigJson
|
|
132 | - volumes:
|
|
133 | - - name: element-config
|
|
134 | - secret:
|
|
135 | - secretName: matrix |
... | ... | @@ -11,51 +11,47 @@ spec: |
11 | 11 | target:
|
12 | 12 | name: matrix
|
13 | 13 | data:
|
14 | - - secretKey: elementConfigJson
|
|
15 | - remoteRef:
|
|
16 | - key: matrix
|
|
17 | - property: elementConfigJson
|
|
18 | - - secretKey: synapsePostgresHost
|
|
19 | - remoteRef:
|
|
20 | - key: matrix
|
|
21 | - property: synapsePostgresHost
|
|
22 | - - secretKey: synapsePostgresUser
|
|
23 | - remoteRef:
|
|
24 | - key: matrix
|
|
25 | - property: synapsePostgresUser
|
|
26 | - - secretKey: synapsePostgresDatabase
|
|
27 | - remoteRef:
|
|
28 | - key: matrix
|
|
29 | - property: synapsePostgresDatabase
|
|
30 | - - secretKey: synapsePostgresPassword
|
|
31 | - remoteRef:
|
|
32 | - key: matrix
|
|
33 | - property: synapsePostgresPassword
|
|
34 | - - secretKey: synapseOidcClientId
|
|
35 | - remoteRef:
|
|
36 | - key: matrix
|
|
37 | - property: synapseOidcClientId
|
|
38 | - - secretKey: synapseOidcClientSecret
|
|
39 | - remoteRef:
|
|
40 | - key: matrix
|
|
41 | - property: synapseOidcClientSecret
|
|
42 | - - secretKey: synapseS3BucketName
|
|
43 | - remoteRef:
|
|
44 | - key: matrix
|
|
45 | - property: synapseS3BucketName
|
|
46 | - - secretKey: synapseS3RegionName
|
|
47 | - remoteRef:
|
|
48 | - key: matrix
|
|
49 | - property: synapseS3RegionName
|
|
50 | - - secretKey: synapseS3EndpointURL
|
|
51 | - remoteRef:
|
|
52 | - key: matrix
|
|
53 | - property: synapseS3EndpointURL
|
|
54 | - - secretKey: synapseS3AccessKeyId
|
|
55 | - remoteRef:
|
|
56 | - key: matrix
|
|
57 | - property: synapseS3AccessKeyId
|
|
58 | - - secretKey: synapseS3SecretAccessKey
|
|
59 | - remoteRef:
|
|
60 | - key: matrix
|
|
61 | - property: synapseS3SecretAccessKey |
|
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 | + - secretKey: masOidcConfig
|
|
51 | + remoteRef:
|
|
52 | + key: matrix
|
|
53 | + property: masOidcConfig
|
|
54 | + - secretKey: synapseOidcConfig
|
|
55 | + remoteRef:
|
|
56 | + key: matrix
|
|
57 | + property: synapseOidcConfig |
1 | 1 | apiVersion: helm.toolkit.fluxcd.io/v2
|
2 | 2 | kind: HelmRelease
|
3 | 3 | metadata:
|
4 | - name: matrixtest
|
|
5 | - namespace: matrixtest
|
|
4 | + name: matrix
|
|
5 | + namespace: matrix
|
|
6 | 6 | spec:
|
7 | 7 | interval: 1m
|
8 | 8 | chart:
|
... | ... | @@ -10,9 +10,9 @@ spec: |
10 | 10 | chart: matrix-stack
|
11 | 11 | sourceRef:
|
12 | 12 | kind: HelmRepository
|
13 | - name: matrixtest
|
|
13 | + name: matrix
|
|
14 | 14 | values:
|
15 | - serverName: matrixtest.k8sstage.c3sl.ufpr.br
|
|
15 | + serverName: matrix.c3sl.ufpr.br
|
|
16 | 16 | ingress:
|
17 | 17 | className: cilium
|
18 | 18 | annotations:
|
... | ... | @@ -21,7 +21,7 @@ spec: |
21 | 21 | matrixAuthenticationService:
|
22 | 22 | enabled: true
|
23 | 23 | ingress:
|
24 | - host: matrixauth.k8sstage.c3sl.ufpr.br
|
|
24 | + host: matrixauth.c3sl.ufpr.br
|
|
25 | 25 | additional:
|
26 | 26 | button-text:
|
27 | 27 | config: |
|
... | ... | @@ -33,35 +33,35 @@ spec: |
33 | 33 | matrixRTC:
|
34 | 34 | enabled: true
|
35 | 35 | ingress:
|
36 | - host: matrixrtc.k8sstage.c3sl.ufpr.br
|
|
36 | + host: matrixrtc.c3sl.ufpr.br
|
|
37 | 37 | postgres:
|
38 | 38 | enabled: true
|
39 | 39 | synapse:
|
40 | 40 | ingress:
|
41 | - host: synapsetest.k8sstage.c3sl.ufpr.br
|
|
41 | + host: synapse.c3sl.ufpr.br
|
|
42 | 42 | additional:
|
43 | 43 | custom-config:
|
44 | 44 | config: |
|
45 | 45 | report_stats: false
|
46 | 46 | trusted_key_servers:
|
47 | - - server_name: "matrixtest.c3sl.ufpr.br"
|
|
47 | + - server_name: "matrix.c3sl.ufpr.br"
|
|
48 | 48 | - server_name: "matrix.org"
|
49 | - public_baseurl: "https://matrixtest.c3sl.ufpr.br"
|
|
49 | + public_baseurl: "https://matrix.c3sl.ufpr.br"
|
|
50 | 50 | serve_server_wellknown: true
|
51 | 51 | enable_registration: false
|
52 | - default_identity_server: https://matrixtest.c3sl.ufpr.br
|
|
52 | + default_identity_server: https://matrix.c3sl.ufpr.br
|
|
53 | 53 | trusted_third_party_id_servers:
|
54 | - - matrixtest.c3sl.ufpr.br
|
|
54 | + - matrix.c3sl.ufpr.br
|
|
55 | 55 | email:
|
56 | 56 | smtp_host: smtp.c3sl.ufpr.br
|
57 | 57 | smtp_port: 25
|
58 | - notif_from: "matrixtest.c3sl.ufpr.br"
|
|
58 | + notif_from: "matrix.c3sl.ufpr.br"
|
|
59 | 59 | enable_notifs: true
|
60 | 60 | notif_for_new_users: true
|
61 | 61 | validation_token_lifetime: 15m
|
62 | 62 | elementWeb:
|
63 | 63 | ingress:
|
64 | - host: elementweb.k8sstage.c3sl.ufpr.br
|
|
64 | + host: element.c3sl.ufpr.br
|
|
65 | 65 | additional:
|
66 | 66 | config.json: |
|
67 | 67 | {
|
1 | 1 | apiVersion: source.toolkit.fluxcd.io/v1
|
2 | 2 | kind: HelmRepository
|
3 | 3 | metadata:
|
4 | - name: matrixtest
|
|
5 | - namespace: matrixtest
|
|
4 | + name: matrix
|
|
5 | + namespace: matrix
|
|
6 | 6 | spec:
|
7 | 7 | type: "oci"
|
8 | 8 | interval: 1m0s
|
1 | -apiVersion: networking.k8s.io/v1
|
|
2 | -kind: Ingress
|
|
3 | -metadata:
|
|
4 | - name: matrix
|
|
5 | - namespace: matrix
|
|
6 | - annotations:
|
|
7 | - cert-manager.io/cluster-issuer: letsencrypt-wildcard
|
|
8 | -spec:
|
|
9 | - ingressClassName: cilium
|
|
10 | - rules:
|
|
11 | - - host: matrix.c3sl.ufpr.br
|
|
12 | - http:
|
|
13 | - paths:
|
|
14 | - - path: /
|
|
15 | - pathType: Prefix
|
|
16 | - backend:
|
|
17 | - service:
|
|
18 | - name: synapse
|
|
19 | - port:
|
|
20 | - number: 8008
|
|
21 | - - host: synapse.c3sl.ufpr.br
|
|
22 | - http:
|
|
23 | - paths:
|
|
24 | - - path: /
|
|
25 | - pathType: Prefix
|
|
26 | - backend:
|
|
27 | - service:
|
|
28 | - name: synapse
|
|
29 | - port:
|
|
30 | - number: 8008
|
|
31 | - - host: synapse.k8sstage.c3sl.ufpr.br
|
|
32 | - http:
|
|
33 | - paths:
|
|
34 | - - path: /
|
|
35 | - pathType: Prefix
|
|
36 | - backend:
|
|
37 | - service:
|
|
38 | - name: synapse
|
|
39 | - port:
|
|
40 | - number: 8008
|
|
41 | - - host: matrix.k8sstage.c3sl.ufpr.br
|
|
42 | - http:
|
|
43 | - paths:
|
|
44 | - - path: /
|
|
45 | - pathType: Prefix
|
|
46 | - backend:
|
|
47 | - service:
|
|
48 | - name: synapse
|
|
49 | - port:
|
|
50 | - number: 8008
|
|
51 | - - host: element.k8sstage.c3sl.ufpr.br
|
|
52 | - http:
|
|
53 | - paths:
|
|
54 | - - path: /
|
|
55 | - pathType: Prefix
|
|
56 | - backend:
|
|
57 | - service:
|
|
58 | - name: element
|
|
59 | - port:
|
|
60 | - number: 80
|
|
61 | - - host: element.c3sl.ufpr.br
|
|
62 | - http:
|
|
63 | - paths:
|
|
64 | - - path: /
|
|
65 | - pathType: Prefix
|
|
66 | - backend:
|
|
67 | - service:
|
|
68 | - name: element
|
|
69 | - port:
|
|
70 | - number: 80
|
|
71 | - tls:
|
|
72 | - - hosts:
|
|
73 | - - matrix.c3sl.ufpr.br
|
|
74 | - - synapse.c3sl.ufpr.br
|
|
75 | - - synapse.k8sstage.c3sl.ufpr.br
|
|
76 | - - matrix.k8sstage.c3sl.ufpr.br
|
|
77 | - - element.c3sl.ufpr.br
|
|
78 | - - element.k8sstage.c3sl.ufpr.br
|
|
79 | - secretName: matrix-tls |
1 | 1 | apiVersion: kustomize.config.k8s.io/v1beta1
|
2 | 2 | kind: Kustomization
|
3 | 3 | resources:
|
4 | - - es.yaml
|
|
5 | - - deploy.yaml
|
|
6 | - - ing.yaml
|
|
7 | 4 | - ns.yaml
|
8 | - - pvc.yaml
|
|
9 | - - svc.yaml |
|
5 | + - es.yaml
|
|
6 | + - helmrepo.yaml
|
|
7 | + - helmrelease.yaml |
1 | -apiVersion: v1
|
|
2 | -kind: PersistentVolumeClaim
|
|
3 | -metadata:
|
|
4 | - name: synapse
|
|
5 | - namespace: matrix
|
|
6 | - labels:
|
|
7 | - app: synapse
|
|
8 | -spec:
|
|
9 | - accessModes:
|
|
10 | - - ReadWriteOnce
|
|
11 | - resources:
|
|
12 | - requests:
|
|
13 | - storage: 10Gi |
1 | -apiVersion: v1
|
|
2 | -kind: Service
|
|
3 | -metadata:
|
|
4 | - name: synapse
|
|
5 | - namespace: matrix
|
|
6 | - labels:
|
|
7 | - app: synapse
|
|
8 | -spec:
|
|
9 | - ports:
|
|
10 | - - port: 8008
|
|
11 | - selector:
|
|
12 | - app: synapse
|
|
13 | - tier: backend
|
|
14 | - type: ClusterIP
|
|
15 | ----
|
|
16 | -apiVersion: v1
|
|
17 | -kind: Service
|
|
18 | -metadata:
|
|
19 | - name: element
|
|
20 | - namespace: matrix
|
|
21 | - labels:
|
|
22 | - app: element
|
|
23 | -spec:
|
|
24 | - ports:
|
|
25 | - - port: 80
|
|
26 | - selector:
|
|
27 | - app: element
|
|
28 | - tier: frontend
|
|
29 | - type: ClusterIP |
1 | -apiVersion: external-secrets.io/v1
|
|
2 | -kind: ExternalSecret
|
|
3 | -metadata:
|
|
4 | - name: matrix
|
|
5 | - namespace: matrixtest
|
|
6 | -spec:
|
|
7 | - refreshInterval: "15s"
|
|
8 | - secretStoreRef:
|
|
9 | - name: openbao
|
|
10 | - kind: ClusterSecretStore
|
|
11 | - target:
|
|
12 | - name: matrix
|
|
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 | - - secretKey: masOidcConfig
|
|
51 | - remoteRef:
|
|
52 | - key: matrix
|
|
53 | - property: masOidcConfig
|
|
54 | - - secretKey: synapseOidcConfig
|
|
55 | - remoteRef:
|
|
56 | - key: matrix
|
|
57 | - property: synapseOidcConfig |
1 | -apiVersion: kustomize.config.k8s.io/v1beta1
|
|
2 | -kind: Kustomization
|
|
3 | -resources:
|
|
4 | - - ns.yaml
|
|
5 | - - es.yaml
|
|
6 | - - helmrepo.yaml
|
|
7 | - - helmrelease.yaml |
1 | -apiVersion: v1
|
|
2 | -kind: Namespace
|
|
3 | -metadata:
|
|
4 | - name: matrixtest |
1 | -apiVersion: v1
|
|
2 | -kind: PersistentVolumeClaim
|
|
3 | -metadata:
|
|
4 | - name: synapse
|
|
5 | - namespace: matrixtest
|
|
6 | - labels:
|
|
7 | - app: synapse
|
|
8 | -spec:
|
|
9 | - accessModes:
|
|
10 | - - ReadWriteOnce
|
|
11 | - resources:
|
|
12 | - requests:
|
|
13 | - storage: 10Gi |
... | ... | @@ -11,7 +11,6 @@ resources: |
11 | 11 | - ../base/harbor
|
12 | 12 | - ../base/keycloak
|
13 | 13 | - ../base/matrix
|
14 | - - ../base/matrixtest
|
|
15 | 14 | - ../base/nextcloud
|
16 | 15 | - ../base/rallly
|
17 | 16 | - ../base/wordpress
|