infrastructure/k8s-cluster
1
0
Fork 2
Code Issues 29 Pull requests 10 Projects Releases Packages Wiki Activity

feat: namespace and draupnir deployment for moderation #482

Closed
earl-warren wants to merge 1 commit from refs/pull/522/head4a921e66a0448b66079da579c32abb7499966b15 into main491aa51db3bedecff077efc94f4597a2dd5e088d
pull from: refs/pull/522/head4a921e66a0448b66079da579c32abb7499966b15
merge into: infrastructure:main491aa51db3bedecff077efc94f4597a2dd5e088d
Conversation 5 Commits 1 Files changed 10 +301
earl-warren commented 2025-05-29 20:26:37 +00:00
First-time contributor
Copy link

Refs infrastructure/k8s-cluster#415

  • create PVC directory ../k3s-host/setup.sh setup_k8s_pvc moderation-draupnir 1000
  • create namespace 
    debian@hetzner06:~$ kubectl apply --server-side -f moderation/namespace.yaml 
namespace/moderation serverside-applied
debian@hetzner06:~$ cat moderation/namespace.yaml
apiVersion: v1
kind: Namespace
metadata:
  name: moderation
  • create secrets debian@hetzner06:~/moderation$ kubectl apply --server-side -f moderation-draupnir.yaml (using the token provided by @Beowulf )

k8s-cluster/flux/apps$ kustomize build --load-restrictor LoadRestrictionsNone moderation 

apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
  name: draupnir
  namespace: moderation
spec:
  chart:
    spec:
      chart: draupnir
      interval: 5m
      sourceRef:
        kind: HelmRepository
        name: draupnir
        namespace: flux-system
      version: 0.1.0
  interval: 30m
  values:
    config:
      admin:
        enableMakeRoomAdminCommand: false
      autojoinOnlyIfManager: true
      automaticallyRedactForReasons:
      - spam
      - advertising
      backgroundDelayMS: 500
      commands:
        additionalPrefixes:
        - draupnir
        allowNoPrefix: true
        ban:
          defaultReasons:
          - spam
          - advertising
      dataPath: /data/storage
      disableServerACL: false
      displayReports: true
      experimentalRustCrypto: false
      health:
        healthz:
          address: 0.0.0.0
          enabled: true
          endpoint: /healthz
          healthyStatus: 200
          port: 8080
          unhealthyStatus: 418
      homeserverUrl: https://matrix-client.matrix.org
      logLevel: INFO
      managementRoom: '!QAufPzkBelflNHeFko:matrix.org'
      noop: false
      pantalaimon:
        use: false
      pollReports: false
      protectAllJoinedRooms: false
      protections:
        wordlist:
          minutesBeforeTrusting: 20
          words:
          - https://t.me/
      rawHomeserverUrl: https://matrix-client.matrix.org
      recordIgnoredInvites: false
      roomStateBackingStore:
        enabled: true
      verifyPermissionsOnStartup: true
      web:
        abuseReporting:
          enabled: false
        enabled: false
        synapseHTTPAntispam:
          enabled: false
    volumeMounts:
    - mountPath: /data/storage
      name: moderation-draupnir
    volumes:
    - name: moderation-draupnir
      persistentVolumeClaim:
        claimName: moderation-draupnir-pvc
  valuesFrom:
  - kind: Secret
    name: draupnir-token
---
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
  name: moderation-draupnir-pvc
  namespace: moderation
spec:
  chart:
    spec:
      chart: ./flux/apps/charts/pvc
      interval: 12h
      sourceRef:
        kind: GitRepository
        name: flux-system
        namespace: flux-system
  driftDetection:
    mode: enabled
  interval: 30m
  values:
    capacity: 10Gi
    name: draupnir
Refs infrastructure/k8s-cluster#415 --- - [x] create PVC directory `../k3s-host/setup.sh setup_k8s_pvc moderation-draupnir 1000` - [x] create namespace ```shell debian@hetzner06:~$ kubectl apply --server-side -f moderation/namespace.yaml namespace/moderation serverside-applied debian@hetzner06:~$ cat moderation/namespace.yaml apiVersion: v1 kind: Namespace metadata: name: moderation ``` - [x] create secrets `debian@hetzner06:~/moderation$ kubectl apply --server-side -f moderation-draupnir.yaml` (using the token provided by @Beowulf ) --- `k8s-cluster/flux/apps$ kustomize build --load-restrictor LoadRestrictionsNone moderation ` ```yaml apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: draupnir namespace: moderation spec: chart: spec: chart: draupnir interval: 5m sourceRef: kind: HelmRepository name: draupnir namespace: flux-system version: 0.1.0 interval: 30m values: config: admin: enableMakeRoomAdminCommand: false autojoinOnlyIfManager: true automaticallyRedactForReasons: - spam - advertising backgroundDelayMS: 500 commands: additionalPrefixes: - draupnir allowNoPrefix: true ban: defaultReasons: - spam - advertising dataPath: /data/storage disableServerACL: false displayReports: true experimentalRustCrypto: false health: healthz: address: 0.0.0.0 enabled: true endpoint: /healthz healthyStatus: 200 port: 8080 unhealthyStatus: 418 homeserverUrl: https://matrix-client.matrix.org logLevel: INFO managementRoom: '!QAufPzkBelflNHeFko:matrix.org' noop: false pantalaimon: use: false pollReports: false protectAllJoinedRooms: false protections: wordlist: minutesBeforeTrusting: 20 words: - https://t.me/ rawHomeserverUrl: https://matrix-client.matrix.org recordIgnoredInvites: false roomStateBackingStore: enabled: true verifyPermissionsOnStartup: true web: abuseReporting: enabled: false enabled: false synapseHTTPAntispam: enabled: false volumeMounts: - mountPath: /data/storage name: moderation-draupnir volumes: - name: moderation-draupnir persistentVolumeClaim: claimName: moderation-draupnir-pvc valuesFrom: - kind: Secret name: draupnir-token --- apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: moderation-draupnir-pvc namespace: moderation spec: chart: spec: chart: ./flux/apps/charts/pvc interval: 12h sourceRef: kind: GitRepository name: flux-system namespace: flux-system driftDetection: mode: enabled interval: 30m values: capacity: 10Gi name: draupnir ```
earl-warren added 1 commit 2025-05-29 20:26:37 +00:00
feat: namespace and draupnir deployment for moderation
Some checks failed
build / lint (push) Has been cancelled
build / lint (pull_request) Has been cancelled
/ test (pull_request) Has been cancelled
4a921e66a0 
Refs infrastructure/k8s-cluster#415
viceice commented 2025-05-29 20:26:38 +00:00
First-time contributor
Copy link

add the depends on pvc to the draupnir chart

add the depends on pvc to the draupnir chart
viceice requested changes 2025-05-29 20:26:38 +00:00
Dismissed
viceice left a comment
First-time contributor
Copy link

added by F3

added by F3
flux/apps/moderation/draupnir.yaml
@ -0,0 +180,4 @@
# before saying "Now monitoring rooms" and flagging itself healthy.
#
# Health is flagged through HTTP status codes, defined below.
healthz:
viceice commented 2025-05-29 20:26:38 +00:00
First-time contributor
Copy link

should be enabled

should be enabled
earl-warren commented 2025-05-29 20:26:39 +00:00
Author
First-time contributor
Copy link

8dc68ee70a..ac9f92fd84

https://invisible.forgejo.org/infrastructure/k8s-cluster/compare/8dc68ee70af2d33771ec0839bad7e67b3a7af588..ac9f92fd84164b58bfdea1a4eb7f40dc05277066
flux/apps/moderation/kustomization.yaml
@ -0,0 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
viceice commented 2025-05-29 20:26:38 +00:00
First-time contributor
Copy link

needs a flux customization

a4cadd5258/flux/clusters/monitoring.yaml (L2)

needs a flux customization https://invisible.forgejo.org/infrastructure/k8s-cluster/src/commit/a4cadd52584a8f867db4292a732cf437997ebd7d/flux/clusters/monitoring.yaml#L2
earl-warren commented 2025-05-29 20:26:39 +00:00
Author
First-time contributor
Copy link

01f57b32df..8dc68ee70a

https://invisible.forgejo.org/infrastructure/k8s-cluster/compare/01f57b32df27df1ff81d2ed3866e1c28fa71679c..8dc68ee70af2d33771ec0839bad7e67b3a7af588
flux/infrastructure/namespaces/moderation.yaml
@ -0,0 +1,4 @@
apiVersion: v1
viceice commented 2025-05-29 20:26:38 +00:00
First-time contributor
Copy link

needs to be added to the kustomization yaml

a4cadd5258/flux/infrastructure/namespaces/kustomization.yaml (L8)

needs to be added to the kustomization yaml https://invisible.forgejo.org/infrastructure/k8s-cluster/src/commit/a4cadd52584a8f867db4292a732cf437997ebd7d/flux/infrastructure/namespaces/kustomization.yaml#L8
earl-warren commented 2025-05-29 20:26:39 +00:00
Author
First-time contributor
Copy link

4fe7c05d5a..01f57b32df

https://invisible.forgejo.org/infrastructure/k8s-cluster/compare/4fe7c05d5a916a5c843ad40ca2c93da63237f02d..01f57b32df27df1ff81d2ed3866e1c28fa71679c
root closed this pull request 2025-05-29 20:26:39 +00:00
viceice requested changes 2025-05-29 20:26:39 +00:00
Dismissed
viceice left a comment
First-time contributor
Copy link

maybe it's better to publish the chart to forgejo-code as oci, like we do with forgejo chart until official releases exist.

maybe it's better to publish the chart to forgejo-code as oci, like we do with forgejo chart until official releases exist.
flux/apps/moderation/draupnir.yaml
@ -0,0 +9,4 @@
spec:
chart: draupnir
version: '0.1.0'
sourceRef:
viceice commented 2025-05-29 20:26:39 +00:00
First-time contributor
Copy link

you probably also need a helm chart resource to link helm release to git repository. see other comment.

https://fluxcd.io/flux/components/source/helmcharts/#source-reference

you probably also need a helm chart resource to link helm release to git repository. see other comment. https://fluxcd.io/flux/components/source/helmcharts/#source-reference
flux/infrastructure/repos/draupnir-charts.yaml
viceice commented 2025-05-29 20:26:39 +00:00
First-time contributor
Copy link

this doesn't work. helm repo doesn't support git branches. you need a gitrepository

this doesn't work. helm repo doesn't support git branches. you need a gitrepository - https://fluxcd.io/flux/components/source/helmrepositories/ - https://fluxcd.io/flux/components/source/gitrepositories/
earl-warren commented 2025-05-29 20:26:39 +00:00
Author
First-time contributor
Copy link

Something like that 7f07ca62de ?

Something like that https://invisible.forgejo.org/infrastructure/k8s-cluster/commit/7f07ca62de9fbf2b8a236d366af77df877368218 ?
earl-warren commented 2025-05-29 20:26:39 +00:00
Author
First-time contributor
Copy link

7f07ca62de..a6037772b6

relies on https://code.forgejo.org/forgejo-contrib/draupnir-helm-charts

https://invisible.forgejo.org/infrastructure/k8s-cluster/compare/7f07ca62de9fbf2b8a236d366af77df877368218..a6037772b659ff625abe0de348d782a585792f90 relies on https://code.forgejo.org/forgejo-contrib/draupnir-helm-charts
viceice approved these changes 2025-05-29 20:26:39 +00:00
Beowulf approved these changes 2025-05-29 20:26:40 +00:00
Beowulf left a comment
First-time contributor
Copy link

Config looks fine 👍

Config looks fine 👍
Some checks failed
build / lint (push) Has been cancelled
build / lint (pull_request) Has been cancelled
/ test (pull_request) Has been cancelled

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
viceice
Beowulf
Labels
Clear labels   
bug

Something is not working

  
cleanup

   
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
forgefriends

https://code.forgejo.org/infrastructure/k8s-cluster/src/branch/main/.forgejo/workflows/sync.yml

  
help wanted

Need some help

  
invalid

Something is wrong

  
label workflow

a workflow is associated with this issue and will trigger when labels are updated

  
need more info

   
question

More information is needed

  
refactor

No functional change, reorganization

  
static-site

https://code.forgejo.org/infrastructure/k8s-cluster/src/branch/main/.forgejo/workflows/sync.yml

  
sync

https://code.forgejo.org/infrastructure/k8s-cluster/src/branch/main/.forgejo/workflows/build.yml

  
wontfix

This won't be fixed

No labels
bug
cleanup
duplicate
enhancement
forgefriends
help wanted
invalid
label workflow
need more info
question
refactor
static-site
sync
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: infrastructure/k8s-cluster#482
No description provided.
Delete branch "refs/pull/522/head4a921e66a0448b66079da579c32abb7499966b15"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?