MarcusVRP pushed to branch main at Root / Kubernetes / FluxCD Commits: 4a374606 by marcusvrp at 2025-07-31T22:45:24-03:00 feat(matrix): promote matrixtest to matrix - - - - - 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: ===================================== apps/base/matrix/deploy.yaml deleted ===================================== @@ -1,135 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: synapse - namespace: matrix - labels: - app: synapse -spec: - selector: - matchLabels: - app: synapse - tier: backend - strategy: - type: Recreate - template: - metadata: - labels: - app: synapse - tier: backend - spec: - containers: - - image: harbor.c3sl.ufpr.br/root/synapse - name: synapse - env: - - name: SYNAPSE_SERVER_NAME - value: matrix.c3sl.ufpr.br - - name: SYNAPSE_REPORT_STATS - value: 'no' - - containerPort: 8008 - name: synapse - # ======== POSTGRES ======== # - - name: POSTGRES_HOST - valueFrom: - secretKeyRef: - name: matrix - key: synapsePostgresHost - - name: POSTGRES_USER - valueFrom: - secretKeyRef: - name: matrix - key: synapsePostgresUser - - name: POSTGRES_DB - valueFrom: - secretKeyRef: - name: matrix - key: synapsePostgresDatabase - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: matrix - key: synapsePostgresPassword - # ======== OPENID ======== # - - name: OIDC_IDP_NAME - value: DInf/C3SL - - name: OIDC_ISSUER - value: https://keycloak.c3sl.ufpr.br/realms/DInfC3SL - - name: OIDC_CLIENT_ID - valueFrom: - secretKeyRef: - name: matrix - key: synapseOidcClientId - - name: OIDC_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: matrix - key: synapseOidcClientSecret - # ======== S3 ======== # - - name: S3_BUCKET_NAME - valueFrom: - secretKeyRef: - name: matrix - key: synapseS3BucketName - - name: S3_REGION_NAME - valueFrom: - secretKeyRef: - name: matrix - key: synapseS3RegionName - - name: S3_ENDPOINT_URL - valueFrom: - secretKeyRef: - name: matrix - key: synapseS3EndpointURL - - name: S3_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: matrix - key: synapseS3AccessKeyId - - name: S3_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: matrix - key: synapseS3SecretAccessKey - volumeMounts: - - name: synapse-data - mountPath: /data - volumes: - - name: synapse-data - persistentVolumeClaim: - claimName: synapse ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: element - namespace: matrix - labels: - app: element - tier: frontend -spec: - selector: - matchLabels: - app: element - tier: frontend - strategy: - type: Recreate - template: - metadata: - labels: - app: element - tier: frontend - spec: - containers: - - image: vectorim/element-web - name: element - ports: - - containerPort: 80 - name: element - volumeMounts: - - name: element-config - mountPath: /app/config.json - subPath: elementConfigJson - volumes: - - name: element-config - secret: - secretName: matrix ===================================== apps/base/matrix/es.yaml ===================================== @@ -11,51 +11,47 @@ spec: target: name: matrix data: - - secretKey: elementConfigJson - remoteRef: - key: matrix - property: elementConfigJson - - secretKey: synapsePostgresHost - remoteRef: - key: matrix - property: synapsePostgresHost - - secretKey: synapsePostgresUser - remoteRef: - key: matrix - property: synapsePostgresUser - - secretKey: synapsePostgresDatabase - remoteRef: - key: matrix - property: synapsePostgresDatabase - - secretKey: synapsePostgresPassword - remoteRef: - key: matrix - property: synapsePostgresPassword - - secretKey: synapseOidcClientId - remoteRef: - key: matrix - property: synapseOidcClientId - - secretKey: synapseOidcClientSecret - remoteRef: - key: matrix - property: synapseOidcClientSecret - - secretKey: synapseS3BucketName - remoteRef: - key: matrix - property: synapseS3BucketName - - secretKey: synapseS3RegionName - remoteRef: - key: matrix - property: synapseS3RegionName - - secretKey: synapseS3EndpointURL - remoteRef: - key: matrix - property: synapseS3EndpointURL - - secretKey: synapseS3AccessKeyId - remoteRef: - key: matrix - property: synapseS3AccessKeyId - - secretKey: synapseS3SecretAccessKey - remoteRef: - key: matrix - property: synapseS3SecretAccessKey + # - secretKey: oidcClientId + # remoteRef: + # key: matrix + # property: oidcClientId + # - secretKey: oidcClientSecret + # remoteRef: + # key: matrix + # property: oidcClientSecret + # - secretKey: postgresHost + # remoteRef: + # key: matrix + # property: postgresHost + # - secretKey: postgresPassword + # remoteRef: + # key: matrix + # property: postgresPassword + # - secretKey: postgresUser + # remoteRef: + # key: matrix + # property: postgresUser + # - secretKey: s3AccessKey + # remoteRef: + # key: matrix + # property: s3AccessKey + # - secretKey: s3Bucket + # remoteRef: + # key: matrix + # property: s3Bucket + # - secretKey: s3Endpoint + # remoteRef: + # key: matrix + # property: s3Endpoint + # - secretKey: s3SecretAccessKey + # remoteRef: + # key: matrix + # property: s3SecretAccessKey + - secretKey: masOidcConfig + remoteRef: + key: matrix + property: masOidcConfig + - secretKey: synapseOidcConfig + remoteRef: + key: matrix + property: synapseOidcConfig ===================================== apps/base/matrixtest/helmrelease.yaml → apps/base/matrix/helmrelease.yaml ===================================== @@ -1,8 +1,8 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: matrixtest - namespace: matrixtest + name: matrix + namespace: matrix spec: interval: 1m chart: @@ -10,9 +10,9 @@ spec: chart: matrix-stack sourceRef: kind: HelmRepository - name: matrixtest + name: matrix values: - serverName: matrixtest.k8sstage.c3sl.ufpr.br + serverName: matrix.c3sl.ufpr.br ingress: className: cilium annotations: @@ -21,7 +21,7 @@ spec: matrixAuthenticationService: enabled: true ingress: - host: matrixauth.k8sstage.c3sl.ufpr.br + host: matrixauth.c3sl.ufpr.br additional: button-text: config: | @@ -33,35 +33,35 @@ spec: matrixRTC: enabled: true ingress: - host: matrixrtc.k8sstage.c3sl.ufpr.br + host: matrixrtc.c3sl.ufpr.br postgres: enabled: true synapse: ingress: - host: synapsetest.k8sstage.c3sl.ufpr.br + host: synapse.c3sl.ufpr.br additional: custom-config: config: | report_stats: false trusted_key_servers: - - server_name: "matrixtest.c3sl.ufpr.br" + - server_name: "matrix.c3sl.ufpr.br" - server_name: "matrix.org" - public_baseurl: "https://matrixtest.c3sl.ufpr.br" + public_baseurl: "https://matrix.c3sl.ufpr.br" serve_server_wellknown: true enable_registration: false - default_identity_server: https://matrixtest.c3sl.ufpr.br + default_identity_server: https://matrix.c3sl.ufpr.br trusted_third_party_id_servers: - - matrixtest.c3sl.ufpr.br + - matrix.c3sl.ufpr.br email: smtp_host: smtp.c3sl.ufpr.br smtp_port: 25 - notif_from: "matrixtest.c3sl.ufpr.br" + notif_from: "matrix.c3sl.ufpr.br" enable_notifs: true notif_for_new_users: true validation_token_lifetime: 15m elementWeb: ingress: - host: elementweb.k8sstage.c3sl.ufpr.br + host: element.c3sl.ufpr.br additional: config.json: | { ===================================== apps/base/matrixtest/helmrepo.yaml → apps/base/matrix/helmrepo.yaml ===================================== @@ -1,8 +1,8 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: - name: matrixtest - namespace: matrixtest + name: matrix + namespace: matrix spec: type: "oci" interval: 1m0s ===================================== apps/base/matrix/ing.yaml deleted ===================================== @@ -1,79 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: matrix - namespace: matrix - annotations: - cert-manager.io/cluster-issuer: letsencrypt-wildcard -spec: - ingressClassName: cilium - rules: - - host: matrix.c3sl.ufpr.br - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: synapse - port: - number: 8008 - - host: synapse.c3sl.ufpr.br - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: synapse - port: - number: 8008 - - host: synapse.k8sstage.c3sl.ufpr.br - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: synapse - port: - number: 8008 - - host: matrix.k8sstage.c3sl.ufpr.br - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: synapse - port: - number: 8008 - - host: element.k8sstage.c3sl.ufpr.br - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: element - port: - number: 80 - - host: element.c3sl.ufpr.br - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: element - port: - number: 80 - tls: - - hosts: - - matrix.c3sl.ufpr.br - - synapse.c3sl.ufpr.br - - synapse.k8sstage.c3sl.ufpr.br - - matrix.k8sstage.c3sl.ufpr.br - - element.c3sl.ufpr.br - - element.k8sstage.c3sl.ufpr.br - secretName: matrix-tls ===================================== apps/base/matrix/kustomization.yaml ===================================== @@ -1,9 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - es.yaml - - deploy.yaml - - ing.yaml - ns.yaml - - pvc.yaml - - svc.yaml + - es.yaml + - helmrepo.yaml + - helmrelease.yaml ===================================== apps/base/matrix/pvc.yaml deleted ===================================== @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: synapse - namespace: matrix - labels: - app: synapse -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi ===================================== apps/base/matrix/svc.yaml deleted ===================================== @@ -1,29 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: synapse - namespace: matrix - labels: - app: synapse -spec: - ports: - - port: 8008 - selector: - app: synapse - tier: backend - type: ClusterIP ---- -apiVersion: v1 -kind: Service -metadata: - name: element - namespace: matrix - labels: - app: element -spec: - ports: - - port: 80 - selector: - app: element - tier: frontend - type: ClusterIP ===================================== apps/base/matrixtest/es.yaml deleted ===================================== @@ -1,57 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: matrix - namespace: matrixtest -spec: - refreshInterval: "15s" - secretStoreRef: - name: openbao - kind: ClusterSecretStore - target: - name: matrix - data: - # - secretKey: oidcClientId - # remoteRef: - # key: matrix - # property: oidcClientId - # - secretKey: oidcClientSecret - # remoteRef: - # key: matrix - # property: oidcClientSecret - # - secretKey: postgresHost - # remoteRef: - # key: matrix - # property: postgresHost - # - secretKey: postgresPassword - # remoteRef: - # key: matrix - # property: postgresPassword - # - secretKey: postgresUser - # remoteRef: - # key: matrix - # property: postgresUser - # - secretKey: s3AccessKey - # remoteRef: - # key: matrix - # property: s3AccessKey - # - secretKey: s3Bucket - # remoteRef: - # key: matrix - # property: s3Bucket - # - secretKey: s3Endpoint - # remoteRef: - # key: matrix - # property: s3Endpoint - # - secretKey: s3SecretAccessKey - # remoteRef: - # key: matrix - # property: s3SecretAccessKey - - secretKey: masOidcConfig - remoteRef: - key: matrix - property: masOidcConfig - - secretKey: synapseOidcConfig - remoteRef: - key: matrix - property: synapseOidcConfig ===================================== apps/base/matrixtest/kustomization.yaml deleted ===================================== @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ns.yaml - - es.yaml - - helmrepo.yaml - - helmrelease.yaml ===================================== apps/base/matrixtest/ns.yaml deleted ===================================== @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: matrixtest ===================================== apps/base/matrixtest/pvc.yaml deleted ===================================== @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: synapse - namespace: matrixtest - labels: - app: synapse -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi ===================================== apps/stage/kustomization.yaml ===================================== @@ -11,7 +11,6 @@ resources: - ../base/harbor - ../base/keycloak - ../base/matrix - - ../base/matrixtest - ../base/nextcloud - ../base/rallly - ../base/wordpress View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/4a3746068034a1f04cd80f5... -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/4a3746068034a1f04cd80f5... You're receiving this email because of your account on gitlab.c3sl.ufpr.br.