diff --git a/.github/renovate.json b/.github/renovate.json index c4f23a4..7a6d447 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -7,76 +7,13 @@ "kubernetes/cluster/production/flux-system/gotk-components.yaml" ], "flux": { - "fileMatch": [ - "(^|/)kubernetes/.+\\.ya?ml$" - ] + "fileMatch": ["^kubernetes/.+\\.ya?ml$"] }, - "helmv3": { - "fileMatch": [ - "(^|/)kubernetes/apps/.+/helmrelease\\.ya?ml$" - ] + "helm-values": { + "fileMatch": ["^kubernetes/.+\\.ya?ml$"] }, - "packageRules": [ - { - "matchPackageNames": [ - "authentik" - ], - "registryUrls": [ - "https://charts.goauthentik.io" - ] - }, - { - "matchPackageNames": [ - "ingress-nginx" - ], - "registryUrls": [ - "https://kubernetes.github.io/ingress-nginx" - ] - }, - { - "matchPackageNames": [ - "reflector" - ], - "registryUrls": [ - "https://emberstack.github.io/helm-charts" - ] - }, - { - "matchPackageNames": [ - "app-template" - ], - "registryUrls": [ - "https://bjw-s.github.io/helm-charts" - ] - } - ], "kubernetes": { - "fileMatch": [ - "(^|/)kubernetes/.+\\.ya?ml$" - ] + "fileMatch": ["^kubernetes/.+\\.ya?ml$"] }, - "customManagers": [ - { - "customType": "regex", - "fileMatch": [ - "(^|/)kubernetes/apps/.+/helmrelease\\.ya?ml$" - ], - "matchStrings": [ - "chart:\\s*\\n\\s*spec:\\s*\\n\\s*chart:\\s*(?<depName>\\S+)\\s*\\n\\s*version:\\s*[\"']?(?<currentValue>[0-9a-zA-Z\\.\\-]+)[\"']?" - ], - "datasourceTemplate": "helm", - "versioningTemplate": "semver" - }, - { - "customType": "regex", - "fileMatch": ["(^|/)terraform/flux/main\\.tf$"], - "matchStrings": [ - "resource\\s+\"flux_bootstrap_git\"\\s+\"[^\"]+\"\\s+\\{[^}]*?version\\s+=\\s+\"(?<currentValue>[0-9\\.]+)\"" - ], - "datasourceTemplate": "github-releases", - "packageNameTemplate": "fluxcd/flux2", - "versioningTemplate": "semver" - } - ], "dependencyDashboardTitle": ":robot: Renovate Dashboard" } diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml index ad0eb28..1c2bc8b 100644 --- a/kubernetes/apps/kustomization.yaml +++ b/kubernetes/apps/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - production/ \ No newline at end of file + - production/ + - staging/ \ No newline at end of file diff --git a/kubernetes/apps/production/authentik/configmap.yaml b/kubernetes/apps/staging/authentik/configmap.yaml similarity index 100% rename from kubernetes/apps/production/authentik/configmap.yaml rename to kubernetes/apps/staging/authentik/configmap.yaml diff --git a/kubernetes/apps/production/authentik/customcss.yaml b/kubernetes/apps/staging/authentik/customcss.yaml similarity index 100% rename from kubernetes/apps/production/authentik/customcss.yaml rename to kubernetes/apps/staging/authentik/customcss.yaml diff --git a/kubernetes/apps/production/authentik/helmrelease.yaml b/kubernetes/apps/staging/authentik/helmrelease.yaml similarity index 100% rename from kubernetes/apps/production/authentik/helmrelease.yaml rename to kubernetes/apps/staging/authentik/helmrelease.yaml diff --git a/kubernetes/apps/production/authentik/helmrepo.yaml b/kubernetes/apps/staging/authentik/helmrepo.yaml similarity index 100% rename from kubernetes/apps/production/authentik/helmrepo.yaml rename to kubernetes/apps/staging/authentik/helmrepo.yaml diff --git a/kubernetes/apps/production/authentik/kustomization.yaml b/kubernetes/apps/staging/authentik/kustomization.yaml similarity index 100% rename from kubernetes/apps/production/authentik/kustomization.yaml rename to kubernetes/apps/staging/authentik/kustomization.yaml diff --git a/kubernetes/apps/production/authentik/media-pvc.yaml b/kubernetes/apps/staging/authentik/media-pvc.yaml similarity index 100% rename from kubernetes/apps/production/authentik/media-pvc.yaml rename to kubernetes/apps/staging/authentik/media-pvc.yaml diff --git a/kubernetes/apps/production/authentik/namespace.yaml b/kubernetes/apps/staging/authentik/namespace.yaml similarity index 100% rename from kubernetes/apps/production/authentik/namespace.yaml rename to kubernetes/apps/staging/authentik/namespace.yaml diff --git a/kubernetes/apps/production/authentik/service.yaml b/kubernetes/apps/staging/authentik/service.yaml similarity index 100% rename from kubernetes/apps/production/authentik/service.yaml rename to kubernetes/apps/staging/authentik/service.yaml diff --git a/kubernetes/apps/staging/kustomization.yaml b/kubernetes/apps/staging/kustomization.yaml index 965b5f5..a4598f0 100644 --- a/kubernetes/apps/staging/kustomization.yaml +++ b/kubernetes/apps/staging/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - flaresolverr/ \ No newline at end of file + - authentik/ \ No newline at end of file