Replace namespace with chart namespace
This commit is contained in:
parent
8e62b66b97
commit
71971b7e07
15 changed files with 53 additions and 58 deletions
|
@ -1,14 +1,9 @@
|
|||
---
|
||||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
name: ai
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: openwebui
|
||||
namespace: ai
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
|
@ -40,7 +35,7 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
name: openwebui
|
||||
namespace: ai
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
selector:
|
||||
app: openwebui
|
||||
|
@ -53,7 +48,7 @@ apiVersion: networking.k8s.io/v1
|
|||
kind: Ingress
|
||||
metadata:
|
||||
name: openwebui
|
||||
namespace: ai
|
||||
namespace: {{ .Release.Namespace }}
|
||||
annotations:
|
||||
kubernetes.io/ingress.class: "traefik"
|
||||
external-dns.alpha.kubernetes.io/hostname: nc.hxme.net
|
||||
|
|
|
@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
|
|||
kind: HelmRepository
|
||||
metadata:
|
||||
name: authentik
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
url: https://charts.goauthentik.io/
|
||||
interval: 1h
|
||||
|
@ -17,7 +17,7 @@ apiVersion: v1
|
|||
kind: Secret
|
||||
metadata:
|
||||
name: wildcard-hxme-net
|
||||
namespace: authentik
|
||||
namespace: {{ .Release.Namespace }}
|
||||
annotations:
|
||||
replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net
|
||||
---
|
||||
|
@ -25,7 +25,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: authentik
|
||||
namespace: authentik
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 30m
|
||||
chart:
|
||||
|
@ -35,7 +35,7 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: authentik
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
createNamespace: true
|
||||
upgrade:
|
||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: v1
|
|||
kind: ConfigMap
|
||||
metadata:
|
||||
name: bind-master-config
|
||||
namespace: dns
|
||||
namespace: {{ .Release.Namespace }}
|
||||
data:
|
||||
named.conf: |
|
||||
include "/etc/bind/externaldns-key.conf";
|
||||
|
@ -52,7 +52,7 @@ apiVersion: apps/v1
|
|||
kind: DaemonSet
|
||||
metadata:
|
||||
name: bind-master
|
||||
namespace: dns
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
|
@ -122,7 +122,7 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
name: bind-master
|
||||
namespace: dns
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
selector:
|
||||
app: bind-master
|
||||
|
|
|
@ -26,19 +26,19 @@ roleRef:
|
|||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: external-dns
|
||||
namespace: dns
|
||||
namespace: {{ .Release.Namespace }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: external-dns
|
||||
namespace: dns
|
||||
namespace: {{ .Release.Namespace }}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: external-dns
|
||||
namespace: dns
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
|
|
|
@ -22,7 +22,7 @@ apiVersion: v1
|
|||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: nextcloud-pvc
|
||||
namespace: nextcloud
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
|
@ -36,7 +36,7 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
name: nextcloud
|
||||
namespace: nextcloud
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
ports:
|
||||
- port: 80
|
||||
|
@ -47,7 +47,7 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
name: nextcloud
|
||||
namespace: nextcloud
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
securityContext:
|
||||
runAsUser: 1000
|
||||
|
@ -94,7 +94,7 @@ apiVersion: k8s.mariadb.com/v1alpha1
|
|||
kind: MariaDB
|
||||
metadata:
|
||||
name: nextcloud-db
|
||||
namespace: nextcloud
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
rootPasswordSecretKeyRef:
|
||||
name: nextcloud-secrets
|
||||
|
@ -112,7 +112,7 @@ apiVersion: v1
|
|||
kind: Secret
|
||||
metadata:
|
||||
name: wildcard-hxme-net
|
||||
namespace: nextcloud
|
||||
namespace: {{ .Release.Namespace }}
|
||||
annotations:
|
||||
replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net
|
||||
---
|
||||
|
@ -120,7 +120,7 @@ apiVersion: networking.k8s.io/v1
|
|||
kind: Ingress
|
||||
metadata:
|
||||
name: nextcloud
|
||||
namespace: nextcloud
|
||||
namespace: {{ .Release.Namespace }}
|
||||
annotations:
|
||||
external-dns.alpha.kubernetes.io/hostname: nc.hxme.net
|
||||
spec:
|
||||
|
|
|
@ -8,7 +8,7 @@ apiVersion: v1
|
|||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: syncthing-data
|
||||
namespace: syncthing
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
|
@ -33,7 +33,7 @@ apiVersion: v1
|
|||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: syncthing-share
|
||||
namespace: syncthing
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
|
@ -46,7 +46,7 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
name: syncthing
|
||||
namespace: syncthing
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
|
@ -86,7 +86,7 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
name: syncthing
|
||||
namespace: syncthing
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
selector:
|
||||
app: syncthing
|
||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: grafana
|
||||
namespace: monitoring
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 30m
|
||||
chart:
|
||||
|
@ -13,7 +13,7 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: grafana
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
createNamespace: true
|
||||
values:
|
||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: loki
|
||||
namespace: monitoring
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 30m
|
||||
chart:
|
||||
|
@ -13,7 +13,7 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: grafana
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
createNamespace: true
|
||||
values:
|
||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
|
|||
kind: HelmRepository
|
||||
metadata:
|
||||
name: prometheus-community
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
url: https://prometheus-community.github.io/helm-charts
|
||||
interval: 1h
|
||||
|
@ -12,7 +12,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: prometheus-operator
|
||||
namespace: monitoring
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 30m
|
||||
chart:
|
||||
|
@ -22,7 +22,7 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: prometheus-community
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
createNamespace: true
|
||||
upgrade:
|
||||
|
|
|
@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
|
|||
kind: HelmRepository
|
||||
metadata:
|
||||
name: grafana
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
url: https://grafana.github.io/helm-charts
|
||||
interval: 1h
|
||||
|
@ -17,6 +17,6 @@ apiVersion: v1
|
|||
kind: Secret
|
||||
metadata:
|
||||
name: wildcard-hxme-net
|
||||
namespace: monitoring
|
||||
namespace: {{ .Release.Namespace }}
|
||||
annotations:
|
||||
replicator.v1.mittwald.de/replicate-from: cert-manager/wildcard-hxme-net
|
||||
|
|
|
@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
|
|||
kind: HelmRepository
|
||||
metadata:
|
||||
name: mariadb-operator
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
url: https://helm.mariadb.com/mariadb-operator
|
||||
interval: 1h
|
||||
|
@ -17,7 +17,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: mariadb-operator-crds
|
||||
namespace: mariadb-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 30m
|
||||
chart:
|
||||
|
@ -27,7 +27,7 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: mariadb-operator
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
createNamespace: true
|
||||
upgrade:
|
||||
|
@ -38,7 +38,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: mariadb-operator
|
||||
namespace: mariadb-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 30m
|
||||
chart:
|
||||
|
@ -48,12 +48,12 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: mariadb-operator
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
createNamespace: true
|
||||
dependsOn:
|
||||
- name: mariadb-operator-crds
|
||||
namespace: mariadb-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
values:
|
||||
metrics:
|
||||
enabled: true
|
||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: v1
|
|||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: kubernetes-replicator
|
||||
namespace: kube-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRole
|
||||
|
@ -63,13 +63,13 @@ roleRef:
|
|||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: kubernetes-replicator
|
||||
namespace: kube-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
---
|
||||
apiVersion: source.toolkit.fluxcd.io/v1beta2
|
||||
kind: HelmRepository
|
||||
metadata:
|
||||
name: mittwald
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
url: https://helm.mittwald.de
|
||||
interval: 1h
|
||||
|
@ -78,7 +78,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: kubernetes-replicator
|
||||
namespace: kube-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 5m
|
||||
chart:
|
||||
|
@ -87,7 +87,7 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: mittwald
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
createNamespace: false
|
||||
upgrade:
|
||||
|
|
|
@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
|
|||
kind: HelmRepository
|
||||
metadata:
|
||||
name: rustdesk-charts
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
url: https://charts.rustdesk.com
|
||||
interval: 1h
|
||||
|
@ -17,7 +17,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: rustdesk-server
|
||||
namespace: rustdesk
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 30m
|
||||
chart:
|
||||
|
@ -27,7 +27,7 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: rustdesk-charts
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
createNamespace: true
|
||||
values:
|
||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
|
|||
kind: HelmRepository
|
||||
metadata:
|
||||
name: jetstack
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
url: https://charts.jetstack.io
|
||||
interval: 1h
|
||||
|
@ -12,7 +12,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: cert-manager
|
||||
namespace: cert-manager
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 30m
|
||||
chart:
|
||||
|
@ -22,7 +22,7 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: jetstack
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
crds: CreateReplace
|
||||
createNamespace: true
|
||||
|
@ -56,7 +56,7 @@ apiVersion: cert-manager.io/v1
|
|||
kind: Certificate
|
||||
metadata:
|
||||
name: wildcard-hxme-net
|
||||
namespace: cert-manager
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
secretName: wildcard-hxme-net
|
||||
secretTemplate:
|
||||
|
|
|
@ -8,7 +8,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
|
|||
kind: HelmRepository
|
||||
metadata:
|
||||
name: bjw-s-charts
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
url: https://bjw-s.github.io/helm-charts/
|
||||
interval: 1h
|
||||
|
@ -17,7 +17,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
|
|||
kind: HelmRelease
|
||||
metadata:
|
||||
name: vaultwarden
|
||||
namespace: bitwarden
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
interval: 30m
|
||||
chart:
|
||||
|
@ -27,7 +27,7 @@ spec:
|
|||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: bjw-s-charts
|
||||
namespace: flux-system
|
||||
namespace: {{ .Release.Namespace }}
|
||||
install:
|
||||
createNamespace: true
|
||||
values:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue