diff --git a/class/defaults.yml b/class/defaults.yml index d8b20c9e..ca222508 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -12,7 +12,7 @@ parameters: charts: loki: source: https://grafana-community.github.io/helm-charts - version: 18.5.4 + version: 20.4.1 images: loki: diff --git a/component/helm_presets.jsonnet b/component/helm_presets.jsonnet index 01b6df55..b3fe395d 100644 --- a/component/helm_presets.jsonnet +++ b/component/helm_presets.jsonnet @@ -153,18 +153,6 @@ assert std.member([ 'none', 'legacy', 'extra-small' ], params.preset) : 'params. }, }, }, - alertmanager: { - replicas: 3, - resources: { - limits: { - memory: '512Mi', - }, - requests: { - cpu: '250m', - memory: '256Mi', - }, - }, - }, overridesExporter: { replicas: 1, resources: { diff --git a/component/helm_values.jsonnet b/component/helm_values.jsonnet index dd303c17..06b2bfea 100644 --- a/component/helm_values.jsonnet +++ b/component/helm_values.jsonnet @@ -248,9 +248,6 @@ local ingress = com.makeMergeable({ // hardcoded removal of rollout-operator local hardRestrictions = com.makeMergeable({ - minio: { - enabled: false, - }, rollout_operator: { enabled: false, }, diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrole.yaml index 21df46bb..9d89720b 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-clusterrole rules: - apiGroups: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml index 69466d48..b71580b4 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/pdb.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/pdb.yaml index 541212b2..b43f7f7c 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/pdb.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/pdb.yaml @@ -5,6 +5,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-chunks-cache namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/service.yaml index 16824454..0d699737 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-chunks-cache namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index e3310eb2..cee76c01 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-chunks-cache name: defaults-loki-chunks-cache namespace: defaults @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: docker.io/prom/memcached-exporter:v0.16.0 + image: docker.io/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/service.yaml index d4385740..09068aee 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-compactor namespace: defaults spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: defaults-loki-compactor-headless diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/workload.yaml index e8eebd6a..77cd5a63 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-compactor namespace: defaults spec: @@ -29,8 +29,6 @@ spec: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -60,7 +58,7 @@ spec: envFrom: - secretRef: name: defaults-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -134,7 +132,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: defaults-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/config.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/config.yaml index d186a5a3..200de963 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/config.yaml @@ -130,7 +130,7 @@ metadata: labels: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: loki namespace: defaults diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/service.yaml index c2429de5..59a672a8 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-distributor namespace: defaults spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: defaults-loki-distributor-headless diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/workload.yaml index 35bfd6ea..0363352a 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-distributor namespace: defaults spec: @@ -31,8 +31,6 @@ spec: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -62,7 +60,7 @@ spec: envFrom: - secretRef: name: defaults-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -136,7 +134,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: defaults-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/configmap.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/configmap.yaml index 8f6bfc25..8f2d59e6 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/configmap.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/configmap.yaml @@ -89,9 +89,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on receiving and response the response to the client" valueIndex: 4 - math: - enabled: true - div: 1000 labels: - name: "host" lineIndex: 0 @@ -112,9 +109,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on establishing a connection with the upstream server" valueIndex: 8 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -139,9 +133,6 @@ data: help: "The time spent on receiving the response header from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 9 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -166,9 +157,6 @@ data: help: "The time spent on receiving the response from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 10 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -210,11 +198,12 @@ data: \ # When header is empty, set noop=\n default $http_x_query_tags; # Otherwise,\ \ preserve the original value\n }\n\n server {\n listen 8080;\n\ \ listen [::]:8080;\n\n location = / {\n \n return\ - \ 200 'OK';\n auth_basic off;\n }\n\n location = /stub_status {\n \ - \ stub_status on;\n satisfy any;\n access_log off;\n allow\ - \ 127.0.0.1;\n deny all;\n server_tokens on; # expose nginx version\n\ - \ }\n\n ########################################################\n #\ - \ Configure backend targets\n location ^~ /ui {\n \n set $backend\ + \ 200 'OK';\n auth_basic off;\n }\n\n location = /livez {\n access_log\ + \ off;\n return 200 'OK';\n auth_basic off;\n }\n\n location =\ + \ /stub_status {\n stub_status on;\n satisfy any;\n access_log\ + \ off;\n allow 127.0.0.1;\n deny all;\n server_tokens on; # expose\ + \ nginx version\n }\n\n ########################################################\n\ + \ # Configure backend targets\n location ^~ /ui {\n \n set $backend\ \ \"http://defaults-loki-querier.defaults.svc.cluster.local:3100\";\n \ \ proxy_pass $backend$request_uri;\n }\n\n # Distributor\n location\ \ = /api/prom/push {\n \n set $backend \"http://defaults-loki-distributor.defaults.svc.cluster.local:3100\"\ @@ -282,7 +271,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-gateway namespace: defaults diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/deployment.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/deployment.yaml index 903fa91d..b8ecec44 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/deployment.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/deployment.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-gateway namespace: defaults spec: @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: b5a9bab97896fd78c11a9ea9263bd757d47c2e6d49d83ae6de1d205fbb0cfd95 + checksum/config: db5b69feeb3ffed8780f88e69f5e08fa90ec93f3bbd3f0dda94c9fa517c29b1d labels: app.kubernetes.io/component: gateway app.kubernetes.io/instance: defaults @@ -72,7 +72,7 @@ spec: - http://127.0.0.1:8080/stub_status - --preset - loki - image: ghcr.io/jkroepke/access-log-exporter:0.4.8 + image: ghcr.io/jkroepke/access-log-exporter:1.0.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service-exporter.yaml index aeab83bb..f1323518 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-gateway-exporter namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service.yaml index a952b797..e19024eb 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' name: defaults-loki-gateway namespace: defaults diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/serviceaccount.yaml index c6d11fce..73a57e39 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-gateway namespace: defaults diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/service.yaml index b9033b9a..ad273b90 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-index-gateway namespace: defaults spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: defaults-loki-index-gateway-headless diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/workload.yaml index fc767367..23452121 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-index-gateway namespace: defaults spec: @@ -27,9 +27,6 @@ spec: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -59,7 +56,7 @@ spec: envFrom: - secretRef: name: defaults-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -133,7 +130,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: defaults-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/pdb.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/pdb.yaml index 2ebd11a5..894b0506 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/pdb.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-ingester namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/service.yaml index d84950b8..2114ebf3 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-ingester namespace: defaults spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: defaults-loki-ingester-headless diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/workload.yaml index e83e9522..b6f33f0a 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-ingester namespace: defaults spec: @@ -29,8 +29,6 @@ spec: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -61,7 +59,7 @@ spec: envFrom: - secretRef: name: defaults-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -144,7 +142,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: defaults-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/memcached/serviceaccount.yaml index 33b474eb..d627728c 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: memcached app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-memcached namespace: defaults diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml index 215ddfb3..9923387e 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-loki-rules namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml index 060c2a11..cdc567e2 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/service.yaml index a9f5c6e9..2971c7ce 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-overrides-exporter namespace: defaults spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: defaults-loki-overrides-exporter-headless diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/workload.yaml index 3117d8d0..34081276 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-overrides-exporter namespace: defaults spec: @@ -26,9 +26,6 @@ spec: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -58,7 +55,7 @@ spec: envFrom: - secretRef: name: defaults-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -132,7 +129,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: defaults-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/service.yaml index 49fd7140..5402aedd 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-querier namespace: defaults spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: defaults-loki-querier-headless diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/workload.yaml index 65fb4e42..1c080209 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-querier namespace: defaults spec: @@ -32,8 +32,6 @@ spec: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -63,7 +61,7 @@ spec: envFrom: - secretRef: name: defaults-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -146,7 +144,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: defaults-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/service.yaml index 07214d88..b0d6c3b5 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-query-frontend namespace: defaults spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: defaults-loki-query-frontend-headless diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/workload.yaml index 854d9835..c91114f7 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-query-frontend namespace: defaults spec: @@ -31,9 +31,6 @@ spec: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -63,7 +60,7 @@ spec: envFrom: - secretRef: name: defaults-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -137,7 +134,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: defaults-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/pdb.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/pdb.yaml index ca990494..4f087d09 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/pdb.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-query-scheduler namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/service.yaml index d5f07b64..19edd6ab 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-query-scheduler namespace: defaults spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: defaults-loki-query-scheduler-headless diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/workload.yaml index 9603db20..1ca08754 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-query-scheduler namespace: defaults spec: @@ -31,9 +31,6 @@ spec: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -61,7 +58,7 @@ spec: envFrom: - secretRef: name: defaults-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -129,7 +126,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: defaults-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/pdb.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/pdb.yaml index 00d57ee7..93f29f93 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/pdb.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/pdb.yaml @@ -5,6 +5,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-results-cache namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/service.yaml index a24e62f9..c8b2ef51 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-results-cache namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/statefulset.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/statefulset.yaml index 7959c647..1350a5fa 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/statefulset.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-results-cache name: defaults-loki-results-cache namespace: defaults @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: docker.io/prom/memcached-exporter:v0.16.0 + image: docker.io/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/runtime-configmap.yaml index 85d185f1..0470c073 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/runtime-configmap.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -7,7 +7,7 @@ metadata: labels: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 - name: loki-runtime + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 + name: defaults-loki-runtime namespace: defaults diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/service-memberlist.yaml index ff85288e..776551dd 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/service-memberlist.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/service-memberlist.yaml @@ -5,8 +5,8 @@ metadata: labels: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki-memberlist namespace: defaults spec: diff --git a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/serviceaccount.yaml index 4d8dd652..47d0dec8 100644 --- a/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/serviceaccount.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: defaults-loki namespace: defaults diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrole.yaml index ca460b0c..7f80ed73 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-clusterrole rules: - apiGroups: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml index 2f2cb631..5d6ca914 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/pdb.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/pdb.yaml index 50330101..5f3294cf 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/pdb.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/pdb.yaml @@ -5,6 +5,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-chunks-cache namespace: extra-config spec: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/service.yaml index b2eefa80..6f1bc675 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-chunks-cache namespace: extra-config spec: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index 3fb10914..33016fcd 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-chunks-cache name: extra-config-loki-chunks-cache namespace: extra-config @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: dockerhub.vshn.net/prom/memcached-exporter:v0.16.0 + image: dockerhub.vshn.net/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/service.yaml index 2c598254..b7f79c08 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-compactor namespace: extra-config spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-compactor-headless diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/workload.yaml index b55e6cb4..31557c53 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-compactor namespace: extra-config spec: @@ -29,8 +29,6 @@ spec: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -60,7 +58,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -131,7 +129,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/config.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/config.yaml index 90c3fa38..f5905eb6 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/config.yaml @@ -145,7 +145,7 @@ metadata: labels: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: loki namespace: extra-config diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/service.yaml index 55a679d9..3f09d48d 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-distributor namespace: extra-config spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-distributor-headless diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/workload.yaml index 914b2ace..acf45589 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-distributor namespace: extra-config spec: @@ -31,8 +31,6 @@ spec: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -63,7 +61,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -134,7 +132,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/configmap.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/configmap.yaml index 40ace037..4160209f 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/configmap.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/configmap.yaml @@ -89,9 +89,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on receiving and response the response to the client" valueIndex: 4 - math: - enabled: true - div: 1000 labels: - name: "host" lineIndex: 0 @@ -112,9 +109,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on establishing a connection with the upstream server" valueIndex: 8 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -139,9 +133,6 @@ data: help: "The time spent on receiving the response header from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 9 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -166,9 +157,6 @@ data: help: "The time spent on receiving the response from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 10 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -212,9 +200,10 @@ data: \ 8080;\n listen [::]:8080;\n auth_basic \"\ Loki\";\n auth_basic_user_file /etc/nginx/secrets/.htpasswd;\n\n location\ \ = / {\n \n return 200 'OK';\n auth_basic off;\n }\n\n location\ - \ = /stub_status {\n stub_status on;\n satisfy any;\n access_log\ - \ off;\n allow 127.0.0.1;\n deny all;\n server_tokens on; # expose\ - \ nginx version\n }\n\n ########################################################\n\ + \ = /livez {\n access_log off;\n return 200 'OK';\n auth_basic\ + \ off;\n }\n\n location = /stub_status {\n stub_status on;\n satisfy\ + \ any;\n access_log off;\n allow 127.0.0.1;\n deny all;\n \ + \ server_tokens on; # expose nginx version\n }\n\n ########################################################\n\ \ # Configure backend targets\n location ^~ /ui {\n \n set $backend\ \ \"http://extra-config-loki-querier.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Distributor\n\ @@ -283,7 +272,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-gateway namespace: extra-config diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/deployment.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/deployment.yaml index b943dd19..95e6e959 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/deployment.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/deployment.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-gateway namespace: extra-config spec: @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 83d350b2361d8681ea3e3708fc909fc9818924d518633174308af18511ae2583 + checksum/config: 5f4d59097813112acf0e9a7e2645dd417ecc2b67f59c1dae68d0ae5bd287e69b labels: app.kubernetes.io/component: gateway app.kubernetes.io/instance: extra-config @@ -65,6 +65,7 @@ spec: name: config - mountPath: /etc/nginx/secrets name: auth + readOnly: true - mountPath: /tmp name: tmp - mountPath: /docker-entrypoint.d diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/ingress.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/ingress.yaml index 3a06a7a0..9ab9f45c 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/ingress.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/ingress.yaml @@ -5,9 +5,9 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 + app.kubernetes.io/version: 3.7.9 custom-label: my-label - helm.sh/chart: loki-18.5.4 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-gateway namespace: extra-config spec: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service-exporter.yaml index c13e31c3..1c48c316 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-gateway-exporter namespace: extra-config spec: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service.yaml index deb0d1aa..bd7682ed 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' name: extra-config-loki-gateway namespace: extra-config diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/serviceaccount.yaml index eb02524a..391167e5 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-gateway namespace: extra-config diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/service.yaml index ca9ed32e..4f40e99b 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-index-gateway namespace: extra-config spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-index-gateway-headless diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/workload.yaml index 6c2e2fd7..995f5bfb 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-index-gateway namespace: extra-config spec: @@ -27,9 +27,6 @@ spec: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -59,7 +56,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -130,7 +127,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/pdb-zone.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/pdb-zone.yaml index 6009fd1d..19a6c4f1 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/pdb-zone.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/pdb-zone.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-ingester-rollout namespace: extra-config spec: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/service.yaml index 75801880..6bed4951 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-ingester namespace: extra-config spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-ingester-headless @@ -75,8 +75,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-ingester-zone-a-headless @@ -112,8 +112,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-ingester-zone-b-headless @@ -149,8 +149,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-ingester-zone-c-headless diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/workload.yaml index 454e3b04..12a4ed4c 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/workload.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: ingester-zone-a rollout-group: ingester name: extra-config-loki-ingester-zone-a @@ -35,8 +35,6 @@ spec: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 name: ingester-zone-a rollout-group: ingester spec: @@ -76,7 +74,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -156,7 +154,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data @@ -172,8 +170,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: ingester-zone-b rollout-group: ingester name: extra-config-loki-ingester-zone-b @@ -200,8 +198,6 @@ spec: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 name: ingester-zone-b rollout-group: ingester spec: @@ -241,7 +237,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -321,7 +317,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data @@ -337,8 +333,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: ingester-zone-c rollout-group: ingester name: extra-config-loki-ingester-zone-c @@ -365,8 +361,6 @@ spec: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 name: ingester-zone-c rollout-group: ingester spec: @@ -406,7 +400,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -486,7 +480,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/memcached/serviceaccount.yaml index c26efce3..4de09b75 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: memcached app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-memcached namespace: extra-config diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/service.yaml index 4d1595a6..d7bbaa35 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-overrides-exporter namespace: extra-config spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-overrides-exporter-headless diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/workload.yaml index ea47d681..18b51c63 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-overrides-exporter namespace: extra-config spec: @@ -26,9 +26,6 @@ spec: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -58,7 +55,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -129,7 +126,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/pattern-ingester/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/pattern-ingester/service.yaml new file mode 100644 index 00000000..cc584751 --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/pattern-ingester/service.yaml @@ -0,0 +1,68 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: null + labels: + app.kubernetes.io/component: pattern-ingester + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 + name: extra-config-loki-pattern-ingester + namespace: extra-config +spec: + ports: + - name: http-metrics + port: 3100 + protocol: TCP + targetPort: http-metrics + - name: grpc + port: 9095 + protocol: TCP + targetPort: grpc + - name: grpclb + port: 9096 + protocol: TCP + targetPort: grpc + publishNotReadyAddresses: true + selector: + app.kubernetes.io/component: pattern-ingester + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: null + labels: + app.kubernetes.io/component: pattern-ingester + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 + prometheus.io/service-monitor: 'false' + variant: headless + name: extra-config-loki-pattern-ingester-headless + namespace: extra-config +spec: + clusterIP: None + ports: + - name: http-metrics + port: 3100 + protocol: TCP + targetPort: http-metrics + - name: grpc + port: 9095 + protocol: TCP + targetPort: grpc + - name: grpclb + port: 9096 + protocol: TCP + targetPort: grpc + publishNotReadyAddresses: true + selector: + app.kubernetes.io/component: pattern-ingester + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + type: ClusterIP diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/pattern-ingester/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/pattern-ingester/workload.yaml index f713dc37..583dd1a6 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/pattern-ingester/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/pattern-ingester/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: pattern-ingester app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-pattern-ingester namespace: extra-config spec: @@ -28,8 +28,6 @@ spec: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -57,7 +55,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -122,7 +120,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/service.yaml index ee59a62d..c37db57f 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-querier namespace: extra-config spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-querier-headless diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/workload.yaml index 95beee7c..30a4a92e 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-querier namespace: extra-config spec: @@ -32,8 +32,6 @@ spec: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -64,7 +62,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -144,7 +142,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/service.yaml index 3494c60e..8ccadf65 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-query-frontend namespace: extra-config spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-query-frontend-headless diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/workload.yaml index 7f7ab77d..0e97047b 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-query-frontend namespace: extra-config spec: @@ -31,9 +31,6 @@ spec: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -63,7 +60,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -134,7 +131,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/pdb.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/pdb.yaml index 5d12b51b..99ed9d2d 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/pdb.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-query-scheduler namespace: extra-config spec: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/service.yaml index 25371c0c..013ff049 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-query-scheduler namespace: extra-config spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-query-scheduler-headless diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/workload.yaml index b78a65af..879d7571 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-query-scheduler namespace: extra-config spec: @@ -31,9 +31,6 @@ spec: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -61,7 +58,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -126,7 +123,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/pdb.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/pdb.yaml index f029c4b5..8f43ffc7 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/pdb.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/pdb.yaml @@ -5,6 +5,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-results-cache namespace: extra-config spec: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/service.yaml index 6fd366b3..7ae0a4bf 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-results-cache namespace: extra-config spec: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/statefulset.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/statefulset.yaml index 250502cd..242d3d9c 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/statefulset.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-results-cache name: extra-config-loki-results-cache namespace: extra-config @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: dockerhub.vshn.net/prom/memcached-exporter:v0.16.0 + image: dockerhub.vshn.net/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/service.yaml index 302f8d6a..ab0f722d 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/service.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: ruler app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-ruler namespace: extra-config spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: ruler app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: extra-config-loki-ruler-headless diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/workload.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/workload.yaml index c7169779..c39307c0 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/workload.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: ruler app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-ruler namespace: extra-config spec: @@ -28,8 +28,6 @@ spec: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -59,7 +57,7 @@ spec: envFrom: - secretRef: name: extra-config-bucket-secret - image: dockerhub.vshn.net/grafana/loki:3.7.4 + image: dockerhub.vshn.net/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -130,7 +128,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: extra-config-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/runtime-configmap.yaml index aba0ad2f..41237b43 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/runtime-configmap.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -7,7 +7,7 @@ metadata: labels: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 - name: loki-runtime + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 + name: extra-config-loki-runtime namespace: extra-config diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/service-memberlist.yaml index c25af7b1..62d68089 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/service-memberlist.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/service-memberlist.yaml @@ -5,8 +5,8 @@ metadata: labels: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki-memberlist namespace: extra-config spec: diff --git a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/serviceaccount.yaml index 6653c01f..b1ad0f6c 100644 --- a/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/serviceaccount.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: extra-config-loki namespace: extra-config diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrole.yaml index 0ac61542..2ecb8c1f 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-clusterrole rules: - apiGroups: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml index 5afdef81..58c5cf65 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/pdb.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/pdb.yaml index 2fa3958a..47f0e046 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/pdb.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: backend app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-backend namespace: legacy spec: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/service.yaml index 7119ea63..cf666760 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: backend app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-backend namespace: legacy spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: backend app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: legacy-loki-backend-headless diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/workload.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/workload.yaml index ef64d688..862b5d12 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/workload.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: backend app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: loki-backend namespace: legacy spec: @@ -32,8 +32,6 @@ spec: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -64,7 +62,7 @@ spec: envFrom: - secretRef: name: legacy-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -137,7 +135,7 @@ spec: value: INFO - name: HEALTH_PORT value: '8080' - image: docker.io/kiwigrid/k8s-sidecar:2.8.1 + image: docker.io/kiwigrid/k8s-sidecar:2.14.3 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 @@ -193,7 +191,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: legacy-loki-runtime name: runtime-config - emptyDir: {} name: sc-rules-volume diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/service.yaml index b402f149..338f606f 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-chunks-cache namespace: legacy spec: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index 228a34d1..350b64e1 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-chunks-cache name: legacy-loki-chunks-cache namespace: legacy @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: docker.io/prom/memcached-exporter:v0.16.0 + image: docker.io/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/config.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/config.yaml index 40025d0f..f85c4844 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/config.yaml @@ -130,7 +130,7 @@ metadata: labels: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: loki namespace: legacy diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/configmap.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/configmap.yaml index e376afd5..874a7956 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/configmap.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/configmap.yaml @@ -89,9 +89,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on receiving and response the response to the client" valueIndex: 4 - math: - enabled: true - div: 1000 labels: - name: "host" lineIndex: 0 @@ -112,9 +109,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on establishing a connection with the upstream server" valueIndex: 8 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -139,9 +133,6 @@ data: help: "The time spent on receiving the response header from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 9 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -166,9 +157,6 @@ data: help: "The time spent on receiving the response from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 10 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -210,11 +198,12 @@ data: ; # When header is empty, set noop=\n default $http_x_query_tags;\ \ # Otherwise, preserve the original value\n }\n\n server {\n listen \ \ 8080;\n listen [::]:8080;\n\n location = / {\n \ - \ \n return 200 'OK';\n auth_basic off;\n }\n\n location = /stub_status\ - \ {\n stub_status on;\n satisfy any;\n access_log off;\n allow\ - \ 127.0.0.1;\n deny all;\n server_tokens on; # expose nginx version\n\ - \ }\n\n ########################################################\n #\ - \ Configure backend targets\n location ^~ /ui {\n \n set $backend\ + \ \n return 200 'OK';\n auth_basic off;\n }\n\n location = /livez\ + \ {\n access_log off;\n return 200 'OK';\n auth_basic off;\n \ + \ }\n\n location = /stub_status {\n stub_status on;\n satisfy any;\n\ + \ access_log off;\n allow 127.0.0.1;\n deny all;\n server_tokens\ + \ on; # expose nginx version\n }\n\n ########################################################\n\ + \ # Configure backend targets\n location ^~ /ui {\n \n set $backend\ \ \"http://legacy-loki-read.legacy.svc.cluster.local:3100\";\n proxy_pass\ \ $backend$request_uri;\n }\n\n # Distributor\n location = /api/prom/push\ \ {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ @@ -282,7 +271,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-gateway namespace: legacy diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/deployment.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/deployment.yaml index 73cc9a26..657027c0 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/deployment.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/deployment.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-gateway namespace: legacy spec: @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: a58a96ad62c673d3fa0143544e2c7ab8d5cecd30b357caf3b9df3fc599abf6d2 + checksum/config: 01fd31544c6c32e91d09fcf7a8525fece9fabdab2fc3c054f326a310cf11140f labels: app.kubernetes.io/component: gateway app.kubernetes.io/instance: legacy @@ -72,7 +72,7 @@ spec: - http://127.0.0.1:8080/stub_status - --preset - loki - image: ghcr.io/jkroepke/access-log-exporter:0.4.8 + image: ghcr.io/jkroepke/access-log-exporter:1.0.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service-exporter.yaml index 5232f8bc..d7dae25e 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-gateway-exporter namespace: legacy spec: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service.yaml index e5c7656c..f7cce2c3 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' name: legacy-loki-gateway namespace: legacy diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/serviceaccount.yaml index db129aa8..73777ca6 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-gateway namespace: legacy diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/memcached/serviceaccount.yaml index 89f7ad1d..834df402 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: memcached app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-memcached namespace: legacy diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml index dca16168..53a9cb24 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-loki-rules namespace: legacy spec: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml index 7eb732c1..09911c85 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki namespace: legacy spec: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/pdb.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/pdb.yaml index 23449d16..0e80acda 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/pdb.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: read app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-read namespace: legacy spec: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/service.yaml index 240b4cec..89c5e381 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: read app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-read namespace: legacy spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: read app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: legacy-loki-read-headless diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/workload.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/workload.yaml index 01005351..42c84b2f 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/workload.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: read app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: loki-read namespace: legacy spec: @@ -31,8 +31,6 @@ spec: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -62,7 +60,7 @@ spec: envFrom: - secretRef: name: legacy-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -133,7 +131,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: legacy-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/service.yaml index 25963097..7a5d8bd4 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-results-cache namespace: legacy spec: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/statefulset.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/statefulset.yaml index 6f0afbde..db013a2c 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/statefulset.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-results-cache name: legacy-loki-results-cache namespace: legacy @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: docker.io/prom/memcached-exporter:v0.16.0 + image: docker.io/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/runtime-configmap.yaml index 4946a871..6b04f6bc 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/runtime-configmap.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -7,7 +7,7 @@ metadata: labels: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 - name: loki-runtime + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 + name: legacy-loki-runtime namespace: legacy diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/service-memberlist.yaml index 0b9283eb..af8eaa7b 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/service-memberlist.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/service-memberlist.yaml @@ -5,8 +5,8 @@ metadata: labels: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-memberlist namespace: legacy spec: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/serviceaccount.yaml index a530053a..dd0b88d2 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/serviceaccount.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki namespace: legacy diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/pdb.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/pdb.yaml index be1bd1af..61765c09 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/pdb.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: write app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-write namespace: legacy spec: diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/service.yaml index 6633b42c..bad01de1 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: write app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: legacy-loki-write namespace: legacy spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: write app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: legacy-loki-write-headless diff --git a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/workload.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/workload.yaml index 4ddac8e7..02de2f77 100644 --- a/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/workload.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: write app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: loki-write namespace: legacy spec: @@ -29,8 +29,6 @@ spec: app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -60,7 +58,7 @@ spec: envFrom: - secretRef: name: legacy-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -132,7 +130,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: legacy-loki-runtime name: runtime-config updateStrategy: rollingUpdate: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrole.yaml index 1b50fbc0..cd7d2c9a 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-clusterrole rules: - apiGroups: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml index e40921dc..950ed232 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/pdb.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/pdb.yaml index 4898748f..cbc1bff5 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/pdb.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/pdb.yaml @@ -5,6 +5,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-chunks-cache namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/service.yaml index cdc46972..82a5c1d1 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-chunks-cache namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index a4dffeef..74855c07 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-chunks-cache name: openshift-loki-chunks-cache namespace: openshift @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: docker.io/prom/memcached-exporter:v0.16.0 + image: docker.io/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/service.yaml index 032097d3..37485d1c 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-compactor namespace: openshift spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: openshift-loki-compactor-headless diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/workload.yaml index 667256fb..31f22162 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-compactor namespace: openshift spec: @@ -29,8 +29,6 @@ spec: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -60,7 +58,7 @@ spec: envFrom: - secretRef: name: openshift-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -131,7 +129,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: openshift-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/config.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/config.yaml index 39af0ee6..4c731e9b 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/config.yaml @@ -139,7 +139,7 @@ metadata: labels: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: loki namespace: openshift diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/service.yaml index e78b9e03..e5a85936 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-distributor namespace: openshift spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: openshift-loki-distributor-headless diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/workload.yaml index 2cb7f315..dc9ae8d7 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-distributor namespace: openshift spec: @@ -31,8 +31,6 @@ spec: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -62,7 +60,7 @@ spec: envFrom: - secretRef: name: openshift-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -133,7 +131,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: openshift-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/configmap.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/configmap.yaml index 5b08250a..9292b7c7 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/configmap.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/configmap.yaml @@ -89,9 +89,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on receiving and response the response to the client" valueIndex: 4 - math: - enabled: true - div: 1000 labels: - name: "host" lineIndex: 0 @@ -112,9 +109,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on establishing a connection with the upstream server" valueIndex: 8 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -139,9 +133,6 @@ data: help: "The time spent on receiving the response header from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 9 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -166,9 +157,6 @@ data: help: "The time spent on receiving the response from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 10 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -212,9 +200,10 @@ data: \ 8080;\n listen [::]:8080;\n auth_basic \"\ Loki\";\n auth_basic_user_file /etc/nginx/secrets/.htpasswd;\n\n location\ \ = / {\n \n return 200 'OK';\n auth_basic off;\n }\n\n location\ - \ = /stub_status {\n stub_status on;\n satisfy any;\n access_log\ - \ off;\n allow 127.0.0.1;\n deny all;\n server_tokens on; # expose\ - \ nginx version\n }\n\n ########################################################\n\ + \ = /livez {\n access_log off;\n return 200 'OK';\n auth_basic\ + \ off;\n }\n\n location = /stub_status {\n stub_status on;\n satisfy\ + \ any;\n access_log off;\n allow 127.0.0.1;\n deny all;\n \ + \ server_tokens on; # expose nginx version\n }\n\n ########################################################\n\ \ # Configure backend targets\n location ^~ /ui {\n \n set $backend\ \ \"http://openshift-loki-querier.openshift.svc.cluster.local:3100\";\n \ \ proxy_pass $backend$request_uri;\n }\n\n # Distributor\n location\ @@ -283,7 +272,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-gateway namespace: openshift diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/deployment.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/deployment.yaml index fedb43fb..9a391d0e 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/deployment.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/deployment.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-gateway namespace: openshift spec: @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 0ebef6b14e99d83bac4cca76683b535f2665f12b43c304aa976a8bc51efb8ae4 + checksum/config: e88cd0cc780db26fe238aabe973455ddb4b08ae05c4c11a45289140059e4d2fc labels: app.kubernetes.io/component: gateway app.kubernetes.io/instance: openshift @@ -65,6 +65,7 @@ spec: name: config - mountPath: /etc/nginx/secrets name: auth + readOnly: true - mountPath: /tmp name: tmp - mountPath: /docker-entrypoint.d @@ -74,7 +75,7 @@ spec: - http://127.0.0.1:8080/stub_status - --preset - loki - image: ghcr.io/jkroepke/access-log-exporter:0.4.8 + image: ghcr.io/jkroepke/access-log-exporter:1.0.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/ingress.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/ingress.yaml index 288219d9..1554838e 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/ingress.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/ingress.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-gateway namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service-exporter.yaml index 92a5b88a..f2925790 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-gateway-exporter namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service.yaml index 40d08751..ba10e5d6 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' name: openshift-loki-gateway namespace: openshift diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/serviceaccount.yaml index c0f3e76e..17175063 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-gateway namespace: openshift diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/service.yaml index 994c795c..6f991328 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-index-gateway namespace: openshift spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: openshift-loki-index-gateway-headless diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/workload.yaml index f92c4c05..1d123c2f 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-index-gateway namespace: openshift spec: @@ -27,9 +27,6 @@ spec: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -59,7 +56,7 @@ spec: envFrom: - secretRef: name: openshift-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -130,7 +127,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: openshift-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/pdb.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/pdb.yaml index b7888fee..3fbb2fe0 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/pdb.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-ingester namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/service.yaml index 9aa87b6e..bf94b94e 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-ingester namespace: openshift spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: openshift-loki-ingester-headless diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/workload.yaml index 138b19a6..632c8d9c 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-ingester namespace: openshift spec: @@ -29,8 +29,6 @@ spec: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -61,7 +59,7 @@ spec: envFrom: - secretRef: name: openshift-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -141,7 +139,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: openshift-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/memcached/serviceaccount.yaml index c2e88765..8bfdbf19 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: memcached app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-memcached namespace: openshift diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml index 2215b23b..ce73ffaa 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-loki-rules namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml index fb1dc896..0f936006 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/service.yaml index c4070550..35d4314b 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-overrides-exporter namespace: openshift spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: openshift-loki-overrides-exporter-headless diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/workload.yaml index 9d639820..62e17db6 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-overrides-exporter namespace: openshift spec: @@ -26,9 +26,6 @@ spec: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -58,7 +55,7 @@ spec: envFrom: - secretRef: name: openshift-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -129,7 +126,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: openshift-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/service.yaml index 240747ae..eb020b0e 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-querier namespace: openshift spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: openshift-loki-querier-headless diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/workload.yaml index b0ff6cc5..f5005377 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-querier namespace: openshift spec: @@ -32,8 +32,6 @@ spec: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -63,7 +61,7 @@ spec: envFrom: - secretRef: name: openshift-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -143,7 +141,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: openshift-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/service.yaml index 088ee721..736ede9c 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-query-frontend namespace: openshift spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: openshift-loki-query-frontend-headless diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/workload.yaml index 0d3a02f2..0ee771e9 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-query-frontend namespace: openshift spec: @@ -31,9 +31,6 @@ spec: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -63,7 +60,7 @@ spec: envFrom: - secretRef: name: openshift-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -134,7 +131,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: openshift-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/pdb.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/pdb.yaml index 09b36ade..990d6b65 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/pdb.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-query-scheduler namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/service.yaml index 67d5f5f3..3fc933c1 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-query-scheduler namespace: openshift spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: openshift-loki-query-scheduler-headless diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/workload.yaml index f2a2fd6f..d70f4c96 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-query-scheduler namespace: openshift spec: @@ -31,9 +31,6 @@ spec: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -61,7 +58,7 @@ spec: envFrom: - secretRef: name: openshift-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -126,7 +123,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: openshift-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/pdb.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/pdb.yaml index c68cabdd..bf2f2202 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/pdb.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/pdb.yaml @@ -5,6 +5,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-results-cache namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/service.yaml index 499caa75..18eb045d 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-results-cache namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/statefulset.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/statefulset.yaml index 40958401..d3a2a494 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/statefulset.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-results-cache name: openshift-loki-results-cache namespace: openshift @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: docker.io/prom/memcached-exporter:v0.16.0 + image: docker.io/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/runtime-configmap.yaml index f868aa32..e46ca8a0 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/runtime-configmap.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -7,7 +7,7 @@ metadata: labels: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 - name: loki-runtime + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 + name: openshift-loki-runtime namespace: openshift diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/service-memberlist.yaml index 4bcaad05..939e719e 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/service-memberlist.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/service-memberlist.yaml @@ -5,8 +5,8 @@ metadata: labels: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki-memberlist namespace: openshift spec: diff --git a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/serviceaccount.yaml index e796bc9c..83623843 100644 --- a/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/serviceaccount.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: openshift-loki namespace: openshift diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrole.yaml index 39b096e5..bd01987b 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-clusterrole rules: - apiGroups: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml index 365d46a6..7c285439 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/pdb.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/pdb.yaml index f3fdcb1f..d050fabf 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/pdb.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/pdb.yaml @@ -5,6 +5,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-chunks-cache namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/service.yaml index d6d0937a..49c54650 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-chunks-cache namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index 98fedfaa..d5b9702f 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-chunks-cache app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-chunks-cache name: prometheus-loki-chunks-cache namespace: prometheus @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: docker.io/prom/memcached-exporter:v0.16.0 + image: docker.io/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/service.yaml index ab6784e3..a229c14c 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-compactor namespace: prometheus spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: prometheus-loki-compactor-headless diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/workload.yaml index 3c66dc1c..4b85755a 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: compactor app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-compactor namespace: prometheus spec: @@ -29,8 +29,6 @@ spec: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -60,7 +58,7 @@ spec: envFrom: - secretRef: name: prometheus-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -134,7 +132,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: prometheus-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/config.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/config.yaml index c88a3755..d16bb6bf 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/config.yaml @@ -130,7 +130,7 @@ metadata: labels: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: loki namespace: prometheus diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/service.yaml index da0ccbf1..a1018ef8 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-distributor namespace: prometheus spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: prometheus-loki-distributor-headless diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/workload.yaml index ebd1c758..213f4e4d 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: distributor app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-distributor namespace: prometheus spec: @@ -31,8 +31,6 @@ spec: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -62,7 +60,7 @@ spec: envFrom: - secretRef: name: prometheus-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -136,7 +134,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: prometheus-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/configmap.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/configmap.yaml index a33c1bb2..10549f5e 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/configmap.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/configmap.yaml @@ -89,9 +89,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on receiving and response the response to the client" valueIndex: 4 - math: - enabled: true - div: 1000 labels: - name: "host" lineIndex: 0 @@ -112,9 +109,6 @@ data: buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] help: "The time spent on establishing a connection with the upstream server" valueIndex: 8 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -139,9 +133,6 @@ data: help: "The time spent on receiving the response header from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 9 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -166,9 +157,6 @@ data: help: "The time spent on receiving the response from the upstream server" buckets: [ .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10 ] valueIndex: 10 - math: - enabled: true - div: 1000 upstream: enabled: true addrLineIndex: 7 @@ -210,11 +198,12 @@ data: \ # When header is empty, set noop=\n default $http_x_query_tags; # Otherwise,\ \ preserve the original value\n }\n\n server {\n listen 8080;\n\ \ listen [::]:8080;\n\n location = / {\n \n return\ - \ 200 'OK';\n auth_basic off;\n }\n\n location = /stub_status {\n \ - \ stub_status on;\n satisfy any;\n access_log off;\n allow\ - \ 127.0.0.1;\n deny all;\n server_tokens on; # expose nginx version\n\ - \ }\n\n ########################################################\n #\ - \ Configure backend targets\n location ^~ /ui {\n \n set $backend\ + \ 200 'OK';\n auth_basic off;\n }\n\n location = /livez {\n access_log\ + \ off;\n return 200 'OK';\n auth_basic off;\n }\n\n location =\ + \ /stub_status {\n stub_status on;\n satisfy any;\n access_log\ + \ off;\n allow 127.0.0.1;\n deny all;\n server_tokens on; # expose\ + \ nginx version\n }\n\n ########################################################\n\ + \ # Configure backend targets\n location ^~ /ui {\n \n set $backend\ \ \"http://prometheus-loki-querier.prometheus.svc.cluster.local:3100\";\n\ \ proxy_pass $backend$request_uri;\n }\n\n # Distributor\n \ \ location = /api/prom/push {\n \n set $backend \"http://prometheus-loki-distributor.prometheus.svc.cluster.local:3100\"\ @@ -282,7 +271,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-gateway namespace: prometheus diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/deployment.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/deployment.yaml index 970e84ac..390a40f9 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/deployment.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/deployment.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-gateway namespace: prometheus spec: @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: b4214835af6e0a0bd71f9c1ca89bb401473522575693ed543fbc4f55d6b6f56d + checksum/config: 25f63031fcf1083cfab0a495e3328c7bf636bcd60f528e39c985572820b9a059 labels: app.kubernetes.io/component: gateway app.kubernetes.io/instance: prometheus @@ -72,7 +72,7 @@ spec: - http://127.0.0.1:8080/stub_status - --preset - loki - image: ghcr.io/jkroepke/access-log-exporter:0.4.8 + image: ghcr.io/jkroepke/access-log-exporter:1.0.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service-exporter.yaml index 2b9804cd..916b25f1 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-gateway-exporter namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service.yaml index b1c970e6..1a9f4846 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' name: prometheus-loki-gateway namespace: prometheus diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/serviceaccount.yaml index d2708cd3..c8174a0d 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: gateway app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-gateway namespace: prometheus diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/service.yaml index 88449e29..bdc90004 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-index-gateway namespace: prometheus spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: prometheus-loki-index-gateway-headless diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/workload.yaml index 97db8f32..e98e8ba7 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-index-gateway namespace: prometheus spec: @@ -27,9 +27,6 @@ spec: app.kubernetes.io/component: index-gateway app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -59,7 +56,7 @@ spec: envFrom: - secretRef: name: prometheus-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -133,7 +130,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: prometheus-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/pdb.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/pdb.yaml index 2715a087..60739a02 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/pdb.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-ingester namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/service.yaml index 43d8653b..ec9a74dd 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-ingester namespace: prometheus spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: prometheus-loki-ingester-headless diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/workload.yaml index 711efbaf..ac0f3ac7 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: ingester app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-ingester namespace: prometheus spec: @@ -29,8 +29,6 @@ spec: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -61,7 +59,7 @@ spec: envFrom: - secretRef: name: prometheus-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -144,7 +142,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: prometheus-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/memcached/serviceaccount.yaml index 1d05aeaa..40daa4f9 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: memcached app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-memcached namespace: prometheus diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml index 807d175c..c764b3ba 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/rules/loki_rules.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-loki-rules namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml index 4616c259..ba39fd19 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml @@ -4,8 +4,8 @@ metadata: labels: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/service.yaml index 1d6ea350..da6e3d16 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-overrides-exporter namespace: prometheus spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: prometheus-loki-overrides-exporter-headless diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/workload.yaml index 4435947c..04a717e5 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-overrides-exporter namespace: prometheus spec: @@ -26,9 +26,6 @@ spec: app.kubernetes.io/component: overrides-exporter app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -58,7 +55,7 @@ spec: envFrom: - secretRef: name: prometheus-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -132,7 +129,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: prometheus-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/service.yaml index 453dc01d..2ceb8b25 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-querier namespace: prometheus spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: prometheus-loki-querier-headless diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/workload.yaml index 9c7e34ef..a2857c49 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: querier app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-querier namespace: prometheus spec: @@ -32,8 +32,6 @@ spec: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -63,7 +61,7 @@ spec: envFrom: - secretRef: name: prometheus-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -146,7 +144,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: prometheus-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/service.yaml index ecd0fd06..1329b1c7 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-query-frontend namespace: prometheus spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: prometheus-loki-query-frontend-headless diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/workload.yaml index b7220642..7e7c0c62 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-query-frontend namespace: prometheus spec: @@ -31,9 +31,6 @@ spec: app.kubernetes.io/component: query-frontend app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -63,7 +60,7 @@ spec: envFrom: - secretRef: name: prometheus-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -137,7 +134,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: prometheus-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/pdb.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/pdb.yaml index 782ab213..c9777db6 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/pdb.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/pdb.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-query-scheduler namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/service.yaml index 3ad1760d..bcdb81bd 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-query-scheduler namespace: prometheus spec: @@ -39,8 +39,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 prometheus.io/service-monitor: 'false' variant: headless name: prometheus-loki-query-scheduler-headless diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/workload.yaml index 565e1929..d41fdbd7 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/workload.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-query-scheduler namespace: prometheus spec: @@ -31,9 +31,6 @@ spec: app.kubernetes.io/component: query-scheduler app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 spec: affinity: podAntiAffinity: @@ -61,7 +58,7 @@ spec: envFrom: - secretRef: name: prometheus-bucket-secret - image: docker.io/grafana/loki:3.7.4 + image: docker.io/grafana/loki:3.7.9 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 10 @@ -129,7 +126,7 @@ spec: name: loki name: config - configMap: - name: loki-runtime + name: prometheus-loki-runtime name: runtime-config - emptyDir: {} name: data diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/pdb.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/pdb.yaml index 35f57fa3..4fce368a 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/pdb.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/pdb.yaml @@ -5,6 +5,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-results-cache namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/service.yaml index 82cfc155..8c9f010a 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/service.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-results-cache namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/statefulset.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/statefulset.yaml index 9113e864..370b6e9f 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/statefulset.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/statefulset.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/component: memcached-results-cache app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: memcached-results-cache name: prometheus-loki-results-cache namespace: prometheus @@ -82,7 +82,7 @@ spec: - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 - image: docker.io/prom/memcached-exporter:v0.16.0 + image: docker.io/prom/memcached-exporter:v0.18.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/runtime-configmap.yaml index e7c13842..97012566 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/runtime-configmap.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -7,7 +7,7 @@ metadata: labels: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 - name: loki-runtime + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 + name: prometheus-loki-runtime namespace: prometheus diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/service-memberlist.yaml index 9e033d6d..30803d77 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/service-memberlist.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/service-memberlist.yaml @@ -5,8 +5,8 @@ metadata: labels: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki-memberlist namespace: prometheus spec: diff --git a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/serviceaccount.yaml index 77c67cee..1fcfcb79 100644 --- a/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/serviceaccount.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.4 - helm.sh/chart: loki-18.5.4 + app.kubernetes.io/version: 3.7.9 + helm.sh/chart: loki-20.4.1 name: prometheus-loki namespace: prometheus