Skip to content

Commit

Permalink
WikiJS re-write
Browse files Browse the repository at this point in the history
  • Loading branch information
danmanners committed Oct 18, 2023
1 parent d3ca7d3 commit add1fa3
Show file tree
Hide file tree
Showing 10 changed files with 169 additions and 172 deletions.
31 changes: 31 additions & 0 deletions manifests/workloads/wikijs/application.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: sealed-secrets
namespace: argocd
spec:
destination:
namespace: kube-system
server: https://kubernetes.default.svc
project: default
sources:
# Git Repo Deployment
- path: manifests/bootstrapping-onprem/sealed-secrets
repoURL: https://github.com/danmanners/homelab-kube-cluster.git
targetRevision: main
# Helm Repo Ref
- repoURL: https://github.com/danmanners/homelab-kube-cluster.git
targetRevision: main
ref: values
# Helm Chart Deployment
- chart: sealed-secrets
repoURL: https://bitnami-labs.github.io/sealed-secrets
targetRevision: 2.13.1
helm:
valueFiles:
- $values/manifests/bootstrapping-onprem/sealed-secrets/values.yaml
syncPolicy:
automated:
prune: true
syncOptions:
- CreateNamespace=true
20 changes: 0 additions & 20 deletions manifests/workloads/wikijs/argocd-application.yaml

This file was deleted.

17 changes: 17 additions & 0 deletions manifests/workloads/wikijs/db-secrets.sealed.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
creationTimestamp: null
name: db-secrets
namespace: wikijs
spec:
encryptedData:
POSTGRES_PASSWORD: AgBeiXxejEuu8mlUC5iEVrfuUrftD8kccXDavxwRcmcRUP4a1wUhw7Jlc7mqfl4kS6SGRonq1dG+r9J/ng8gMZNQV9QD6FjdI296nRRs+c8rGGhsDzo1YSPgxStUGVGOb7s+vWTEMuv2wBvPMef8bBZGyBKplRXPCU/gGW9RtsEynl6nbT5pcoOeX8rWhTVNRG7wJQNL542fOPiHnQcCCtJ0YBXhMQXhk5wvVGFdv9Dd9FRANUSu7Sj7C/xwTQyliv61FpDSK98JmOOQgfaHdIFqLY68AndLD6GFU6CVxRlVnCgAft6JkDNyM9+cUHjJVWaY7U2kCY/C92ntceugG+OxBg2g0MAzBaJtsPGuijouwjHYaHv2l6uIBPmtkm1m5azEoJRoiGqkHMM4o51RzDgmaKOEaSP3O2gV6McUyJiMCuy9xWb+GLCAcCmOZKzvTkSMHPjNsYy11/LAuxOwTGotivwytfXO+PVa7ELAA8IodgAjpoz1NAdwmXqDfw+oaGebqrIOAQpK1g/n1j4MXYoA2IAOEJZrLtcPuxOkRCvH8rB+C9OKuwD42HJDZ3/FejIHRmPTLo7PyrPjVinB4CUrpjrZugcCgffxuHDunKBb68TxNjsJIg3rTxiXRn7YR8H/s/G1qKVjD7eBrshc2vgX7eoaF6qqZFrkFZCXuTkI84P93vE5+I79AvsO0fTdubq1O8mY0jbApqpJYqJcrV+Bit3ouY6zZCp3qLnJrw==
POSTGRES_USERNAME: AgBYyclHtoFXGFWZICa6xkFDG9+bP6ZOowkgdS0FkGXOrOPMiXLG/PkiX0hNQETos2iC7y8ZxIMWJdwyIOemtmb/P/dc/eCWiAFFL982/NaelQaj9wX0AvyMkCfF3b3Hhcj8nNF/y/glxpSuiH365CEc6jyeJumhE1uYprT1RAa2sdbwFrHH90S9bt+a75RIQusdWDQNO/c4UPIMl8MXQ57Km9VpTpkbbTysbXG8YRgYzYODk/iLBe4iTV0nJSaTKOIOxvRm/TVl5kCuAvYpmPstmL+dOUg3FCZyZZaAXiacoZPK5k4qp3CMDrbZSFbeiIsdXW+ibAqjaucEPVxxJSmI2qaN9uD2iYTx92iIaUMHA5pl20Fu+0W53SF9TI8WpSVJ/nVsLOxWszddaOiY/0LaN89x9MJj5s7rjMTOAfDXaXJEpKwlRHue9504WB7K0wK/beefY5HwhqcWxwjMIn4a3i0BcDa56CysF4eI3N31nqXGMcdQGrK1BPEMY5Hz11iqpkd4IzgjBYlDuoE8ksBh3EP0Gbh8bli5ngQ+v752wAeBhFEcv6posNUYhTFFrnDq5tRvd7tjw83QBl1+MkkhPOH5dZdKiUTfPNm8Am/uNYB7N79hThb+vh0iuR8KSoUXoXmvyLXKBEnZ5RYRO13BKdxMZBLu4gc46D5BE/VMusrQdCc4MbTX6x259jnsC03dmKm+V8Q=
template:
metadata:
creationTimestamp: null
name: db-secrets
namespace: wikijs
type: Opaque
24 changes: 0 additions & 24 deletions manifests/workloads/wikijs/db-secrets.yaml

This file was deleted.

60 changes: 0 additions & 60 deletions manifests/workloads/wikijs/ingress.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions manifests/workloads/wikijs/ksops-generator.yaml

This file was deleted.

19 changes: 8 additions & 11 deletions manifests/workloads/wikijs/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: wikijs

helmCharts:
- name: kah-common-chart
releaseName: wikijs
namespace: wikijs
repo: https://k8s-at-home.com/charts
version: 1.2.2
valuesFile: values.yaml
- name: app-template
releaseName: wikijs
namespace: wikijs
repo: https://bjw-s.github.io/helm-charts
version: 2.0.3
valuesFile: values.yaml

resources:
- ingress.yaml

generators:
- ksops-generator.yaml
- namespace.yaml
- db-secrets.sealed.yaml
6 changes: 6 additions & 0 deletions manifests/workloads/wikijs/namespace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: v1
kind: Namespace
metadata:
name: kube-system
labels:
name: kube-system
128 changes: 79 additions & 49 deletions manifests/workloads/wikijs/values.yaml
Original file line number Diff line number Diff line change
@@ -1,66 +1,96 @@
---
global:
nameOverride: wikijs

image:
repository: ghcr.io/linuxserver/wikijs
tag: "2.5.300"
pullPolicy: IfNotPresent

initContainers:
init-db:
image: ghcr.io/onedr0p/postgres-initdb:14.8
env:
- name: POSTGRES_HOST
value: "primary-rw.postgres.svc.cluster.local"
- name: POSTGRES_DB
value: wikijs
- name: POSTGRES_SUPER_PASS
valueFrom:
secretKeyRef:
name: postgres-superuser
key: password
- name: POSTGRES_USER
valueFrom:
secretKeyRef:
name: db-secrets
key: POSTGRES_USERNAME
- name: POSTGRES_PASS
valueFrom:
secretKeyRef:
name: db-secrets
key: POSTGRES_PASSWORD

env:
TZ: America/New_York
DB_TYPE: "postgres"
DB_NAME: "wikijs"
DB_HOST: "primary-rw.postgres.svc.cluster.local"
DB_PORT: "5432"
DB_USER:
valueFrom:
secretKeyRef:
name: db-secrets
key: POSTGRES_USERNAME
DB_PASS:
valueFrom:
secretKeyRef:
name: db-secrets
key: POSTGRES_PASSWORD
controllers:
main:
replicas: 1
type: deployment
strategy: Recreate
containers:
main:
nameOverride: wikijs
image:
repository: core.harbor.homelab.danmanners.com/ghcr.io/linuxserver/wikijs
tag: "2.5.300"
pullPolicy: IfNotPresent
env:
TZ: America/New_York
DB_TYPE: "postgres"
DB_NAME: "wikijs"
DB_HOST: "primary-rw.postgres.svc.cluster.local"
DB_PORT: "5432"
DB_USER:
secretKeyRef:
name: db-secrets
key: POSTGRES_USERNAME
DB_PASS:
secretKeyRef:
name: db-secrets
key: POSTGRES_PASSWORD
ports:
- containerPort: 3000
initContainers:
init-db:
image: core.harbor.homelab.danmanners.com/ghcr.io/onedr0p/postgres-initdb:14.8
env:
- name: POSTGRES_HOST
value: "primary-rw.postgres.svc.cluster.local"
- name: POSTGRES_DB
value: wikijs
- name: POSTGRES_SUPER_PASS
secretKeyRef:
name: postgres-superuser
key: password
- name: POSTGRES_USER
secretKeyRef:
name: db-secrets
key: POSTGRES_USERNAME
- name: POSTGRES_PASS
secretKeyRef:
name: db-secrets
key: POSTGRES_PASSWORD
- name: POSTGRES_PORT
value: "5432"
probes:
readiness:
enabled: false
startup:
enabled: false
liveness:
enabled: false

service:
main:
enabled: true
ports:
http:
port: 3000

ingress:
main:
enabled: false
enabled: true
className: nginx
annotations:
cert-manager.io/cluster-issuer: acme-prod
nginx.ingress.kubernetes.io/proxy-body-size: 64m
tls:
- secretName: wikijs-cert
hosts:
- wikijs.homelab.danmanners.com
hosts:
- host: wikijs.homelab.danmanners.com
paths:
- path: /
service:
name: wikijs
port: 8080

persistence:
data:
enabled: true
storageClass: ssd
accessMode: ReadWriteMany
storageClass: ceph-rbd
accessMode: ReadWriteOnce
size: 4Gi
globalMounts:
- path: /data
readOnly: false
28 changes: 28 additions & 0 deletions sealed-secret.onprem.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
-----BEGIN CERTIFICATE-----
MIIEzDCCArSgAwIBAgIQTj2YKEUulCh6wfSZEZcijzANBgkqhkiG9w0BAQsFADAA
MB4XDTIzMTAxODAyMDkxNFoXDTMzMTAxNTAyMDkxNFowADCCAiIwDQYJKoZIhvcN
AQEBBQADggIPADCCAgoCggIBAMkeGFXMtd2ObbiVdL0BZoLdPw9WbSxnKd8Ve27l
HGAs3hRK+A4PzogEPKdLlYO5JmeR7USoBOvI3NcKyje9yJ567vngmZzv8QzU+tRt
um1dVxQA3p4gV1n1gSWSuxM/LqG/nfartlGX7I9KbIgh4AoNaB40vha3KbQdc9hm
yjWyGVDcFYE8OvTcb6YQjygCFjnbMPHUxEuWnGHBtLgVlZZ2DguAMeiq6lBgTNC8
9VMPZEDrSqpcVXCwwXcg/bGbdpg+DPpFsXv/cYwJCkbLCyvhB0g2BPOKxxx0XK51
j0bEU/NmsyG+LoM9mJorIYoJBiWhufjzmpLAKKWpPAELCudanyYK09nZQF7RBu8s
OOExoORRYdJvyHcJ2y0bD1OaGjNU/nm8VWZJMVQqus7keu9ed78owiYZG0sqyLyY
j1DEnglaLkdg47xCPtOeJHvymeidNnYWcOzJkzcZSNf8V8ooTb/4e5SG59qWllWY
0eObTxGekxY6UnVQaRkTatOs/FpX2XmftUp2CBSCGdIOBkUSHTSSgHBKxACgEhbC
gBGZZmrynYqCAyT8LDLQKeHwkJgLfaCKEros1JYEUsflVAaqEglkmgCxWkacfqjZ
w/30qpXoKS6Y06ie33G4KjsyP5EUxm6lLzXBbEMoM4K2p/0nI9ycTSyml0cZCatZ
Y0VVAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIAATAPBgNVHRMBAf8EBTADAQH/MB0G
A1UdDgQWBBSSpbsa2TiuNT7wZYl2OvMzXZVR+TANBgkqhkiG9w0BAQsFAAOCAgEA
NpX15echTfZ8ouCBKd2P4yV3D5FZMsZcpAgG3YR8+N2ZtbMMahbawnivD4BCcqPR
kjZE+yL75l6sg+enlyNw712zPqTzwG70J5u8nQmptdOD1PNg1g2wmk+yE3sG4XLi
qMHNzRapl66LVlqdXb+Xe/tt3HgxnHqimdrZs2rNDnA6MPnyqx1B+9K7ZWJDWhnT
u2vbcfVMYk0P/gkXaUQ5xLfoLpxhc6i5WAbH5oEv2Va1ItlW8B1ATBbuG2g47JIQ
yAPrIKl3jM+ocIHn8SIOswom9WRYmXn1IcRYbRw4Kisq89olPvc/SCaCe7vxfhyb
RuWMrgHIr3bKshNh/LoY6q4Q/2pnggX09ljDfiQNU52SeE+AcTW/qCH0C5tSyyxa
N5Oj9KxxnQGU061ezseFu5eVUP2qeiBaQ+GsCBIukMXUtPSjVAS9VfMibtBuiRGQ
9UlfBFS2vU4HhyKF8NKOfIu54ldVUmNbyWfo4bAYTMKfeiL8OUNRjYXezagtkJHo
agkgWmIfnx1gGvZ3+SqK7FaOj+o8uqx+03Ff7OfL9l1YJmFof7HGuRd7G3hmxEps
9QavidNDvjNtpDBcIpMkjAIyoZT7jWea+P1hezohyKCnTVjLkxLLm2ed50nA/bxh
RcMx+boc/++lOkshJbPnEaXTTQO7i4/I2hfavIPuhW8=
-----END CERTIFICATE-----

0 comments on commit add1fa3

Please sign in to comment.