This commit is contained in:
Marcus Noble 2020-11-07 13:29:37 +00:00
parent d29c9ec82c
commit fa51de4fb6
4 changed files with 9 additions and 20 deletions

View File

@ -23,7 +23,7 @@ spec:
chart: chart:
repository: https://helm.goharbor.io repository: https://helm.goharbor.io
name: harbor name: harbor
version: 1.4.3 version: 1.5.1
maxHistory: 4 maxHistory: 4
skipCRDs: false skipCRDs: false
valuesFrom: valuesFrom:
@ -33,7 +33,8 @@ spec:
key: values.yaml key: values.yaml
optional: false optional: false
values: values:
logLevel: warn updateStrategy:
type: Recreate
portal: portal:
resources: resources:
requests: requests:

View File

@ -33,7 +33,7 @@ spec:
chart: chart:
repository: https://grafana.github.io/loki/charts repository: https://grafana.github.io/loki/charts
name: loki-stack name: loki-stack
version: 0.40.1 version: 2.0.2
maxHistory: 4 maxHistory: 4
skipCRDs: false skipCRDs: false
valuesFrom: valuesFrom:
@ -47,17 +47,7 @@ spec:
enabled: "true" enabled: "true"
promtail: promtail:
enabled: "true" 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 apiVersion: helm.fluxcd.io/v1
@ -67,14 +57,12 @@ metadata:
namespace: logging namespace: logging
spec: spec:
chart: chart:
repository: https://kubernetes-charts.storage.googleapis.com repository: https://grafana.github.io/helm-charts
name: grafana name: grafana
version: 5.5.7 version: 6.1.3
maxHistory: 4 maxHistory: 4
skipCRDs: false skipCRDs: false
values: values:
image:
tag: 7.1.1
admin: admin:
existingSecret: "grafana-credentials" existingSecret: "grafana-credentials"
userKey: username userKey: username

View File

@ -46,7 +46,7 @@ spec:
- --defaultentrypoints=http,https - --defaultentrypoints=http,https
- --entrypoints=Name:https Address::443 TLS - --entrypoints=Name:https Address::443 TLS
- --entrypoints=Name:http Address::80 - --entrypoints=Name:http Address::80
- --accesslog - --accesslog=true
- --accesslog.format=json - --accesslog.format=json
image: docker.io/traefik:1.7 image: docker.io/traefik:1.7
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent

View File

@ -24,7 +24,7 @@ resource "helm_release" "helm-operator" {
repository = data.helm_repository.fluxcd.metadata[0].name repository = data.helm_repository.fluxcd.metadata[0].name
chart = "helm-operator" chart = "helm-operator"
max_history = 4 max_history = 3
set { set {
name = "helm.versions" name = "helm.versions"