Updates
This commit is contained in:
parent
d29c9ec82c
commit
fa51de4fb6
@ -23,7 +23,7 @@ spec:
|
||||
chart:
|
||||
repository: https://helm.goharbor.io
|
||||
name: harbor
|
||||
version: 1.4.3
|
||||
version: 1.5.1
|
||||
maxHistory: 4
|
||||
skipCRDs: false
|
||||
valuesFrom:
|
||||
@ -33,7 +33,8 @@ spec:
|
||||
key: values.yaml
|
||||
optional: false
|
||||
values:
|
||||
logLevel: warn
|
||||
updateStrategy:
|
||||
type: Recreate
|
||||
portal:
|
||||
resources:
|
||||
requests:
|
||||
|
@ -33,7 +33,7 @@ spec:
|
||||
chart:
|
||||
repository: https://grafana.github.io/loki/charts
|
||||
name: loki-stack
|
||||
version: 0.40.1
|
||||
version: 2.0.2
|
||||
maxHistory: 4
|
||||
skipCRDs: false
|
||||
valuesFrom:
|
||||
@ -47,17 +47,7 @@ spec:
|
||||
enabled: "true"
|
||||
promtail:
|
||||
enabled: "true"
|
||||
loki:
|
||||
config:
|
||||
schema_config:
|
||||
configs:
|
||||
- from: "2018-04-15"
|
||||
index:
|
||||
period: 120h
|
||||
prefix: index_
|
||||
object_store: s3
|
||||
schema: v9
|
||||
store: boltdb
|
||||
|
||||
|
||||
---
|
||||
apiVersion: helm.fluxcd.io/v1
|
||||
@ -67,14 +57,12 @@ metadata:
|
||||
namespace: logging
|
||||
spec:
|
||||
chart:
|
||||
repository: https://kubernetes-charts.storage.googleapis.com
|
||||
repository: https://grafana.github.io/helm-charts
|
||||
name: grafana
|
||||
version: 5.5.7
|
||||
version: 6.1.3
|
||||
maxHistory: 4
|
||||
skipCRDs: false
|
||||
values:
|
||||
image:
|
||||
tag: 7.1.1
|
||||
admin:
|
||||
existingSecret: "grafana-credentials"
|
||||
userKey: username
|
||||
|
@ -46,7 +46,7 @@ spec:
|
||||
- --defaultentrypoints=http,https
|
||||
- --entrypoints=Name:https Address::443 TLS
|
||||
- --entrypoints=Name:http Address::80
|
||||
- --accesslog
|
||||
- --accesslog=true
|
||||
- --accesslog.format=json
|
||||
image: docker.io/traefik:1.7
|
||||
imagePullPolicy: IfNotPresent
|
||||
|
@ -24,7 +24,7 @@ resource "helm_release" "helm-operator" {
|
||||
repository = data.helm_repository.fluxcd.metadata[0].name
|
||||
chart = "helm-operator"
|
||||
|
||||
max_history = 4
|
||||
max_history = 3
|
||||
|
||||
set {
|
||||
name = "helm.versions"
|
||||
|
Loading…
Reference in New Issue
Block a user