From d50b5f22e67fa2c9a2b5b915778e8d5831295bdb Mon Sep 17 00:00:00 2001 From: Raiko Oll Date: Mon, 16 Feb 2026 21:51:53 +0200 Subject: [PATCH] push --- .values.yaml.kate-swp | Bin 0 -> 32128 bytes Chart.yaml | 1 + memelord-laurivosandi | 1 + templates/app.yaml | 31 ++++++++++---------- templates/deployment.yaml | 60 +++++++++++++++++++------------------- templates/grafana.yaml | 57 +++++++++++++++--------------------- templates/http-probe.yaml | 2 +- values.yaml | 1 + 8 files changed, 73 insertions(+), 80 deletions(-) create mode 100644 .values.yaml.kate-swp create mode 160000 memelord-laurivosandi diff --git a/.values.yaml.kate-swp b/.values.yaml.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..dbca08ef096d2adc28af0f0054327a30a750d943 GIT binary patch literal 32128 zcmeI5*>@b(_3zCE8=Dz}Z9HJg@`R0Bk|!K11|wUtEo@6dk_~1OEvY3nZgtDuEf36N z5<*78kdOq(970AiJl#LzKHNXyzTLI%+wbkSKi}G?x=L;hki6WrIBWG*eQWQ1=CjXO zM@yD0S$Q&FFGPcv^3&0=VyO`AX>DJ!WXYW${lEAB?~||ppJo5^?avPXug6FK>*Ei1 z|L?&^jdP9tmUQd!e>5JijURjL&viVSJ2aZFM-N6XwRIJ0=j)Z}w(~P1g|^8;X{xPW zn3^tGu(h_a!gQ%}WvWoFw_eFlm7+t3qV3&%$F>s^9v#BRrS`*Jo6F^3fUkwI%zn7` z{B-ebp;{|e${kUyFj_6tCko|4HD9k(Tc?Wk`lWnntaYr=c5!#UG(DN$jV~y-v4DERS_WgY{~$JTWL=kb}Jvx#jl5t(Yp*^JDpXz5_OISHNCjKisA$D(9yP9ntg8 zN38>eQXyX}wD#JY=*1Uv)xub@h8ohFP`kl?xTUq}!l-=Y%~Du5^4{EvC>k#oN@F## zd8+_#5_8Ftdm?kWScGsoB88Hh&ev*}D%CN9L-rp0yxEmjq7+4?LV2P-*%7tu-P3{` zY$f&U2F~c7E0h)wK5e~Cyfx0`MN}I!wxW8MtFDbz z&lj#VD|V#TBEHteZ;q^TOqVR`wT?*50M5;btaFi@5UEvWs-uOt!oj!+iS;gFo*;8! zrckTLB5>r%1{b+Cj@Ib(Oh>f8y?u&2f~T^(+l9PtO%Uv+Dv3*Lxt zrJ}XuI5^(lNQ~}rfpl>9dvNd+T;xKtf;+I^gM+W&Ho0J^%3xLH7H51ZJA<<9%x3px z4m$%|O>c|KWve!CRkgP|d&_)w2JmjT*}iXI&pfiJ|1(_2}(%rnSu|nyD44 zbJlxekF?t6eXf?ZhP+kmcR5=PB4Z6hE5tXX)F5&$K8GEIt-@$^xw-5hd{v${7YvmL ztja@oirbX7gVU8-eZrdAg;HzC>5FQPNGrL!rDV-2wt`1XGqrl5N*ds(vF&k@Y(?R% za%8Ww7hO?MP(|72nvIg>jY@XEvu=r^V!2k&m$4GDC4qGd1$@8D>^7OH{6rz{lqM!e ztJJ8`Qe|eWY^L*KAvZnI*2syD-3Le>+Pm@QfO~U86xFOFH;-gJd3^)?uQ^}ls8)Q= zI=wpT?>1wf7$kl2J4Q*xIgYL~$mK=sG`C*s1+LFUj z);;7Rin7H8OWv~EY^#g_Tt&Il#bz1T7Apw}!dLq^;)1hnIq#LVM_s^bmJ%NaC{JLi zW_7vD?9ldkXz&$Uw+mVVLqT6CDYM}yfyZ1#eaCdZY9lAh(by)!Q{Qpig*L>In#x}u z9<7wiR(96&TP_46c#>_TomX*lZ&4cp8c*=FQ$3;Bhd{CZ5{R&k@Ka>?dP zP3J5~BdFSa&NZygjmABa>Kw0Cryh6yHcDvD8kI{APf*!L%ARoDP�h&Xdl_lum7L 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 literal 0 HcmV?d00001 diff --git a/Chart.yaml b/Chart.yaml index d0034e1..9c51dd4 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,2 +1,3 @@ name: memelord +apiVersion: v2 version: 1.0.0 diff --git a/memelord-laurivosandi b/memelord-laurivosandi new file mode 160000 index 0000000..0d36059 --- /dev/null +++ b/memelord-laurivosandi @@ -0,0 +1 @@ +Subproject commit 0d36059c39440325fe01b4501777a4e76d2d2e13 diff --git a/templates/app.yaml b/templates/app.yaml index 7f67360..211ed16 100644 --- a/templates/app.yaml +++ b/templates/app.yaml @@ -1,17 +1,16 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: memelord - namespace: memelord-raiko + name: {{ .Release.Name }} spec: replicas: 1 selector: matchLabels: - app: memelord + app: {{ .Release.Name }} template: metadata: labels: - app: memelord + app: {{ .Release.Name }} spec: containers: - name: memelord @@ -24,38 +23,38 @@ spec: env: - name: DOMAIN - value: "memelord-raiko.ee-lte-1.codemowers.io" + value: {{ .Values.hostname | quote }} - name: DB_ENGINE value: "postgres" - name: POSTGRES_USER valueFrom: secretKeyRef: - name: memelord-raiko-database + name: {{ .Release.Name }}-database key: username - name: POSTGRES_HOST - value: "memelord-raiko-database-rw" + value: {{ .Release.Name }}-database-rw - name: POSTGRES_PORT value: "5432" - name: POSTGRES_DB - value: "memelord-raiko" + value: {{ .Release.Name }} - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: - name: memelord-raiko-database + name: {{ .Release.Name }}-database key: password - name: REDIS_HOST - value: "memelord-raiko-redis" + value: {{ .Release.Name }}-redis - name: REDIS_PORT value: "6379" - name: REDIS_PASSWORD valueFrom: secretKeyRef: - name: memelord-raiko-redis + name: {{ .Release.Name }}-redis key: redis-password - name: STORAGE_BACKEND value: "s3" - name: AWS_STORAGE_BUCKET_NAME - value: "memelord-raiko" + value: {{ .Release.Name }} - name: AWS_S3_ENDPOINT_URL value: "https://minio.ee-lte-1.codemowers.io/" - name: AWS_S3_REGION_NAME @@ -63,12 +62,12 @@ spec: - name: AWS_ACCESS_KEY_ID valueFrom: secretKeyRef: - name: memelord-raiko-bucket + name: {{ .Release.Name }}-bucket key: accessKey - name: AWS_SECRET_ACCESS_KEY valueFrom: secretKeyRef: - name: memelord-raiko-bucket + name: {{ .Release.Name }}-bucket key: secretKey - name: OIDC_ENABLED value: "True" @@ -77,12 +76,12 @@ spec: - name: OIDC_RP_CLIENT_ID valueFrom: secretKeyRef: - name: oidc-client-memelord-raiko-owner-secrets + name: oidc-client-{{ .Release.Name }}-owner-secrets key: OIDC_CLIENT_ID - name: OIDC_RP_CLIENT_SECRET valueFrom: secretKeyRef: - name: oidc-client-memelord-raiko-owner-secrets + name: oidc-client-{{ .Release.Name }}-owner-secrets key: OIDC_CLIENT_SECRET - name: OIDC_OP_AUTHORIZATION_ENDPOINT value: "https://auth.ee-lte-1.codemowers.io/auth" diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 9a2245d..6c2d790 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: secretgenerator.mittwald.de/v1alpha1 kind: StringSecret metadata: - name: memelord-raiko-redis + name: {{ .Release.Name }}-redis spec: fields: - fieldName: redis-password @@ -12,11 +12,11 @@ spec: apiVersion: dragonflydb.io/v1alpha1 kind: Dragonfly metadata: - name: memelord-raiko-redis + name: {{ .Release.Name }}-redis spec: authentication: passwordFromSecret: - name: memelord-raiko-redis + name: {{ .Release.Name }}-redis key: redis-password replicas: 1 resources: @@ -30,12 +30,12 @@ spec: apiVersion: secretgenerator.mittwald.de/v1alpha1 kind: StringSecret metadata: - name: memelord-raiko-database + name: {{ .Release.Name }}-database labels: cnpg.io/reload: "true" spec: data: - username: memelord-raiko + username: {{ .Release.Name }} fields: - fieldName: password length: "32" @@ -44,7 +44,7 @@ spec: apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: memelord-raiko-database + name: {{ .Release.Name }}-database spec: instances: 1 imageName: ghcr.io/cloudnative-pg/postgresql:17 @@ -69,28 +69,28 @@ spec: effective_cache_size: "2GB" managed: roles: - - name: memelord-raiko + - name: {{ .Release.Name }} ensure: present login: true passwordSecret: - name: memelord-raiko-database + name: {{ .Release.Name }}-database --- apiVersion: postgresql.cnpg.io/v1 kind: Database metadata: - name: memelord-raiko + name: {{ .Release.Name }} spec: - name: memelord-raiko - owner: memelord-raiko + name: {{ .Release.Name }} + owner: {{ .Release.Name }} cluster: - name: memelord-raiko-database + name: {{ .Release.Name }}-database --- apiVersion: s3.onyxia.sh/v1alpha1 kind: Policy metadata: - name: memelord-raiko-policy + name: {{ .Release.Name }}-policy spec: - name: memelord-raiko-policy + name: {{ .Release.Name }}-policy s3InstanceRef: minio/default policyContent: >- { @@ -102,8 +102,8 @@ spec: "s3:*" ], "Resource": [ - "arn:aws:s3:::memelord-raiko", - "arn:aws:s3:::memelord-raiko/*" + "arn:aws:s3:::{{ .Release.Name }}", + "arn:aws:s3:::{{ .Release.Name }}/*" ] } ] @@ -112,19 +112,19 @@ spec: apiVersion: s3.onyxia.sh/v1alpha1 kind: S3User metadata: - name: memelord-raiko-bucket + name: {{ .Release.Name }}-bucket spec: - accessKey: memelord-raiko-bucket + accessKey: {{ .Release.Name }}-bucket policies: - - memelord-raiko-policy + - {{ .Release.Name }}-policy s3InstanceRef: minio/default --- apiVersion: s3.onyxia.sh/v1alpha1 kind: Bucket metadata: - name: memelord-raiko + name: {{ .Release.Name }} spec: - name: memelord-raiko + name: {{ .Release.Name }} s3InstanceRef: minio/default quota: default: 100000000 @@ -132,11 +132,11 @@ spec: apiVersion: v1 kind: Service metadata: - name: memelord + name: {{ .Release.Name }} spec: type: ClusterIP selector: - app: memelord + app: {{ .Release.Name }} ports: - name: http port: 80 @@ -145,11 +145,11 @@ spec: apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: memelord-raiko + name: {{ .Release.Name }} spec: - secretName: memelord-raiko-tls + secretName: {{ .Release.Name }}-tls dnsNames: - - memelord-raiko.ee-lte-1.codemowers.io + - {{ .Values.hostname }} issuerRef: name: letsencrypt kind: ClusterIssuer @@ -157,21 +157,21 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: memelord-raiko + name: {{ .Release.Name }} annotations: traefik.ingress.kubernetes.io/router.entrypoints: websecure spec: ingressClassName: traefik rules: - - host: memelord-raiko.ee-lte-1.codemowers.io + - host: {{ .Values.hostname }} http: paths: - pathType: Prefix path: "/" backend: service: - name: memelord + name: {{ .Release.Name }} port: number: 80 tls: - - secretName: memelord-raiko-tls + - secretName: {{ .Release.Name }}-tls diff --git a/templates/grafana.yaml b/templates/grafana.yaml index 43a6e4d..52d519e 100644 --- a/templates/grafana.yaml +++ b/templates/grafana.yaml @@ -2,8 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: grafana-datasources - namespace: memelord-raiko + name: {{ .Release.Name }}-grafana-datasources data: datasources.yaml: | apiVersion: 1 @@ -24,20 +23,19 @@ data: apiVersion: apps/v1 kind: StatefulSet metadata: - name: grafana - namespace: memelord-raiko + name: {{ .Release.Name }}-grafana labels: - app: grafana + app: {{ .Release.Name }}-grafana spec: - serviceName: grafana + serviceName: {{ .Release.Name }}-grafana replicas: 1 selector: matchLabels: - app: grafana + app: {{ .Release.Name }}-grafana template: metadata: labels: - app: grafana + app: {{ .Release.Name }}-grafana spec: containers: - name: grafana @@ -53,7 +51,7 @@ spec: value: /var/lib/grafana/grafana.db - name: GF_SERVER_ROOT_URL - value: https://grafana-raiko.ee-lte-1.codemowers.io + value: https://{{ .Values.grafanaHostname }} - name: GF_AUTH_GENERIC_OAUTH_ENABLED value: "true" @@ -64,12 +62,12 @@ spec: - name: GF_AUTH_GENERIC_OAUTH_CLIENT_ID valueFrom: secretKeyRef: - name: oidc-client-grafana-raiko-owner-secrets + name: oidc-client-grafana-{{ .Release.Name }}-owner-secrets key: OIDC_CLIENT_ID - name: GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET valueFrom: secretKeyRef: - name: oidc-client-grafana-raiko-owner-secrets + name: oidc-client-grafana-{{ .Release.Name }}-owner-secrets key: OIDC_CLIENT_SECRET - name: GF_AUTH_GENERIC_OAUTH_SCOPES value: "openid profile groups" @@ -79,8 +77,6 @@ spec: value: "http://passmower.passmower.svc.cluster.local/token" - name: GF_AUTH_GENERIC_OAUTH_API_URL value: "http://passmower.passmower.svc.cluster.local/me" - # - name: GF_AUTH_GENERIC_OAUTH_SIGNOUT_REDIRECT_URL - # value: "https://auth.ee-lte-1.codemowers.io//openid/session/end" - name: GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH value: "contains(groups[*], 'github.com:codemowers:admins') && 'Admin' || Viewer" @@ -94,11 +90,10 @@ spec: - name: datasources mountPath: /etc/grafana/provisioning/datasources - volumes: - name: datasources configMap: - name: grafana-datasources + name: {{ .Release.Name }}-grafana-datasources volumeClaimTemplates: - metadata: @@ -114,14 +109,13 @@ spec: apiVersion: v1 kind: Service metadata: - name: grafana - namespace: memelord-raiko + name: {{ .Release.Name }}-grafana labels: - app: grafana + app: {{ .Release.Name }}-grafana spec: type: ClusterIP selector: - app: grafana + app: {{ .Release.Name }}-grafana ports: - name: http port: 80 @@ -130,12 +124,11 @@ spec: apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: grafana-raiko - namespace: memelord-raiko + name: grafana-{{ .Release.Name }} spec: - secretName: grafana-raiko-tls + secretName: grafana-{{ .Release.Name }}-tls dnsNames: - - grafana-raiko.ee-lte-1.codemowers.io + - {{ .Values.grafanaHostname }} issuerRef: name: letsencrypt kind: ClusterIssuer @@ -143,35 +136,33 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: grafana-raiko - namespace: memelord-raiko + name: grafana-{{ .Release.Name }} annotations: traefik.ingress.kubernetes.io/router.entrypoints: websecure spec: rules: - - host: grafana-raiko.ee-lte-1.codemowers.io + - host: {{ .Values.grafanaHostname }} http: paths: - pathType: Prefix path: "/" backend: service: - name: grafana + name: {{ .Release.Name }}-grafana port: number: 80 tls: - - secretName: grafana-raiko-tls + - secretName: grafana-{{ .Release.Name }}-tls --- apiVersion: codemowers.cloud/v1beta1 kind: OIDCClient metadata: - name: grafana-raiko - namespace: memelord-raiko + name: grafana-{{ .Release.Name }} spec: - displayName: Grafana Raiko - uri: https://grafana-raiko.ee-lte-1.codemowers.io/ + displayName: Grafana {{ .Release.Name }} + uri: https://{{ .Values.grafanaHostname }}/ redirectUris: - - https://grafana-raiko.ee-lte-1.codemowers.io/login/generic_oauth + - https://{{ .Values.grafanaHostname }}/login/generic_oauth grantTypes: - authorization_code - refresh_token diff --git a/templates/http-probe.yaml b/templates/http-probe.yaml index 7bd67ff..1ef9fe2 100644 --- a/templates/http-probe.yaml +++ b/templates/http-probe.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: Probe metadata: - name: reddit-probe + name: {{ .Release.Name }}-reddit-probe spec: module: http_2xx prober: diff --git a/values.yaml b/values.yaml index 9ef296e..c1b1c7c 100644 --- a/values.yaml +++ b/values.yaml @@ -1 +1,2 @@ hostname: memelord-raiko.ee-lte-1.codemowers.io +grafanaHostname: grafana-raiko.ee-lte-1.codemowers.io