diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index adb210c5..7328a9b9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,10 +25,15 @@ repos: rev: 0.4.0 hooks: - id: fix-smartquotes - - repo: https://github.com/k8s-at-home/sops-pre-commit + - repo: https://github.com/onedr0p/sops-pre-commit rev: v2.1.1 hooks: - id: forbid-secrets + exclude: | + (?x)^( + cluster\/apps\/kube-system\/kube-vip\/rbac.yaml| + tmpl\/.*.sops\.ya?ml + )$ - repo: https://github.com/gruntwork-io/pre-commit rev: v0.1.17 hooks: diff --git a/cluster/apps/default/echo-server/kustomization.yaml b/cluster/apps/default/echo-server/kustomization.yaml index 2fa2de20..bfe61558 100644 --- a/cluster/apps/default/echo-server/kustomization.yaml +++ b/cluster/apps/default/echo-server/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml + - ./helm-release.yaml diff --git a/cluster/apps/default/hajimari/kustomization.yaml b/cluster/apps/default/hajimari/kustomization.yaml index e06d74e5..b514428e 100644 --- a/cluster/apps/default/hajimari/kustomization.yaml +++ b/cluster/apps/default/hajimari/kustomization.yaml @@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - config-pvc.yaml - - helm-release.yaml + - ./config-pvc.yaml + - ./helm-release.yaml diff --git a/cluster/apps/default/kustomization.yaml b/cluster/apps/default/kustomization.yaml index 5bdcb771..518447c4 100644 --- a/cluster/apps/default/kustomization.yaml +++ b/cluster/apps/default/kustomization.yaml @@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - namespace.yaml - - echo-server - - hajimari + - ./namespace.yaml + - ./echo-server + - ./hajimari diff --git a/cluster/apps/kube-system/cert-manager/issuers/kustomization.yaml b/cluster/apps/kube-system/cert-manager/issuers/kustomization.yaml index 4268fa0e..2ef9a38d 100644 --- a/cluster/apps/kube-system/cert-manager/issuers/kustomization.yaml +++ b/cluster/apps/kube-system/cert-manager/issuers/kustomization.yaml @@ -1,5 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml - - secret.sops.yaml + - ./helm-release.yaml + - ./secret.sops.yaml diff --git a/cluster/apps/kube-system/cert-manager/kustomization.yaml b/cluster/apps/kube-system/cert-manager/kustomization.yaml index c0aa9d02..fca27a39 100644 --- a/cluster/apps/kube-system/cert-manager/kustomization.yaml +++ b/cluster/apps/kube-system/cert-manager/kustomization.yaml @@ -1,5 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml - - issuers + - ./helm-release.yaml + - ./issuers diff --git a/cluster/apps/kube-system/cloudflare-ddns/kustomization.yaml b/cluster/apps/kube-system/cloudflare-ddns/kustomization.yaml index 2f6a8346..b4cebcb7 100644 --- a/cluster/apps/kube-system/cloudflare-ddns/kustomization.yaml +++ b/cluster/apps/kube-system/cloudflare-ddns/kustomization.yaml @@ -2,13 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - cron-job.yaml - - secret.sops.yaml + - ./cron-job.yaml + - ./secret.sops.yaml namespace: kube-system configMapGenerator: - name: cloudflare-ddns files: - - cloudflare-ddns.sh + - ./cloudflare-ddns.sh generatorOptions: disableNameSuffixHash: true annotations: diff --git a/cluster/apps/kube-system/external-dns/kustomization.yaml b/cluster/apps/kube-system/external-dns/kustomization.yaml index 73941365..61fbca20 100644 --- a/cluster/apps/kube-system/external-dns/kustomization.yaml +++ b/cluster/apps/kube-system/external-dns/kustomization.yaml @@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml - - secret.sops.yaml + - ./helm-release.yaml + - ./secret.sops.yaml diff --git a/cluster/apps/kube-system/ingress-nginx/kustomization.yaml b/cluster/apps/kube-system/ingress-nginx/kustomization.yaml index 093cb30a..9f5faee7 100644 --- a/cluster/apps/kube-system/ingress-nginx/kustomization.yaml +++ b/cluster/apps/kube-system/ingress-nginx/kustomization.yaml @@ -3,10 +3,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: kube-system resources: - - helm-release.yaml + - ./helm-release.yaml configMapGenerator: - name: cloudflare-proxied-networks files: - - cloudflare-proxied-networks.txt + - ./cloudflare-proxied-networks.txt generatorOptions: disableNameSuffixHash: true diff --git a/cluster/apps/kube-system/k8s-gateway/kustomization.yaml b/cluster/apps/kube-system/k8s-gateway/kustomization.yaml index 2fa2de20..bfe61558 100644 --- a/cluster/apps/kube-system/k8s-gateway/kustomization.yaml +++ b/cluster/apps/kube-system/k8s-gateway/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml + - ./helm-release.yaml diff --git a/cluster/apps/kube-system/kube-vip/kustomization.yaml b/cluster/apps/kube-system/kube-vip/kustomization.yaml index dc25d2e0..7da80f8b 100644 --- a/cluster/apps/kube-system/kube-vip/kustomization.yaml +++ b/cluster/apps/kube-system/kube-vip/kustomization.yaml @@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - rbac.yaml - - daemon-set.yaml + - ./rbac.yaml + - ./daemon-set.yaml labels: - pairs: kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/cluster/apps/kube-system/metallb/kustomization.yaml b/cluster/apps/kube-system/metallb/kustomization.yaml index 92745563..c3dfd010 100644 --- a/cluster/apps/kube-system/metallb/kustomization.yaml +++ b/cluster/apps/kube-system/metallb/kustomization.yaml @@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml - - config + - ./helm-release.yaml + - ./config diff --git a/cluster/apps/kube-system/metrics-server/kustomization.yaml b/cluster/apps/kube-system/metrics-server/kustomization.yaml index 2fa2de20..bfe61558 100644 --- a/cluster/apps/kube-system/metrics-server/kustomization.yaml +++ b/cluster/apps/kube-system/metrics-server/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml + - ./helm-release.yaml diff --git a/cluster/apps/kube-system/reloader/kustomization.yaml b/cluster/apps/kube-system/reloader/kustomization.yaml index 2fa2de20..bfe61558 100644 --- a/cluster/apps/kube-system/reloader/kustomization.yaml +++ b/cluster/apps/kube-system/reloader/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml + - ./helm-release.yaml diff --git a/cluster/apps/kustomization.yaml b/cluster/apps/kustomization.yaml index 6d13d726..d8cbac8a 100644 --- a/cluster/apps/kustomization.yaml +++ b/cluster/apps/kustomization.yaml @@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - default - - kube-system - # - system-upgrade + - ./default + - ./kube-system + # - ./system-upgrade diff --git a/cluster/apps/system-upgrade/kured/kustomization.yaml b/cluster/apps/system-upgrade/kured/kustomization.yaml index 2fa2de20..bfe61558 100644 --- a/cluster/apps/system-upgrade/kured/kustomization.yaml +++ b/cluster/apps/system-upgrade/kured/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm-release.yaml + - ./helm-release.yaml diff --git a/cluster/apps/system-upgrade/kustomization.yaml b/cluster/apps/system-upgrade/kustomization.yaml index b8ec373c..cd492b6e 100644 --- a/cluster/apps/system-upgrade/kustomization.yaml +++ b/cluster/apps/system-upgrade/kustomization.yaml @@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - namespace.yaml + - ./namespace.yaml # renovate: datasource=docker image=rancher/system-upgrade-controller - https://github.com/rancher/system-upgrade-controller/releases/download/v0.9.1/crd.yaml - - system-upgrade-controller - - kured + - ./system-upgrade-controller + - ./kured diff --git a/cluster/apps/system-upgrade/system-upgrade-controller/kustomization.yaml b/cluster/apps/system-upgrade/system-upgrade-controller/kustomization.yaml index 51f5c407..1e72bd07 100644 --- a/cluster/apps/system-upgrade/system-upgrade-controller/kustomization.yaml +++ b/cluster/apps/system-upgrade/system-upgrade-controller/kustomization.yaml @@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - github.com/rancher/system-upgrade-controller?ref=v0.10.0 - - plans + - ./plans images: - name: rancher/system-upgrade-controller newTag: v0.10.0 diff --git a/cluster/apps/system-upgrade/system-upgrade-controller/plans/kustomization.yaml b/cluster/apps/system-upgrade/system-upgrade-controller/plans/kustomization.yaml index e51bcd70..5b11f8da 100644 --- a/cluster/apps/system-upgrade/system-upgrade-controller/plans/kustomization.yaml +++ b/cluster/apps/system-upgrade/system-upgrade-controller/plans/kustomization.yaml @@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - agent.yaml - - server.yaml + - ./agent.yaml + - ./server.yaml