Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiFleKs committed Aug 14, 2023
2 parents 833dbf5 + ab4b517 commit 90168a4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
24 changes: 12 additions & 12 deletions helm-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
version: 0.1.28
repository: https://aws.github.io/eks-charts
- name: aws-load-balancer-controller
version: 1.5.5
version: 1.6.0
repository: https://aws.github.io/eks-charts
- name: aws-node-termination-handler
version: 0.21.0
Expand All @@ -42,7 +42,7 @@ dependencies:
version: 4.7.1
repository: https://kubernetes.github.io/ingress-nginx
- name: k8gb
version: v0.11.1
version: v0.11.2
repository: https://www.k8gb.io
- name: karma
version: 1.7.2
Expand All @@ -54,25 +54,25 @@ dependencies:
version: 2.11.2
repository: https://kedacore.github.io/charts
- name: kong
version: 2.25.0
version: 2.26.0
repository: https://charts.konghq.com
- name: kube-prometheus-stack
version: 48.2.3
version: 48.3.1
repository: https://prometheus-community.github.io/helm-charts
- name: linkerd2-cni
version: 30.8.3
version: 30.8.4
repository: https://helm.linkerd.io/stable
- name: linkerd-control-plane
version: 1.12.5
version: 1.12.6
repository: https://helm.linkerd.io/stable
- name: linkerd-crds
version: 1.6.1
repository: https://helm.linkerd.io/stable
- name: linkerd-viz
version: 30.8.5
version: 30.8.6
repository: https://helm.linkerd.io/stable
- name: loki
version: 5.9.2
version: 5.11.0
repository: https://grafana.github.io/helm-charts
- name: promtail
version: 6.14.1
Expand All @@ -99,22 +99,22 @@ dependencies:
version: 2.11.0
repository: https://bitnami-labs.github.io/sealed-secrets
- name: thanos
version: 12.10.1
version: 12.11.0
repository: https://charts.bitnami.com/bitnami
- name: tigera-operator
version: v3.26.1
repository: https://docs.projectcalico.org/charts
- name: traefik
version: 23.2.0
version: 24.0.0
repository: https://helm.traefik.io/traefik
- name: memcached
version: 6.5.6
repository: https://charts.bitnami.com/bitnami
- name: velero
version: 4.2.0
version: 4.4.1
repository: https://vmware-tanzu.github.io/helm-charts
- name: victoria-metrics-k8s-stack
version: 0.17.3
version: 0.17.4
repository: https://victoriametrics.github.io/helm-charts/
- name: yet-another-cloudwatch-exporter
version: 0.14.0
Expand Down
4 changes: 2 additions & 2 deletions modules/aws/velero.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ credentials:
useSecret: false
initContainers:
- name: velero-plugin-for-aws
image: velero/velero-plugin-for-aws:v1.7.0
image: velero/velero-plugin-for-aws:v1.7.1
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
name: plugins
- name: velero-plugin-for-csi
image: velero/velero-plugin-for-csi:v0.5.0
image: velero/velero-plugin-for-csi:v0.5.1
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
Expand Down
2 changes: 2 additions & 0 deletions modules/google/kube-prometheus.tf
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ kubeControllerManager:
enabled: false
kubeEtcd:
enabled: false
coreDns:
enabled: false
grafana:
sidecar:
dashboards:
Expand Down

0 comments on commit 90168a4

Please sign in to comment.