Merge branch 'master' of ssh://git.tbrnt.ch:29418/tobru/gitops-tbrnt

This commit is contained in:
Tobias Brunner 2020-05-25 12:16:25 +02:00
commit 20efb05a9b
3 changed files with 6 additions and 6 deletions

View file

@ -2192,7 +2192,7 @@ spec:
- "20"
- --operation-processors
- "10"
image: argoproj/argocd:v1.5.4
image: argoproj/argocd:v1.5.5
imagePullPolicy: Always
livenessProbe:
httpGet:
@ -2246,7 +2246,7 @@ spec:
- cp
- /usr/local/bin/argocd-util
- /shared
image: argoproj/argocd:v1.5.4
image: argoproj/argocd:v1.5.5
imagePullPolicy: Always
name: copyutil
volumeMounts:
@ -2310,7 +2310,7 @@ spec:
- argocd-repo-server
- --redis
- argocd-redis:6379
image: argoproj/argocd:v1.5.4
image: argoproj/argocd:v1.5.5
imagePullPolicy: Always
livenessProbe:
initialDelaySeconds: 5
@ -2361,7 +2361,7 @@ spec:
- argocd-server
- --staticassets
- /shared/app
image: argoproj/argocd:v1.5.4
image: argoproj/argocd:v1.5.5
imagePullPolicy: Always
livenessProbe:
httpGet:

View file

@ -193,7 +193,7 @@ spec:
[]
containers:
- name: loki
image: "grafana/loki:1.4.1"
image: "grafana/loki:1.5.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/loki/loki.yaml"

View file

@ -429,7 +429,7 @@ spec:
serviceAccountName: promtail
containers:
- name: promtail
image: "grafana/promtail:1.4.1"
image: "grafana/promtail:1.5.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"