chore: merge 1.24 values to resolve conflicts

This commit is contained in:
Stefan Reimer 2023-01-22 16:28:23 +00:00
parent 7e76c78e53
commit bbe16f7bc0
1 changed files with 23 additions and 11 deletions

View File

@ -10,48 +10,58 @@ global:
addons: addons:
enabled: true enabled: true
targetRevision: 0.6.3 targetRevision: 0.7.3
external-dns: external-dns:
enabled: false enabled: false
forseti: forseti:
enabled: false enabled: false
clusterBackup: clusterBackup:
enabled: false enabled: false
cluster-autoscaler:
enabled: false
sealed-secrets:
enabled: false
aws-node-termination-handler: aws-node-termination-handler:
enabled: false enabled: false
cluster-autoscaler: aws-eks-asg-rolling-update-handler:
enabled: false enabled: false
network: network:
enabled: true enabled: true
retain: true retain: true
targetRevision: 0.3.4 targetRevision: 0.4.2
cilium: cilium:
cluster: {} cluster: {}
cert-manager: cert-manager:
enabled: false enabled: false
namespace: cert-manager namespace: cert-manager
targetRevision: 0.9.2 targetRevision: 0.9.3
storage: storage:
enabled: false enabled: false
targetRevision: 0.7.2 targetRevision: 0.7.4
aws-ebs-csi-driver: aws-ebs-csi-driver:
enabled: false enabled: false
aws-efs-csi-driver: aws-efs-csi-driver:
enabled: false enabled: false
velero:
enabled: false
gemini:
enabled: false
snapshotController:
enabled: false
istio: istio:
enabled: false enabled: false
namespace: istio-system namespace: istio-system
targetRevision: 0.8.4 targetRevision: 0.9.0
istio-ingress: istio-ingress:
enabled: false enabled: false
chart: kubezero-istio-gateway chart: kubezero-istio-gateway
namespace: istio-ingress namespace: istio-ingress
targetRevision: 0.8.2 targetRevision: 0.9.0
gateway: gateway:
service: {} service: {}
@ -59,14 +69,14 @@ istio-private-ingress:
enabled: false enabled: false
chart: kubezero-istio-gateway chart: kubezero-istio-gateway
namespace: istio-ingress namespace: istio-ingress
targetRevision: 0.8.2 targetRevision: 0.9.0
gateway: gateway:
service: {} service: {}
metrics: metrics:
enabled: false enabled: false
namespace: monitoring namespace: monitoring
targetRevision: 0.8.5 targetRevision: 0.8.9
istio: istio:
grafana: {} grafana: {}
prometheus: {} prometheus: {}
@ -74,11 +84,13 @@ metrics:
logging: logging:
enabled: false enabled: false
namespace: logging namespace: logging
targetRevision: 0.8.3 targetRevision: 0.8.4
argocd: argocd:
enabled: false enabled: false
namespace: argocd namespace: argocd
targetRevision: 0.10.2 targetRevision: 0.11.2
argocd-image-updater:
enabled: false
istio: istio:
enabled: false enabled: false