diff --git a/k8s/apps/videohosting/templates/configs-openvpn.yaml b/k8s/apps/videohosting/templates/configs-openvpn.yaml new file mode 100644 index 0000000..ab99d41 --- /dev/null +++ b/k8s/apps/videohosting/templates/configs-openvpn.yaml @@ -0,0 +1,20 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: openvpn-creds +type: Opaque +data: + _placeholder: "" + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: openvpn-route-script +data: + route-override.sh: |- + #!/bin/sh + VPN_GATEWAY=$(route -n | awk 'NR==3' | awk '{ print $2 }') + ip route del 0.0.0.0/1 via $VPN_GATEWAY + echo "Route Updated" \ No newline at end of file diff --git a/k8s/argoapps/apps-values/authelia.yaml b/k8s/argoapps/apps-values/authelia.yaml index 426056a..f0aa7fc 100644 --- a/k8s/argoapps/apps-values/authelia.yaml +++ b/k8s/argoapps/apps-values/authelia.yaml @@ -11,22 +11,22 @@ authelia: startup_check_address: {{ .Values.global.email }} disable_require_tls: true - # identity_providers: - # oidc: - # clients: - # - id: nextcloud - # description: NextCloud - # secret: '$pbkdf2-sha512$310000$flG99HwC8BHSZSFdao0WfA$iBEXWiKkPN7mrd57NrYXTd6MA1/gExEaJfyF3yFPXd3YWMAdHWXtgw7JXfu44w0qCFkzq7fYuJdD9GX2SdH/sA' - # public: false - # authorization_policy: two_factor - # redirect_uris: - # - https://nextcloud.{{ .Values.global.domain }}/apps/oidc_login/oidc - # scopes: - # - openid - # - profile - # - email - # - groups - # userinfo_signing_algorithm: none + identity_providers: + oidc: + clients: + - id: nextcloud + description: NextCloud + secret: '$pbkdf2-sha512$310000$flG99HwC8BHSZSFdao0WfA$iBEXWiKkPN7mrd57NrYXTd6MA1/gExEaJfyF3yFPXd3YWMAdHWXtgw7JXfu44w0qCFkzq7fYuJdD9GX2SdH/sA' + public: false + authorization_policy: two_factor + redirect_uris: + - https://nextcloud.{{ .Values.global.domain }}/apps/oidc_login/oidc + scopes: + - openid + - profile + - email + - groups + userinfo_signing_algorithm: none persistence: storageClass: "{{ .Values.global.nfs.storageClass }}" diff --git a/k8s/argoapps/chart-values/prometheus.yaml b/k8s/argoapps/chart-values/prometheus.yaml index 4f48c57..9d4659e 100644 --- a/k8s/argoapps/chart-values/prometheus.yaml +++ b/k8s/argoapps/chart-values/prometheus.yaml @@ -10,9 +10,9 @@ alertmanager: enabled: false server: {{ if .Values.global.tls.enabled }} - baseURL: "https://{{$prometheusHost}}.{{ .Values.global.domain }}" + baseURL: "https://monitoring.core.{{ .Values.global.domain }}" {{ else }} - baseURL: "http://{{$prometheusHost}}.{{ .Values.global.domain }}" + baseURL: "http://monitoring.core.{{ .Values.global.domain }}" {{ end }} persistentVolume: enabled: true diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index f6248d7..4e7f4d3 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -175,7 +175,11 @@ infrastructureCharts: repoURL: "https://charts.bitnami.com/bitnami" targetRevision: "12.1.8" valuesFile: database.yaml - + prometheus: + chart: prometheus + repoURL: "https://prometheus-community.github.io/helm-charts" + targetRevision: "20.2.0" + valuesFile: prometheus.yaml secrets: database: namespace: chart-database