Skip to content

Commit

Permalink
feat(flux): remove cluster setting/secret and decryption patches
Browse files Browse the repository at this point in the history
Signed-off-by: Devin Buhl <devin@buhl.casa>
  • Loading branch information
onedr0p committed Jan 16, 2025
1 parent e593045 commit fb49caa
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 56 deletions.
4 changes: 4 additions & 0 deletions kubernetes/apps/default/qbittorrent/ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ spec:
dependsOn:
- name: external-secrets-stores
path: ./kubernetes/apps/default/qbittorrent/tools
decryption:
provider: sops
secretRef:
name: sops-age
prune: true
sourceRef:
kind: GitRepository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,6 @@ instance:
app.kubernetes.io/name: flux
kustomize:
patches:
# Add Sops decryption to Kustomizations
- patch: |
- op: add
path: /spec/decryption
value:
provider: sops
secretRef:
name: sops-age
target:
group: kustomize.toolkit.fluxcd.io
kind: Kustomization
# Increase the number of workers and limits
# Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#increase-the-number-of-workers-and-limits
- patch: |
Expand Down
41 changes: 2 additions & 39 deletions kubernetes/flux/cluster/ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ spec:
name: flux-system
wait: true
interval: 30m
decryption:
provider: sops
secretRef:
name: sops-age
timeout: 5m
---
# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
apiVersion: kustomize.toolkit.fluxcd.io/v1
Expand All @@ -36,38 +33,4 @@ spec:
name: flux-system
wait: false
interval: 30m
decryption:
provider: sops
secretRef:
name: sops-age
postBuild:
substituteFrom:
- name: cluster-settings
kind: ConfigMap
optional: true
- name: cluster-secrets
kind: Secret
optional: true
patches:
- patch: |-
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: not-used
spec:
decryption:
provider: sops
secretRef:
name: sops-age
postBuild:
substituteFrom:
- name: cluster-settings
kind: ConfigMap
optional: true
- name: cluster-secrets
kind: Secret
optional: true
target:
group: kustomize.toolkit.fluxcd.io
kind: Kustomization
labelSelector: substitution.flux.home.arpa/disabled notin (true)
timeout: 5m
1 change: 0 additions & 1 deletion kubernetes/flux/meta/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./repositories
- ./settings
5 changes: 0 additions & 5 deletions kubernetes/flux/meta/settings/kustomization.yaml

This file was deleted.

0 comments on commit fb49caa

Please sign in to comment.