Skip to content

Commit

Permalink
fix(flux): needed to split these out
Browse files Browse the repository at this point in the history
  • Loading branch information
buroa committed Jan 9, 2025
1 parent 8b9af10 commit 784b072
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/flux-diff.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ jobs:
args: >-
diff ${{ matrix.resources }}
--unified 6
--path /github/workspace/pull/kubernetes/flux
--path-orig /github/workspace/default/kubernetes/flux
--path /github/workspace/pull/kubernetes/flux/config
--path-orig /github/workspace/default/kubernetes/flux/config
--strip-attrs "helm.sh/chart,checksum/config,app.kubernetes.io/version,chart"
--limit-bytes 10000
--all-namespaces
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-pull-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
with:
args: >-
get cluster
--path /github/workspace/kubernetes/flux
--path /github/workspace/kubernetes/flux/config
--enable-images
--output yaml
--output-file images.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ instance:
kind: GitRepository
url: ssh://[email protected]/buroa/k8s-gitops
ref: refs/heads/master
path: ./kubernetes/flux
path: ./kubernetes/flux/config
pullSecret: github-deploy-key
kustomize:
patches:
Expand Down
39 changes: 39 additions & 0 deletions kubernetes/flux/config/cluster.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,50 @@
---
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: cluster-repositories
namespace: flux-system
spec:
interval: 30m
path: ./kubernetes/flux/repositories
prune: true
wait: true
sourceRef:
kind: GitRepository
name: flux-system
decryption:
provider: sops
secretRef:
name: sops-age
---
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: cluster-settings
namespace: flux-system
spec:
interval: 30m
path: ./kubernetes/flux/settings
prune: true
wait: true
sourceRef:
kind: GitRepository
name: flux-system
decryption:
provider: sops
secretRef:
name: sops-age
---
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: cluster-apps
namespace: flux-system
spec:
interval: 30m
dependsOn:
- name: cluster-repositories
- name: cluster-settings
path: ./kubernetes/apps
prune: true
sourceRef:
Expand Down
7 changes: 0 additions & 7 deletions kubernetes/flux/kustomization.yaml

This file was deleted.

File renamed without changes.
File renamed without changes.

0 comments on commit 784b072

Please sign in to comment.