From 327ae13752188ea9d1faa2603b524ca1648c5d7b Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Mon, 16 Dec 2024 14:55:35 +0100 Subject: [PATCH] Huge refactoring --- .pre-commit-config.yaml | 7 +- .../chart => apply-log}/.helmignore | 0 charts/apply-log/Chart.yaml | 6 + charts/apply-log/templates/_helpers.tpl | 62 +++++++ charts/apply-log/templates/configmap.yaml | 20 +++ charts/apply-log/values.yaml | 7 + charts/namespaces/.helmignore | 23 +++ charts/namespaces/{chart => }/Chart.yaml | 0 charts/namespaces/kustomize/flux-system.yml | 6 - .../namespaces/kustomize/giantswarm-flux.yml | 6 - charts/namespaces/kustomize/giantswarm.yml | 6 - .../namespaces/kustomize/kustomization.yaml | 5 - charts/namespaces/kustomize/monitoring.yml | 6 - .../namespaces/kustomize/org-giantswarm.yml | 6 - .../{chart => }/templates/_helpers.tpl | 0 .../{chart => }/templates/namespaces.yaml | 0 charts/namespaces/{chart => }/values.yaml | 0 common/environments.yaml | 2 +- common/repositories.yaml | 24 +++ common/templates.yaml | 62 ++++--- helmfile.yaml | 163 +++++++++++++++++- installations/system/helmfile.yaml | 1 + scripts/post_render_apply_log.sh | 11 ++ values/xray-1/secrets.promtail.yaml | 27 --- values/xray-1/secrets.server-xray-public.yaml | 37 ---- values/xray-1/values.namespaces.yaml | 3 - values/xray-1/values.promtail.yaml | 7 - values/xray-1/values.roles.yaml | 1 - values/xray-1/values.server-xray-public.yaml | 26 --- values/xray-2/secrets.promtail.yaml | 27 --- values/xray-2/secrets.server-xray-public.yaml | 37 ---- values/xray-2/values.namespaces.yaml | 3 - values/xray-2/values.promtail.yaml | 7 - values/xray-2/values.roles.yaml | 1 - values/xray-2/values.server-xray-public.yaml | 26 --- 35 files changed, 352 insertions(+), 273 deletions(-) rename charts/{namespaces/chart => apply-log}/.helmignore (100%) create mode 100644 charts/apply-log/Chart.yaml create mode 100644 charts/apply-log/templates/_helpers.tpl create mode 100644 charts/apply-log/templates/configmap.yaml create mode 100644 charts/apply-log/values.yaml create mode 100644 charts/namespaces/.helmignore rename charts/namespaces/{chart => }/Chart.yaml (100%) delete mode 100644 charts/namespaces/kustomize/flux-system.yml delete mode 100644 charts/namespaces/kustomize/giantswarm-flux.yml delete mode 100644 charts/namespaces/kustomize/giantswarm.yml delete mode 100644 charts/namespaces/kustomize/kustomization.yaml delete mode 100644 charts/namespaces/kustomize/monitoring.yml delete mode 100644 charts/namespaces/kustomize/org-giantswarm.yml rename charts/namespaces/{chart => }/templates/_helpers.tpl (100%) rename charts/namespaces/{chart => }/templates/namespaces.yaml (100%) rename charts/namespaces/{chart => }/values.yaml (100%) create mode 100644 common/repositories.yaml create mode 100755 scripts/post_render_apply_log.sh delete mode 100644 values/xray-1/secrets.promtail.yaml delete mode 100644 values/xray-1/secrets.server-xray-public.yaml delete mode 100644 values/xray-1/values.namespaces.yaml delete mode 100644 values/xray-1/values.promtail.yaml delete mode 100644 values/xray-1/values.roles.yaml delete mode 100644 values/xray-1/values.server-xray-public.yaml delete mode 100644 values/xray-2/secrets.promtail.yaml delete mode 100644 values/xray-2/secrets.server-xray-public.yaml delete mode 100644 values/xray-2/values.namespaces.yaml delete mode 100644 values/xray-2/values.promtail.yaml delete mode 100644 values/xray-2/values.roles.yaml delete mode 100644 values/xray-2/values.server-xray-public.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 767fc80..d1c5b37 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,9 +8,10 @@ repos: hooks: - id: yamlfmt exclude: | - (?x)^( - .*secrets.*yaml - )$ + (?x)( + ^.*secrets.*yaml| + ^charts/ + ) - repo: https://github.com/codespell-project/codespell rev: v2.2.4 hooks: diff --git a/charts/namespaces/chart/.helmignore b/charts/apply-log/.helmignore similarity index 100% rename from charts/namespaces/chart/.helmignore rename to charts/apply-log/.helmignore diff --git a/charts/apply-log/Chart.yaml b/charts/apply-log/Chart.yaml new file mode 100644 index 0000000..e0d6256 --- /dev/null +++ b/charts/apply-log/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: apply-log +description: A Helm chart for Kubernetes +type: application +version: 0.1.0 +appVersion: "1.16.0" diff --git a/charts/apply-log/templates/_helpers.tpl b/charts/apply-log/templates/_helpers.tpl new file mode 100644 index 0000000..aecd692 --- /dev/null +++ b/charts/apply-log/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "apply-log.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "apply-log.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "apply-log.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "apply-log.labels" -}} +helm.sh/chart: {{ include "apply-log.chart" . }} +{{ include "apply-log.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "apply-log.selectorLabels" -}} +app.kubernetes.io/name: {{ include "apply-log.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "apply-log.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "apply-log.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/apply-log/templates/configmap.yaml b/charts/apply-log/templates/configmap.yaml new file mode 100644 index 0000000..a869788 --- /dev/null +++ b/charts/apply-log/templates/configmap.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Release.Name }}-apply-log + namespace: {{ .Release.Namespace }} + labels: + k8s.badhouseplants.net/configmap-kind: helmfile-apply-log + {{- include "apply-log.labels" . | nindent 4 }} +data: + author: {{ .Values.author }} + {{- if .Values.ci }} + ci: {{ .Values.ci | quote }} + {{- else }} + {{- with .Values.cdDisabled }} + cdDisabled: {{ . | quote }} + {{- end }} + branch: {{ .Values.branch }} + sha: {{ .Values.sha | quote | replace " " "" }} + status: {{ .Values.status }} + {{- end }} diff --git a/charts/apply-log/values.yaml b/charts/apply-log/values.yaml new file mode 100644 index 0000000..6cdb623 --- /dev/null +++ b/charts/apply-log/values.yaml @@ -0,0 +1,7 @@ +name: test +ci: false +branch: main +author: test +sha: dummy +status: clean +cdDisabled: false diff --git a/charts/namespaces/.helmignore b/charts/namespaces/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/namespaces/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/namespaces/chart/Chart.yaml b/charts/namespaces/Chart.yaml similarity index 100% rename from charts/namespaces/chart/Chart.yaml rename to charts/namespaces/Chart.yaml diff --git a/charts/namespaces/kustomize/flux-system.yml b/charts/namespaces/kustomize/flux-system.yml deleted file mode 100644 index f44f3af..0000000 --- a/charts/namespaces/kustomize/flux-system.yml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: flux-system - labels: - name: flux-system diff --git a/charts/namespaces/kustomize/giantswarm-flux.yml b/charts/namespaces/kustomize/giantswarm-flux.yml deleted file mode 100644 index bd0e121..0000000 --- a/charts/namespaces/kustomize/giantswarm-flux.yml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: giantswarm-flux - labels: - name: giantswarm-flux diff --git a/charts/namespaces/kustomize/giantswarm.yml b/charts/namespaces/kustomize/giantswarm.yml deleted file mode 100644 index 31e7916..0000000 --- a/charts/namespaces/kustomize/giantswarm.yml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: giantswarm - labels: - name: giantswarm diff --git a/charts/namespaces/kustomize/kustomization.yaml b/charts/namespaces/kustomize/kustomization.yaml deleted file mode 100644 index 8159198..0000000 --- a/charts/namespaces/kustomize/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -resources: - - ./giantswarm-flux.yml - - ./giantswarm.yml - - ./monitoring.yml - - ./org-giantswarm.yml diff --git a/charts/namespaces/kustomize/monitoring.yml b/charts/namespaces/kustomize/monitoring.yml deleted file mode 100644 index 90d12ef..0000000 --- a/charts/namespaces/kustomize/monitoring.yml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: monitoring - labels: - name: monitoring diff --git a/charts/namespaces/kustomize/org-giantswarm.yml b/charts/namespaces/kustomize/org-giantswarm.yml deleted file mode 100644 index f27e8c4..0000000 --- a/charts/namespaces/kustomize/org-giantswarm.yml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: org-giantswarm - labels: - name: org-giantswarm diff --git a/charts/namespaces/chart/templates/_helpers.tpl b/charts/namespaces/templates/_helpers.tpl similarity index 100% rename from charts/namespaces/chart/templates/_helpers.tpl rename to charts/namespaces/templates/_helpers.tpl diff --git a/charts/namespaces/chart/templates/namespaces.yaml b/charts/namespaces/templates/namespaces.yaml similarity index 100% rename from charts/namespaces/chart/templates/namespaces.yaml rename to charts/namespaces/templates/namespaces.yaml diff --git a/charts/namespaces/chart/values.yaml b/charts/namespaces/values.yaml similarity index 100% rename from charts/namespaces/chart/values.yaml rename to charts/namespaces/values.yaml diff --git a/common/environments.yaml b/common/environments.yaml index c611191..7d653be 100644 --- a/common/environments.yaml +++ b/common/environments.yaml @@ -11,7 +11,7 @@ environments: - backups: enabled: false - localpath: - enabled: true + enabled: false - openebs: enabled: true - postgres17: diff --git a/common/repositories.yaml b/common/repositories.yaml new file mode 100644 index 0000000..d990f03 --- /dev/null +++ b/common/repositories.yaml @@ -0,0 +1,24 @@ +repositories: + - name: bedag + url: https://bedag.github.io/helm-charts/ + - name: metrics-server + url: https://kubernetes-sigs.github.io/metrics-server/ + - name: jetstack + url: https://charts.jetstack.io + - name: metallb + url: https://metallb.github.io/metallb + - name: traefik + url: https://traefik.github.io/charts + - name: coredns + url: https://coredns.github.io/helm + - name: cilium + url: https://helm.cilium.io/ + - name: vmware-tanzu + url: https://vmware-tanzu.github.io/helm-charts/ + - name: openebs + url: https://openebs.github.io/openebs + - name: local-path-provisioner + url: git+https://github.com/rancher/local-path-provisioner@deploy/chart?ref=master + - name: istio + url: https://istio-release.storage.googleapis.com/charts + diff --git a/common/templates.yaml b/common/templates.yaml index 9cada48..7a99b63 100644 --- a/common/templates.yaml +++ b/common/templates.yaml @@ -1,7 +1,4 @@ templates: - # --------------------------- - # -- Hooks - # --------------------------- crd-management-hook: hooks: - events: ["preapply"] @@ -25,18 +22,42 @@ templates: args: - -c - "helm show crds {{ `{{ .Release.Chart }}` }} --version {{ `{{ .Release.Version }}` }} | kubectl delete -f - || true" + apply-log: + disableOpenAPIValidation: true + disableValidation: true + dependencies: + - chart: ./charts/apply-log + version: '0.1.0' + alias: apply-log + set: + - name: apply-log.ci + value: '{{ env "CI" }}' + - name: apply-log.author + value: '{{ env "USER" }}' + - name: apply-log.branch + value: '{{ exec "git" (list "rev-parse" "--abbrev-ref" "HEAD") }}' + - name: apply-log.sha + value: '{{exec "git" (list "rev-parse" "--short" "HEAD") }}' + - name: apply-log.status + value: '{{ exec "sh" (list "-c" "test -z $(git status --porcelain) && echo clean || echo dirty") }}' + disable-cd: + labels: + k8s.onpier.de/cd-disabled: 'true' + set: + - name: apply-log.cdDisabled + value: "true" # ---------------------------- # -- Configs # ---------------------------- default-common-values: values: - - '{{ requiredEnv "PWD" }}/values/common/values.{{ `{{ .Release.Name }}` }}.yaml' + - ./values/common/values.{{ `{{ .Release.Name }}` }}.yaml default-env-values: values: - - '{{ requiredEnv "PWD" }}/values/{{ .Environment.Name }}/values.{{ `{{ .Release.Name }}` }}.yaml' + - ./values/{{ .Environment.Name }}/values.{{ `{{ .Release.Name }}` }}.yaml default-env-secrets: secrets: - - '{{ requiredEnv "PWD" }}/values/{{ .Environment.Name }}/secrets.{{ `{{ .Release.Name }}` }}.yaml' + - ./values/{{ .Environment.Name }}/secrets.{{ `{{ .Release.Name }}` }}.yaml # ---------------------------- # -- Extensions # ---------------------------- @@ -46,56 +67,56 @@ templates: version: 2.0.0 alias: istio-gateway values: - - '{{ requiredEnv "PWD" }}/values/common/values.istio-gateway.yaml' + - ./values/common/values.istio-gateway.yaml ext-tcp-routes: dependencies: - chart: bedag/raw version: 2.0.0 alias: traefik values: - - '{{ requiredEnv "PWD" }}/values/common/values.tcp-route.yaml' + - ./values/common/values.tcp-route.yaml ext-udp-routes: dependencies: - chart: bedag/raw version: 2.0.0 alias: traefik-udp values: - - '{{ requiredEnv "PWD" }}/values/common/values.udp-route.yaml' + - ./values/common/values.udp-route.yaml ext-traefik-middleware: dependencies: - chart: bedag/raw version: 2.0.0 alias: middleware values: - - '{{ requiredEnv "PWD" }}/values/common/values.middleware.yaml' + - ./values/common/values.middleware.yaml ext-istio-resource: dependencies: - chart: bedag/raw version: 2.0.0 alias: istio values: - - '{{ requiredEnv "PWD" }}/values/common/values.istio.yaml' + - ./values/common/values.istio.yaml ext-certificate: dependencies: - chart: bedag/raw version: 2.0.0 alias: certificate values: - - '{{ requiredEnv "PWD" }}/values/common/values.certificate.yaml' + - ./values/common/values.certificate.yaml ext-metallb: dependencies: - chart: bedag/raw version: 2.0.0 alias: metallb values: - - '{{ requiredEnv "PWD" }}/common/extensions/metallb.yaml' + - ./common/extensions/metallb.yaml service-monitor: dependencies: - chart: bedag/raw version: 2.0.0 alias: service-monitor values: - - '{{ requiredEnv "PWD" }}/values/common/values.service-monitor.yaml' + - ./values/common/values.service-monitor.yaml namespace: dependencies: - chart: bedag/raw @@ -110,25 +131,18 @@ templates: version: 2.0.0 alias: ext-database values: - - '{{ requiredEnv "PWD" }}/values/common/values.database.yaml' + - ./values/common/values.database.yaml ext-secret: dependencies: - chart: bedag/raw version: 2.0.0 alias: ext-secret values: - - '{{ requiredEnv "PWD" }}/values/common/values.secret.yaml' + - ./values/common/values.secret.yaml ext-cilium: dependencies: - chart: bedag/raw version: 2.0.0 alias: ext-cilium values: - - '{{ requiredEnv "PWD" }}/values/common/values.ext-cilium.yaml' - ext-self-signed-cert: - dependencies: - - chart: bedag/raw - version: 2.0.0 - alias: ext-self-signed-cert - values: - - '{{ requiredEnv "PWD" }}/common/extensions/self-signed-cert.yaml' + - ./values/common/values.ext-cilium.yaml diff --git a/helmfile.yaml b/helmfile.yaml index a0b58bb..2b21814 100644 --- a/helmfile.yaml +++ b/helmfile.yaml @@ -1,11 +1,158 @@ bases: - ./common/environments.yaml - ./common/templates.yaml -helmfiles: - - ./installations/system/ - - ./installations/databases/ - - ./installations/platform/ - - ./installations/pipelines/ - - ./installations/monitoring/ - - ./installations/applications/helmfile-{{ .Environment.Name }}.yaml - - ./installations/games/ + - ./common/repositories.yaml +helmDefaults: + postRenderer: ./scripts/post_render_apply_log.sh +releases: + # ------------------------------------------------------------------- + # -- Bootstrap the cluster resources + # ------------------------------------------------------------------- + # -- Prepare all the required namespaces + - name: namespaces + postRendererArgs: + - "{{` {{ . }} `}}" + chart: ./charts/namespaces + namespace: kube-public + createNamespace: false + inherit: + - template: default-env-values + + # ------------------------------------------------------------------- + # -- Prepare all the required roles + - name: roles + chart: ./charts/roles + namespace: kube-public + createNamespace: false + needs: + - kube-public/namespaces + inherit: + - template: default-env-values + - template: apply-log + # ------------------------------------------------------------------- + # -- Deploy the core cluster workload + # ------------------------------------------------------------------- + + - name: coredns + chart: coredns/coredns + version: 1.37.0 + namespace: kube-system + inherit: + - template: default-common-values + - template: apply-log + + - name: cilium + chart: cilium/cilium + version: 1.16.4 + condition: base.enabled + namespace: kube-system + needs: + - kube-system/coredns + inherit: + - template: default-env-values + - template: apply-log + + - name: cert-manager + chart: jetstack/cert-manager + version: v1.16.2 + namespace: kube-system + condition: base.enabled + missingFileHandler: Warn + needs: + - kube-system/cilium + inherit: + - template: default-common-values + - template: default-env-values + - template: apply-log + + - name: issuer + chart: ./charts/issuer + namespace: kube-public + missingFileHandler: Warn + condition: base.enabled + needs: + - kube-system/cert-manager + inherit: + - template: default-common-values + - template: default-env-values + - template: apply-log + + - name: metrics-server + chart: metrics-server/metrics-server + version: 3.12.2 + namespace: kube-system + needs: + - kube-system/cilium + inherit: + - template: default-common-values + - template: apply-log + + - name: metallb + chart: metallb/metallb + namespace: kube-system + condition: base.enabled + version: 0.14.8 + needs: + - kube-system/cilium + inherit: + - template: default-common-values + - template: apply-log + + - name: metallb-resources + chart: bedag/raw + version: 2.0.0 + condition: base.enabled + namespace: kube-system + needs: + - kube-system/metallb + inherit: + - template: ext-metallb + - template: default-env-values + - template: apply-log + + - name: traefik + chart: traefik/traefik + version: 33.1.0 + condition: base.enabled + namespace: kube-system + needs: + - kube-system/cilium + inherit: + - template: default-common-values + - template: default-env-values + - template: apply-log + + - name: velero + chart: vmware-tanzu/velero + namespace: velero + version: 8.1.0 + condition: velero.enabled + needs: + - kube-system/cilium + inherit: + - template: default-env-values + - template: default-env-secrets + - template: crd-management-hook + - template: apply-log + + - name: openebs + chart: openebs/openebs + condition: openebs.enabled + namespace: kube-system + version: 4.1.1 + needs: + - kube-system/cilium + inherit: + - template: default-env-values + - template: apply-log + + # -- Not versions since it's idnstalled from git + - name: local-path-provisioner + chart: local-path-provisioner/local-path-provisioner + condition: localpath.enabled + namespace: kube-system + needs: + - kube-system/cilium + inherit: + - template: default-env-values + - template: apply-log diff --git a/installations/system/helmfile.yaml b/installations/system/helmfile.yaml index 2160ebf..2627ab2 100644 --- a/installations/system/helmfile.yaml +++ b/installations/system/helmfile.yaml @@ -33,6 +33,7 @@ releases: createNamespace: false inherit: - template: default-env-values + - template: apply-log - name: roles chart: '{{ requiredEnv "PWD" }}/charts/roles' diff --git a/scripts/post_render_apply_log.sh b/scripts/post_render_apply_log.sh new file mode 100755 index 0000000..46d589d --- /dev/null +++ b/scripts/post_render_apply_log.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +WORKDIR=$(mktemp -d) +cat <&0 > "${WORKDIR}/result.yaml" + +echo "---" >> "${WORKDIR}/result.yaml" + +kubectl create configmap --dry-run=client "${1}-apply-log" -o yaml --from-literal author="${USER}" >> "${WORKDIR}/result.yaml" + +cat "${WORKDIR}/result.yaml" + diff --git a/values/xray-1/secrets.promtail.yaml b/values/xray-1/secrets.promtail.yaml deleted file mode 100644 index e3b2680..0000000 --- a/values/xray-1/secrets.promtail.yaml +++ /dev/null @@ -1,27 +0,0 @@ -config: - clients: - - url: ENC[AES256_GCM,data:CFq8x1jLDO8aLitEOlCOXeG1yp8RqKHdeqf8x7o9YESOmTAKFTuLpcBUDeESNTv9,iv:68uLarfOiS4oTcvEQu4uHMQUzRhXhqAZb5c4ik4U2E4=,tag:GhkkzriBYhWmTxt0KNwMkg==,type:str] - tenant_id: ENC[AES256_GCM,data:Iad0xh30fhwNiDh8SRU=,iv:A9o5brTa/2YbdYCIg5D4RHY2LXkMauIZBfygGsyV8gM=,tag:vNbcRImDSRCkM34B03MiMQ==,type:str] - basic_auth: - username: ENC[AES256_GCM,data:kUgLwA==,iv:5rAxU463ynXXZQfmGykocKmWm+VKahatT2KokSux16E=,tag:vYe9g0mePeYAapJlHAOWVw==,type:str] - password: ENC[AES256_GCM,data:2Zb4d8Aj5M27V7YNvcdFIkHHAl5dvNIlB46sP2sJ,iv:wW31BhjGvN2ii60p+/hSs2IqaIhLbDgl70KFfGiTbXM=,tag:50DB7GxuuAl+8GJ7K2ePvA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBdjR0eFRDS2dCVTNENUFr - V0k4T2Q2cmxua05QeDlzdnB2WWJLQ2hQbUdZCndjT0cxcytPUW0zOWtxVy9sazlr - Z3RKSkFVeGx2UkdtWmhLQXhNUnpKeUEKLS0tIGV3L1pRNXlZMG92K1N6aGlvSVBz - ZVV1d3R6KzJtT0drOVNHSThDdjAxekkK1RXCHM6QhNXto5D6yFTlvANN3E4iYfOC - Bf8s76p0ynI3tqfH6IgA9NFRPxYPzMGC/1zsQ95n5N6fMXh/KouRqg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-11-17T16:09:55Z" - mac: ENC[AES256_GCM,data:EM9kmYq/6en0XwMtmDcx5yO6VflugTbqDgPvvIBl7m6EvFi9EkMx/Aa9jkVYS+VFvS+pJ9pVe8+F/TL5+o/K0O9rkgZ8+ciAYXoRDBb1o9qUMoy2+ZjbjI7FMXDp8c8UED0MK+SZYNZ2C+44C9kohX5cPwOQCHd+0HxJKOTzH8U=,iv:The91sevo/IqJIXBt8BAta5RYDtv1oFaGQRyqzrm+tM=,tag:fKduoewHPG/N1qGr76r/8A==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.1 diff --git a/values/xray-1/secrets.server-xray-public.yaml b/values/xray-1/secrets.server-xray-public.yaml deleted file mode 100644 index 51cfe1c..0000000 --- a/values/xray-1/secrets.server-xray-public.yaml +++ /dev/null @@ -1,37 +0,0 @@ -files: - config: - enabled: ENC[AES256_GCM,data:KhdaSQ==,iv:/RR/lub7n1fYtAntHcy4Ul0R9bxrfDJs1KlED+8tH/Y=,tag:VhQ6pjrRai9HD0nH1dqO9g==,type:bool] - sensitive: ENC[AES256_GCM,data:4WIq3z8=,iv:JMNb5dUGVWBUO4ymsp4MULD3kPMAmUzedSxB8IHCXtA=,tag:Xj8ItxuhgY5se8jAyFne5A==,type:bool] - remove: [] - entries: - config.json: - data: ENC[AES256_GCM,data:XqWiy83f0OxEMu5exDowE3wkPz5/MARnsIhdq3dcZlK7NXZJERHO1UXr6emVnn8W9Wcg+BDl17FkA7A4DZNuAChRHNg3AqcX1dZYBGcU44VG5r8qS76o1+in7TrSN56TgEBEBcifsV6TE/snilq+SpRgLoPy0196XgBM+0FZasRHY/Feda/JTLubvrHYW/zY2ACxAEfaxQzqGt80SlZgvfVN+xk1vu7mR8TdQXQjE64Y9vSL+94UoeRSOUHLjdGNndtP5p62IfZS6QChA78f8s/yfYW8/oQZ2/WPPQFNCb2ZEJT7S/exUDzt5UpXVgLo+m5c3VpmDuR+Zj+uTBzWHs46Nw538xzJaDA6Xz60zhL7SSm8/qdkPc4TT04zGqPXmA2wftBjHFm3M3yM4KZix2C8ILfZiQoBLg9LV9In2kj60kyxwiASd8hyCrTWO6j9rnReBQwVIvmYFvU/A6CUvkrflJcIQ3ETnxQH9bkJEd1y+3Znqdn3rlkGFd2UJ/erLqowJPkLDFHMzs3RZHevrBMunuF4WSCggeXeIeZcqRcJzEjsUeSATUoot+T88XC/6B8xbqinn4Z7rlGajQdp+OIIU/5daMj7wMHZ99N6g0Mfpf331TzbUtDVBZj83VlIslVd6XXCLaBHswWBplMgBC5u/5kTy+cNK7Tif3ltWZLyAsafvchR1vJLmf3MaxUURZ5uqTQIvd4CB39i/Yju9CSuUoIgBR/LUEM9ErqXP52IapEEg2csepGBru5gjLR30SP1tGBPbszo7KuIN6MwtBxtxLqa9zBY+IVW19nDD6LoXZR463IYle2JuOEhpeOLIZcEpx/4vpWAeJSdVcA63ndTqWJ3lvzLUCXIK8XhoHxOAeGn4S6lGb+sNMNNIKQr7p3a7RvRq0zLTiC20bW6JoYj6BqQBC35w+mx9f6Qq3Bv8PggHzp5KSVUSOFWssrzFdGF7pOqnB+vK15VSu2IWa2vozcQlRG5xPnnN/OhiPXYcyvgxeL8a66pltrmrAm+NE4vn08OurE0nglAKJLz5lSWzkXyQtTs4TP8XcXdKMP5ZQv+Y1fH50D5Ubr9Sjbl0XHsG3uv1A5Ad+SaZiw7bJNRL8uuEIBOm52PoWczdI+ZM/uX6bntrZvWpj8Cy660y6iIeyIXuJHTxLpqJU6M4PdjXmEX2RIC14YAFqErzxk+o8sHNwrfHAaLDL3e80jET1kTq/UvQkkAYn8cudEIkOsyRo3hX1Gb+YifMGhFZC2TnvVG0Sh+seIKoQer8lSKJroVoOFB6V4i2isoq0k1gJK3ImqJb8Jn8RGMFill4izGFdlmSI0EPQO0FI5LEIrZpCfyuZdjVSyuiMwIXMpz8DPcAONETdgjRgIKFfKnVMNOqqSK+07asL+N7a2JsUPve2t7VinTXv6RpuQ92UqMtv+KtsrqRq1+b2JW1wl6ScI7ZTby0r1zaR8da1suxmpbSvUzp22hYj2gMJyFRklYF5QVm8qc4+CoARrsjAZDv6P4bZin8OBzFvLt4a0RDPa5I+rjTH8ZIUxYM75kMcIaziUESXeFaC9XGUUTaSiBWmZfe8oETe08S1tQB2kT2oZZCbMHW1JNBWwe8ujcQjRWL8s8bKJNRbmRqtEo8BpUQQBE+Y4QzQVYgsp7vj9fqYZeTIpWvpsI+TmScExGhkwqOSJC9+Cd51SBx/Op7IWhjL3quEr89KXSH5zva8aokM3/2LkYyYGq+RPOZyxwMdJXgHPMCqbuu9ephhD4wLFDbiDOKAkxUb7TBNS/wONt4wAzoRdZ78fxY/pbPOXhJ3470Z5K7fiXeL9JD7595kQM2pcNEI6JdFk+pPLSa3r6q8c6CaHH035TXCUhuJQzO1L0aXi+DSuj418gc1TyQxoXsZfoe9ZnnUO6qHZRALboitn2b2jENP79XeN62LVcko30LJ1nzfcNoqDaflGmwaH+24vdFsDC5WoONoQ9hX519pyeHHc7tKtPS0NLcKkljLckIaTN1OIEHIhsbm0Z3Vhdkymq7k3h5sp5nveBXmWcRoZgd7EJdB9aZDDEuLaGImtYhexyqcckzjyN5YroHOaKdEDtMIkfSDj/+Z9TVnfd0RFTV4emdzW/o0VTPpkKohTIOoavW3Axi95z/uqflIJL7C1gOwIQ0aaE2pvLf+BTj99Tt3aCZRpYf1mftoo7YKCQscr6+aEFgO0Kk0XEGjpIz1+JWhlm768QY7ZemZrMAuxT5CsqbfncZah5EV/iHIPWmjsUMckN7ff6OxK7jOjTIvDZJVCWFE1aeqiN9zHQhb2VX1r0cKyhjPEHhpEagxWGVmCMG1iyv/+FZWKcT+arvaNTyTwc2wKm9OHpJ3dckTO31bYnXYi/jGdoxN5u1lnkFJ2ERtnCRzCt4SCOUoejTb3+tI+rn/+Qg/Y6BIvx2LmpnFvSuw3/fEqZnI9gSObKjVJNywjkLYLvQoedwYaR0RVXhz1NQ0tyGQH5Z/ydEm0vcXOtzFqmGqHr6f1p9j7DEi7aK+0KDI/nTsrvDlUFp8oZBUpVjbwMrwm3a8CQWuF6JpadU8tbp0qllj6fOuLm2Tj1AEQzeCSRnZHIup+9k+Jh+U2rmx7ofpwJGYXiCOGUWQsSldscW2NEo5HOUPLRge7bUFNmZ9Kd9p/gon5cXdE4zgmf+c4XZ1zAvUsi74bJZTzYPay8OLurD8r5vIHYlHCQcScOvuh6i7qday3Wqw3jd4S7HxbQ19YqtBw2eGQj2A4iZqizdIhYPbmvJ65mponevIrPDiEgBmmQdXxYlpl/xUiv8hcFOB0RO6Plt6yyNxWhEtf0vuD8bR8UsZKuWAH2db1NHtFNBxn2g/nmnBpcFGgHkF30e3RHQ0DIMpiTAXDFoHMtCwlyiuTJjaAubg3KwVR4bOmmigz1Q40t09EZJNfnK9JEWaJlnUJOgiDlKlovq+cr+YVbqnGMDLa5tBCDLz2C3AoSTGbLuZ3A91pVHl6kTLrY4N5zRZstbDny4KXsAapIwCH7IfJd/9gBa/VCPetXB/ReTrYi6Y7Y25YhqEL1hks9IlO7Iz56DHk2spbBkJ8C4a525doBmKQ8AS2vwZ2BRJhYXFxaVP47o4+R+duDZzfhqZy1pT9HAMuBPUmEQDs+KxqgoKLiAyRYvcHgO/mBj1Oftu0SwzEMYan1fzyqCfCrZTO6EVcH4M3dmIbzTyCoyJvOCHS1HNqPNrTR5DMahVc527CImS4pBCv1vXvN/IXshrymJF5Z1seZ1HgGtU4rwcMEFvVGTgya4Z9Je9fa2SSG4S7YeV4urJME9xhoSyG58VWK7pJMI4kLfm6RPtQyT6i2pCGCzAujFwYoa0fl5tBhGO1kZkOMfXcaCOG3ymcEdQagvVcIa9hbNSvgkcT4VGnT4zA1QFazRfsi1n4vTTDk8yMq7jLQNn6aEgbewLq4wHNIZBli+gnijCNVts6bfPOTb82OVYirwtn+2IyMhO9kT1sqH4PEsxl20onYTatTP7Qk41RogLLP1IHvhwAj00DFPxg3iIWbzk4zATAkiZCe0Emb3+ci74uSnjDeVbVVZXprfcrjt+zAoZABCza4sHudp4fJcemHm69LV8yCZRz7HrnxcjQig7cDz12ma/9IVNV0wBCFxlT5NgVp9tZS+lWPtEI6bia1vtLVarEfm068+NRIs+GziTadip7c8QdGUKaonLjdR2G8o7x2k4X5fn65qYLqsOlEu0fWz8LhiC3bc2nwtQxVZ/qRKF0stdFvN9Lgqrf860QE6ubw2RE7MW/k8hLG0gjLctQqpTWrzW7C4KUBGBnOa9w5HyDwFNqvkV01tomjPvvkiHCC4qCiE/yQvDiNEFdWe3NGV0e1IdONmy8qdOs6ZWeSJ8MMQ+j+EP2Wh9ap1ntK1/Gg80pOw/UDldzQg3Duld+Rm4imLJAGNfB2NEOQd/S+SsbW4wg/vfT9VXkSahaWn2u0YG5hBHI=,iv:YE2VLQd+7RCULF/DRvrni6lM52jkpJJA5HlmUleNZZo=,tag:mGjeVtozDL3X8n37frkIPQ==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBveXp2aTlkcXkwelVCenlW - U1d3R0VxNFNyMGJYbHZtMTRrbDlkQWdFczJRCjVyd1V0OVJTNEkzUjBIZmJXejFX - WmVNcVM1SFRrN1Vna25DU2pua09HZWcKLS0tIEk4MEFjb3FGZHhzMHNuSXhJRXNv - ZVE2RExscWxhejV2YnBFTUxTVEFVSTAKxHqBMIgPFDESbmxip5sJDmZriijPqjjw - 9JFRSrGYCZE2cnMwu8BuHQzQnTTNZBrRzqWKJ2q+HygxvIbki8EOpQ== - -----END AGE ENCRYPTED FILE----- - - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPTmxnUzFVbGtRbGY0a1Av - aEtUanBJVTcrSm5weFkxSnptSGNUM0dQZUFnCnNLdUhiektTQmEwUXY0bWZycTht - T20xdDJwdVAzdGdUMzFoVFBaSHNKNzAKLS0tIEYvVnF5a2VpMWVJNTV5TytIYUZZ - eWUvblIxK3pzV3ExTVpES2x3ZmVGV1kKA2sYyBydUNnN7V1o+PR5tL+pNQKUK8HP - /bRbyvQhx0V45LBdiJheNAenMo7DA6J5INsMt0X26k8wobqrTSEi0w== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-11-20T03:07:02Z" - mac: ENC[AES256_GCM,data:t5qbsQu1PmRxw4C8pQuSWXPB6ojZpszsWnaBlcxvqOYoCMsdk6HAFfyIv1MTCOaA4zI53jy+u2wDwcQ72lCLicfQppce2ZeveIuBFUoKJ9AZdKKDJfQr1BeNbqu8/J+XO61teT7TCteiQARiI29xtwr3gyDX3SzIoKWlt6ySjq4=,iv:Cg+giduUBZCbBJuPtNoOaRSWWdEu7Wo0jolR0GMG3uc=,tag:TSR5jeF+v+4I6Z7NL7/3RA==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.1 diff --git a/values/xray-1/values.namespaces.yaml b/values/xray-1/values.namespaces.yaml deleted file mode 100644 index d443d0f..0000000 --- a/values/xray-1/values.namespaces.yaml +++ /dev/null @@ -1,3 +0,0 @@ -namespaces: - - name: public-xray - - name: promtail diff --git a/values/xray-1/values.promtail.yaml b/values/xray-1/values.promtail.yaml deleted file mode 100644 index 5848230..0000000 --- a/values/xray-1/values.promtail.yaml +++ /dev/null @@ -1,7 +0,0 @@ -config: - snippets: - pipelineStages: - - match: - pipeline_name: "drop-all" - selector: '{namespace!~"public-xray"}' - action: drop diff --git a/values/xray-1/values.roles.yaml b/values/xray-1/values.roles.yaml deleted file mode 100644 index 1684f2f..0000000 --- a/values/xray-1/values.roles.yaml +++ /dev/null @@ -1 +0,0 @@ -roles: [] diff --git a/values/xray-1/values.server-xray-public.yaml b/values/xray-1/values.server-xray-public.yaml deleted file mode 100644 index 979ba68..0000000 --- a/values/xray-1/values.server-xray-public.yaml +++ /dev/null @@ -1,26 +0,0 @@ -ext-self-signed-cert: - enabled: true - name: xray.badhouseplants.net - domain: xray.badhouseplants.net -ingress: - main: - enabled: false -service: - xray-https: - enabled: true - type: NodePort - ports: - https: - port: 443 - targetPort: 443 - nodePort: 30015 - protocol: TCP - xray-http: - enabled: true - type: NodePort - ports: - http: - port: 80 - targetPort: 80 - protocol: TCP - nodePort: 30014 diff --git a/values/xray-2/secrets.promtail.yaml b/values/xray-2/secrets.promtail.yaml deleted file mode 100644 index e3b2680..0000000 --- a/values/xray-2/secrets.promtail.yaml +++ /dev/null @@ -1,27 +0,0 @@ -config: - clients: - - url: ENC[AES256_GCM,data:CFq8x1jLDO8aLitEOlCOXeG1yp8RqKHdeqf8x7o9YESOmTAKFTuLpcBUDeESNTv9,iv:68uLarfOiS4oTcvEQu4uHMQUzRhXhqAZb5c4ik4U2E4=,tag:GhkkzriBYhWmTxt0KNwMkg==,type:str] - tenant_id: ENC[AES256_GCM,data:Iad0xh30fhwNiDh8SRU=,iv:A9o5brTa/2YbdYCIg5D4RHY2LXkMauIZBfygGsyV8gM=,tag:vNbcRImDSRCkM34B03MiMQ==,type:str] - basic_auth: - username: ENC[AES256_GCM,data:kUgLwA==,iv:5rAxU463ynXXZQfmGykocKmWm+VKahatT2KokSux16E=,tag:vYe9g0mePeYAapJlHAOWVw==,type:str] - password: ENC[AES256_GCM,data:2Zb4d8Aj5M27V7YNvcdFIkHHAl5dvNIlB46sP2sJ,iv:wW31BhjGvN2ii60p+/hSs2IqaIhLbDgl70KFfGiTbXM=,tag:50DB7GxuuAl+8GJ7K2ePvA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBdjR0eFRDS2dCVTNENUFr - V0k4T2Q2cmxua05QeDlzdnB2WWJLQ2hQbUdZCndjT0cxcytPUW0zOWtxVy9sazlr - Z3RKSkFVeGx2UkdtWmhLQXhNUnpKeUEKLS0tIGV3L1pRNXlZMG92K1N6aGlvSVBz - ZVV1d3R6KzJtT0drOVNHSThDdjAxekkK1RXCHM6QhNXto5D6yFTlvANN3E4iYfOC - Bf8s76p0ynI3tqfH6IgA9NFRPxYPzMGC/1zsQ95n5N6fMXh/KouRqg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-11-17T16:09:55Z" - mac: ENC[AES256_GCM,data:EM9kmYq/6en0XwMtmDcx5yO6VflugTbqDgPvvIBl7m6EvFi9EkMx/Aa9jkVYS+VFvS+pJ9pVe8+F/TL5+o/K0O9rkgZ8+ciAYXoRDBb1o9qUMoy2+ZjbjI7FMXDp8c8UED0MK+SZYNZ2C+44C9kohX5cPwOQCHd+0HxJKOTzH8U=,iv:The91sevo/IqJIXBt8BAta5RYDtv1oFaGQRyqzrm+tM=,tag:fKduoewHPG/N1qGr76r/8A==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.1 diff --git a/values/xray-2/secrets.server-xray-public.yaml b/values/xray-2/secrets.server-xray-public.yaml deleted file mode 100644 index 2c4b84a..0000000 --- a/values/xray-2/secrets.server-xray-public.yaml +++ /dev/null @@ -1,37 +0,0 @@ -files: - config: - enabled: ENC[AES256_GCM,data:yOJqDw==,iv:p4YUaymPlFvDKex//IBK14xG82ekakbvXbdQ7wnXLkw=,tag:iVbfnbdtLZyf8ux4kw/JNg==,type:bool] - sensitive: ENC[AES256_GCM,data:XkpvCgA=,iv:vWxJBv0xhr0tcJvrW8E6OwAPQNlb/cGHeZULBHO51QU=,tag:XwbCtmnH5a59FmGrOXmA/w==,type:bool] - remove: [] - entries: - config.json: - data: ENC[AES256_GCM,data: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,iv:aLUnJ9/VjkEbNa097xFNUyeFEzTqs2Pxgye/05TmgSI=,tag:sXp48SCtbCGRyVrZZHZv9g==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhWHcxNDNucmt1THVHLytL - ZHdoMWI2SGF6bjJvQ0lKT0g2UklLS2xnRzNVCk1FcGxaa3hIbHpnTGtRRE9BT3do - a3ZlL0pLaXRibkc5bW1pL0xzMzlxUmsKLS0tIFUvV0F3QVozajZXb05MYXZjWVpT - OHJ3a1ZOLzEzS1N2Tis1L3pQVnhZYUkKRSEWDMZdaHsZeblED32ZUgtKlB1E5cTJ - c4k/tXW+KiwG2h2SVgTrsl/hIZiT98K0gKq0N/OCdA8CKiREA5Fa1Q== - -----END AGE ENCRYPTED FILE----- - - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4M3dXQys2VVFXcExVNHhj - eWJvU01BUExpSzZPVFBXbWk1UFRzSVJ3OFh3ClJ5ZEdVcWVEeG4yRFhLQndGcFBk - dWMxWlNjeEszMXFTZUx3RVcwNnR0L28KLS0tIDA4bVcvdjVBcnNQeHp0Q1RhTlZQ - R2t4Y1YycmpPT2JZdUxsUUdUMUdDT2cKyFvSZWn+0e058lRqTTN7DCRrp2gn77BX - 4cT52WV+t4Ik621Eg/o7ZfdUUJimjS3dbuMg9A1ieGO2FcgxoNPkzg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-11-20T03:00:02Z" - mac: ENC[AES256_GCM,data:K0U7maV2lt8cUxkX/kNgily376Y2YbNnHoG92jWVCzjsw/wyE8jwMRW6cFVQqAWgnX5maScT+AJITRvvuM2CQTTItcCYe3FrTHw0WxJui3uzn85TViACo8YTj5DGYW890CBfBTSm9IgQPMtCIjQx/AazFtnhl7kOe7W68xpbAtQ=,iv:niMD6YjXxvY2OxQlXn5aoH8hf+5IhPogS5/F1JQFglk=,tag:z4X8npY1dAiit3Op0Iv3AQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.1 diff --git a/values/xray-2/values.namespaces.yaml b/values/xray-2/values.namespaces.yaml deleted file mode 100644 index d443d0f..0000000 --- a/values/xray-2/values.namespaces.yaml +++ /dev/null @@ -1,3 +0,0 @@ -namespaces: - - name: public-xray - - name: promtail diff --git a/values/xray-2/values.promtail.yaml b/values/xray-2/values.promtail.yaml deleted file mode 100644 index 5848230..0000000 --- a/values/xray-2/values.promtail.yaml +++ /dev/null @@ -1,7 +0,0 @@ -config: - snippets: - pipelineStages: - - match: - pipeline_name: "drop-all" - selector: '{namespace!~"public-xray"}' - action: drop diff --git a/values/xray-2/values.roles.yaml b/values/xray-2/values.roles.yaml deleted file mode 100644 index 1684f2f..0000000 --- a/values/xray-2/values.roles.yaml +++ /dev/null @@ -1 +0,0 @@ -roles: [] diff --git a/values/xray-2/values.server-xray-public.yaml b/values/xray-2/values.server-xray-public.yaml deleted file mode 100644 index 979ba68..0000000 --- a/values/xray-2/values.server-xray-public.yaml +++ /dev/null @@ -1,26 +0,0 @@ -ext-self-signed-cert: - enabled: true - name: xray.badhouseplants.net - domain: xray.badhouseplants.net -ingress: - main: - enabled: false -service: - xray-https: - enabled: true - type: NodePort - ports: - https: - port: 443 - targetPort: 443 - nodePort: 30015 - protocol: TCP - xray-http: - enabled: true - type: NodePort - ports: - http: - port: 80 - targetPort: 80 - protocol: TCP - nodePort: 30014