fix: proper of wait and dependsOn in flux ks and hr (#771)
This commit is contained in:
1 parent
ab1af57f79
commit
c11092b261
18 files changed
+22
-18
No files matched your search
@@ -28,6 +28,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
|
wait: true
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -10,7 +10,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -40,6 +40,7 @@ spec:
|
|||||||
namespaceSelector:
|
namespaceSelector:
|
||||||
matchNames:
|
matchNames:
|
||||||
- default
|
- default
|
||||||
|
- monitoring
|
||||||
ingress:
|
ingress:
|
||||||
main:
|
main:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -10,7 +10,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -10,7 +10,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -12,7 +12,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -10,7 +10,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -10,7 +10,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -25,6 +25,9 @@ spec:
|
|||||||
retries: 3
|
retries: 3
|
||||||
uninstall:
|
uninstall:
|
||||||
keepHistory: false
|
keepHistory: false
|
||||||
|
dependsOn:
|
||||||
|
- name: local-path-provisioner
|
||||||
|
namespace: kube-system
|
||||||
values:
|
values:
|
||||||
admin:
|
admin:
|
||||||
existingSecret: grafana-admin-secret
|
existingSecret: grafana-admin-secret
|
||||||
|
|||||||
@@ -5,14 +5,12 @@ metadata:
|
|||||||
name: cluster-apps-grafana
|
name: cluster-apps-grafana
|
||||||
namespace: flux-system
|
namespace: flux-system
|
||||||
spec:
|
spec:
|
||||||
dependsOn:
|
|
||||||
- name: cluster-apps-local-path-provisioner
|
|
||||||
path: ./kubernetes/apps/monitoring/grafana/app
|
path: ./kubernetes/apps/monitoring/grafana/app
|
||||||
prune: true
|
prune: true
|
||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -28,6 +28,9 @@ spec:
|
|||||||
retries: 3
|
retries: 3
|
||||||
uninstall:
|
uninstall:
|
||||||
keepHistory: false
|
keepHistory: false
|
||||||
|
dependsOn:
|
||||||
|
- name: local-path-provisioner
|
||||||
|
namespace: kube-system
|
||||||
values:
|
values:
|
||||||
cleanPrometheusOperatorObjectNames: true
|
cleanPrometheusOperatorObjectNames: true
|
||||||
alertmanager:
|
alertmanager:
|
||||||
|
|||||||
@@ -5,14 +5,12 @@ metadata:
|
|||||||
name: cluster-apps-kube-prometheus-stack
|
name: cluster-apps-kube-prometheus-stack
|
||||||
namespace: flux-system
|
namespace: flux-system
|
||||||
spec:
|
spec:
|
||||||
dependsOn:
|
|
||||||
- name: cluster-apps-local-path-provisioner
|
|
||||||
path: ./kubernetes/apps/monitoring/kube-prometheus-stack/app
|
path: ./kubernetes/apps/monitoring/kube-prometheus-stack/app
|
||||||
prune: true
|
prune: true
|
||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -10,7 +10,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -12,7 +12,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -31,7 +31,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -12,7 +12,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
@@ -28,7 +28,7 @@ spec:
|
|||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
name: home-kubernetes
|
name: home-kubernetes
|
||||||
wait: true
|
wait: false # no flux ks dependents
|
||||||
interval: 30m
|
interval: 30m
|
||||||
retryInterval: 1m
|
retryInterval: 1m
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
Reference in new issue
Block a user