forked from org1/infra
Merge branch 'main' into feat/agent-readonly-all-except-secrets
This commit is contained in:
@@ -40,9 +40,9 @@ flux get kustomizations -n flux-system
|
||||
|
||||
The pinned v2.6.4 release is installed as a separate bootstrap step because
|
||||
the Flux CRDs must exist before the `GitRepository` and `Kustomization`
|
||||
objects can be applied. The root Kustomization then creates the source and
|
||||
reconciliation objects for the Ansible `master` branch and the connectivity
|
||||
tester `main` branch under `./k3s`.
|
||||
objects can be applied. The root Kustomization then creates the source and reconciliation objects for
|
||||
the K3s `main` branch at the repository root and the connectivity tester
|
||||
`main` branch under `./k3s`.
|
||||
|
||||
## Local bootstrap resources
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
apiVersion: source.toolkit.fluxcd.io/v1
|
||||
kind: GitRepository
|
||||
metadata:
|
||||
name: ansible
|
||||
name: k3s
|
||||
namespace: flux-system
|
||||
spec:
|
||||
interval: 1m
|
||||
ref:
|
||||
branch: master
|
||||
url: https://gitea.rudolf.keenetic.link/admin/ansible.git
|
||||
branch: main
|
||||
url: https://gitea.rudolf.keenetic.link/org1/k3s.git
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
# - gitrepository.yaml
|
||||
- gitrepository.yaml
|
||||
- connectivity-tester-gitrepository.yaml
|
||||
# - sync.yaml
|
||||
- sync.yaml
|
||||
- connectivity-tester-sync.yaml
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
metadata:
|
||||
name: ansible
|
||||
name: k3s
|
||||
namespace: flux-system
|
||||
spec:
|
||||
interval: 10m
|
||||
path: ./k3s_rencher
|
||||
path: ./
|
||||
prune: true
|
||||
sourceRef:
|
||||
kind: GitRepository
|
||||
name: ansible
|
||||
name: k3s
|
||||
wait: true
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- flux-system
|
||||
- infrastructure/dns
|
||||
- infrastructure/agent-gateway
|
||||
@@ -0,0 +1,6 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- k3s_rencher/flux-system
|
||||
- k3s_rencher/infrastructure/dns
|
||||
- k3s_rencher/infrastructure/agent-gateway
|
||||
Reference in New Issue
Block a user