Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reduce machine, cluster charts to single instances
[icn.git]
/
deploy
/
cluster
/
templates
/
flux-addon.yaml
diff --git
a/deploy/clusters/templates/flux-addon.yaml
b/deploy/cluster/templates/flux-addon.yaml
similarity index 99%
rename from
deploy/clusters/templates/flux-addon.yaml
rename to
deploy/cluster/templates/flux-addon.yaml
index
ad53ec4
..
81322e2
100644
(file)
--- a/
deploy/clusters/templates/flux-addon.yaml
+++ b/
deploy/cluster/templates/flux-addon.yaml
@@
-1,5
+1,4
@@
-{{- range $clusterName, $cluster := .Values.clusters }}
-{{- if $cluster.flux }}
+{{- if .Values.flux }}
---
apiVersion: v1
data:
---
apiVersion: v1
data:
@@
-4122,31
+4121,30
@@
data:
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: GitRepository
metadata:
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: GitRepository
metadata:
- name: {{
$cluster
.flux.repositoryName }}
+ name: {{
.Values
.flux.repositoryName }}
namespace: flux-system
spec:
gitImplementation: go-git
interval: 1m0s
ref:
namespace: flux-system
spec:
gitImplementation: go-git
interval: 1m0s
ref:
- branch: {{
$cluster
.flux.branch }}
+ branch: {{
.Values
.flux.branch }}
timeout: 20s
timeout: 20s
- url: {{
$cluster
.flux.url }}
+ url: {{
.Values
.flux.url }}
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
kind: Kustomization
metadata:
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
kind: Kustomization
metadata:
- name: {{
$
clusterName }}-flux-sync
+ name: {{
.Values.
clusterName }}-flux-sync
namespace: flux-system
spec:
interval: 10m0s
namespace: flux-system
spec:
interval: 10m0s
- path: {{
$cluster
.flux.path }}
+ path: {{
.Values
.flux.path }}
prune: true
sourceRef:
kind: GitRepository
prune: true
sourceRef:
kind: GitRepository
- name: {{
$cluster
.flux.repositoryName }}
+ name: {{
.Values
.flux.repositoryName }}
kind: ConfigMap
metadata:
creationTimestamp: null
kind: ConfigMap
metadata:
creationTimestamp: null
- name: {{ $clusterName }}-flux-addon
-{{- end }}
+ name: {{ .Values.clusterName }}-flux-addon
{{- end }}
{{- end }}