diff --git a/Makefile b/Makefile index 02f0524..53484f3 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ SHELL := bash .SUFFIXES: include Makefile.vars.mk +include Makefile.custom.mk .PHONY: help help: ## Show this help diff --git a/Makefile.custom.mk b/Makefile.custom.mk new file mode 100644 index 0000000..6e30823 --- /dev/null +++ b/Makefile.custom.mk @@ -0,0 +1,2 @@ +# Configure instance alias for commodore component compile +commodore_args += --alias $(instance) diff --git a/class/defaults.yml b/class/defaults.yml index 9f1835c..1686f20 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -4,9 +4,8 @@ parameters: multi_instance: true multi_tenant: true - name: ${_instance} namespace: - name: syn-loki + name: ${_instance} create: true metadata: {} diff --git a/component/main.jsonnet b/component/main.jsonnet index aca6541..a13564a 100644 --- a/component/main.jsonnet +++ b/component/main.jsonnet @@ -47,6 +47,8 @@ local prom = // The hiera parameters for the component local params = inv.parameters.loki; +// Prevent using non-instantiated configuration of this component +assert inv.parameters._instance != 'loki' : "configuring non-instantiated component isn't allowed"; local secrets = com.generateResources( { diff --git a/docs/modules/ROOT/pages/how-tos/upgrade-loki-v0-v1.adoc b/docs/modules/ROOT/pages/how-tos/upgrade-loki-v0-v1.adoc index 6633582..ebac13c 100644 --- a/docs/modules/ROOT/pages/how-tos/upgrade-loki-v0-v1.adoc +++ b/docs/modules/ROOT/pages/how-tos/upgrade-loki-v0-v1.adoc @@ -41,6 +41,39 @@ helm_values: Remove the parameters from "Step 1" and deploy again. +=== New Namespace Naming + +[IMPORTANT] +==== +This component will change the default name of the namespace to the instance name. +It is also no longer allowed to configure an non-instantiated version. +==== + +If you have configured a namespace name that is different than the instance name, then change the namespace name here: + +[source,yaml] +---- +namespace: + name: ${_instance} <1> +---- +<1> Overwrite the default namespace name. + +If you have configured the component in a non-instantiated version, then change the following: + +[source,yaml] +---- +applications: + - loki as your-new-instance-name <1> + +parameters: + your_new_instance_name: <2> + namespace: + name: ${_instance} <3> +---- +<1> Redefine the component include in `applications`. +<2> Rename the component configuration as your new instance name. +<3> Overwrite the default namespace name. + === (Optional) Consider disabling Zone Aware Replication [IMPORTANT] diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc index 55fc0c1..9a45bb8 100644 --- a/docs/modules/ROOT/pages/references/parameters.adoc +++ b/docs/modules/ROOT/pages/references/parameters.adoc @@ -2,14 +2,6 @@ The parent key for all of the following parameters is `loki`. -== `name` - -[horizontal] -type:: string -default:: `${_instance}` - -The name of the instance. - == `namespace` @@ -20,7 +12,7 @@ default:: [source,yaml] ---- namespace: - name: syn-loki <1> + name: ${_instance} <1> create: true <2> metadata: {} <3> ---- diff --git a/tests/golden/defaults/loki/apps/loki.yaml b/tests/golden/defaults/defaults/apps/defaults.yaml similarity index 100% rename from tests/golden/defaults/loki/apps/loki.yaml rename to tests/golden/defaults/defaults/apps/defaults.yaml diff --git a/tests/golden/defaults/loki/loki/00_namespace.yaml b/tests/golden/defaults/defaults/defaults/00_namespace.yaml similarity index 65% rename from tests/golden/defaults/loki/loki/00_namespace.yaml rename to tests/golden/defaults/defaults/defaults/00_namespace.yaml index 8d33e92..be02cdb 100644 --- a/tests/golden/defaults/loki/loki/00_namespace.yaml +++ b/tests/golden/defaults/defaults/defaults/00_namespace.yaml @@ -3,5 +3,5 @@ kind: Namespace metadata: annotations: {} labels: - name: syn-loki - name: syn-loki + name: defaults + name: defaults diff --git a/tests/golden/defaults/defaults/defaults/01_secrets.yaml b/tests/golden/defaults/defaults/defaults/01_secrets.yaml new file mode 100644 index 0000000..ff2076b --- /dev/null +++ b/tests/golden/defaults/defaults/defaults/01_secrets.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +data: {} +kind: Secret +metadata: + annotations: {} + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: defaults-bucket-secret + name: defaults-bucket-secret + name: defaults-bucket-secret + namespace: defaults +stringData: + S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/defaults/s3_access_key + S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/defaults/s3_secret_key +type: Opaque diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrole.yaml similarity index 80% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrole.yaml index 478b54f..3f58822 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-clusterrole + name: defaults-loki-clusterrole rules: - apiGroups: - '' diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml similarity index 63% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml index b0223be..e7a5930 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -2,16 +2,16 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-clusterrolebinding + name: defaults-loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: loki-clusterrole + name: defaults-loki-clusterrole subjects: - kind: ServiceAccount - name: loki - namespace: syn-loki + name: defaults-loki + namespace: defaults diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/pdb.yaml similarity index 68% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/pdb.yaml index d150c18..541212b 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/pdb.yaml @@ -3,14 +3,14 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - name: loki-chunks-cache - namespace: syn-loki + name: defaults-loki-chunks-cache + namespace: defaults spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/service.yaml similarity index 78% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/service.yaml index 299d71e..d452ae9 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-chunks-cache - namespace: syn-loki + name: defaults-loki-chunks-cache + namespace: defaults spec: clusterIP: None ports: @@ -21,6 +21,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml similarity index 91% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index 4b02514..7b4df1a 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-chunks-cache - name: loki-chunks-cache - namespace: syn-loki + name: defaults-loki-chunks-cache + namespace: defaults spec: podManagementPolicy: Parallel replicas: 2 selector: matchLabels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki name: memcached-chunks-cache - serviceName: loki-chunks-cache + serviceName: defaults-loki-chunks-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki name: memcached-chunks-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 11211 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-memcached + serviceAccountName: defaults-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/service.yaml similarity index 82% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/service.yaml index 33dfcac..c206601 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-compactor - namespace: syn-loki + name: defaults-loki-compactor + namespace: defaults spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-compactor-headless - namespace: syn-loki + name: defaults-loki-compactor-headless + namespace: defaults spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/workload.yaml similarity index 89% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/workload.yaml index 1f313f6..6601d92 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/workload.yaml @@ -3,12 +3,12 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-compactor - namespace: syn-loki + name: defaults-loki-compactor + namespace: defaults spec: podManagementPolicy: Parallel replicas: 1 @@ -16,17 +16,17 @@ spec: selector: matchLabels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - serviceName: loki-compactor-headless + serviceName: defaults-loki-compactor-headless template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749 kubectl.kubernetes.io/default-container: compactor labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -38,7 +38,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -59,7 +59,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -122,7 +122,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: defaults-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/config.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/config.yaml similarity index 74% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/config.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/config.yaml index 13935fe..577b6c4 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/config.yaml @@ -5,11 +5,11 @@ data: auth_enabled: true bloom_build: builder: - planner_address: loki-bloom-planner-headless.syn-loki.svc.cluster.local:9095 + planner_address: defaults-loki-bloom-planner-headless.defaults.svc.cluster.local:9095 enabled: false bloom_gateway: client: - addresses: dnssrvnoa+_grpc._tcp.loki-bloom-gateway-headless.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_grpc._tcp.defaults-loki-bloom-gateway-headless.defaults.svc.cluster.local enabled: false chunk_store_config: chunk_cache_config: @@ -22,26 +22,26 @@ data: batch_size: 4 parallelism: 5 memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-chunks-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.defaults-loki-chunks-cache.defaults.svc.cluster.local consistent_hash: true max_idle_conns: 72 timeout: 2000ms common: - compactor_grpc_address: 'loki-compactor.syn-loki.svc.cluster.local:9095' + compactor_grpc_address: 'defaults-loki-compactor.defaults.svc.cluster.local:9095' path_prefix: /var/loki replication_factor: 3 storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-chunks + bucketnames: defaults-chunks insecure: false s3forcepathstyle: true secret_access_key: ${S3_SECRET_ACCESS_KEY} frontend: - scheduler_address: loki-query-scheduler-headless.syn-loki.svc.cluster.local:9095 - tail_proxy_url: http://loki-querier.syn-loki.svc.cluster.local:3100 + scheduler_address: defaults-loki-query-scheduler-headless.defaults.svc.cluster.local:9095 + tail_proxy_url: http://defaults-loki-querier.defaults.svc.cluster.local:3100 frontend_worker: - scheduler_address: loki-query-scheduler-headless.syn-loki.svc.cluster.local:9095 + scheduler_address: defaults-loki-query-scheduler-headless.defaults.svc.cluster.local:9095 index_gateway: mode: simple ingester: @@ -61,7 +61,7 @@ data: advertise_port: 7946 bind_port: 7946 join_members: - - loki-memberlist.syn-loki.svc.cluster.local + - defaults-loki-memberlist.defaults.svc.cluster.local max_join_backoff: 1m max_join_retries: 10 min_join_backoff: 1s @@ -81,7 +81,7 @@ data: writeback_size_limit: 500MB default_validity: 12h memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-results-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.defaults-loki-results-cache.defaults.svc.cluster.local consistent_hash: true timeout: 500ms update_interval: 1m @@ -89,7 +89,7 @@ data: storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-ruler + bucketnames: defaults-ruler insecure: false s3forcepathstyle: true secret_access_key: ${S3_SECRET_ACCESS_KEY} @@ -125,23 +125,23 @@ data: working_directory: /var/loki/data/bloomshipper boltdb_shipper: index_gateway_client: - server_address: dns+loki-index-gateway-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+defaults-loki-index-gateway-headless.defaults.svc.cluster.local:9095 hedging: at: 250ms max_per_second: 20 up_to: 3 tsdb_shipper: index_gateway_client: - server_address: dns+loki-index-gateway-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+defaults-loki-index-gateway-headless.defaults.svc.cluster.local:9095 use_thanos_objstore: false tracing: enabled: true kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki - namespace: syn-loki + namespace: defaults diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/service.yaml similarity index 82% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/service.yaml index 16803fe..18b284e 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-distributor - namespace: syn-loki + name: defaults-loki-distributor + namespace: defaults spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-distributor-headless - namespace: syn-loki + name: defaults-loki-distributor-headless + namespace: defaults spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/workload.yaml similarity index 90% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/workload.yaml index 5f5c0f7..345371d 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-distributor - namespace: syn-loki + name: defaults-loki-distributor + namespace: defaults spec: replicas: 3 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -24,11 +24,11 @@ spec: template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749 kubectl.kubernetes.io/default-container: distributor labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -40,7 +40,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -61,7 +61,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -124,7 +124,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: defaults-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/configmap.yaml similarity index 80% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/configmap.yaml index d5f393e..40001f8 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/configmap.yaml @@ -215,74 +215,74 @@ data: \ 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://loki-querier.syn-loki.svc.cluster.local:3100\";\n proxy_pass\ - \ $backend$request_uri;\n }\n\n # Distributor\n location = /api/prom/push\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ \"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\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/push\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-distributor.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /distributor/ring\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-distributor.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /otlp/v1/logs\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-distributor.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ingester\n \ - \ location = /flush {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /flush {\n \n set $backend \"http://defaults-loki-ingester.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /ingester/\ - \ {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-ingester.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /ingester\ \ {\n \n internal; # to suppress 301\n }\n\n # Ring\n \ - \ location = /ring {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /ring {\n \n set $backend \"http://defaults-loki-ingester.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # MemberListKV\n\ - \ location = /memberlist {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /memberlist {\n \n set $backend \"http://defaults-loki-ingester.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ruler\n location\ - \ = /ruler/ring {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ = /ruler/ring {\n \n set $backend \"http://defaults-loki-ruler.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-ruler.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/rules/\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-ruler.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-ruler.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /loki/api/v1/rules/\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-ruler.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/alerts\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-ruler.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-ruler.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Compactor\n \ - \ location = /compactor/ring {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ location = /compactor/ring {\n \n set $backend \"http://defaults-loki-compactor.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/delete\ - \ {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-compactor.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/cache/generation_numbers\ - \ {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-compactor.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # IndexGateway\n\ - \ location = /indexgateway/ring {\n \n set $backend \"http://loki-index-gateway.syn-loki.svc.cluster.local:3100\"\ + \ location = /indexgateway/ring {\n \n set $backend \"http://defaults-loki-index-gateway.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryScheduler\n\ - \ location = /scheduler/ring {\n \n set $backend \"http://loki-query-scheduler.syn-loki.svc.cluster.local:3100\"\ + \ location = /scheduler/ring {\n \n set $backend \"http://defaults-loki-query-scheduler.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Config\n location\ - \ = /config {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ = /config {\n \n set $backend \"http://defaults-loki-ingester.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryFrontend,\ \ Querier\n location = /api/prom/tail {\n proxy_set_header Upgrade $http_upgrade;\n\ \ proxy_set_header Connection \"upgrade\";\n \n set $backend \ - \ \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\";\n proxy_pass\ - \ $backend$request_uri;\n }\n location = /loki/api/v1/tail {\n \ - \ proxy_set_header Upgrade $http_upgrade;\n proxy_set_header Connection\ - \ \"upgrade\";\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + \ \"http://defaults-loki-query-frontend.defaults.svc.cluster.local:3100\";\n\ + \ proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/tail\ + \ {\n proxy_set_header Upgrade $http_upgrade;\n proxy_set_header Connection\ + \ \"upgrade\";\n \n set $backend \"http://defaults-loki-query-frontend.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/\ - \ {\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://defaults-loki-query-frontend.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom\ \ {\n \n internal; # to suppress 301\n }\n location ^~\ \ /loki/api/v1/ {\n # pass custom headers set by Grafana as X-Query-Tags\ \ which are logged as key/value pairs in metrics.go log messages\n proxy_set_header\ \ X-Query-Tags \"${query_tags},user=${http_x_grafana_user},dashboard_id=${http_x_dashboard_uid},dashboard_title=${http_x_dashboard_title},panel_id=${http_x_panel_id},panel_title=${http_x_panel_title},source_rule_uid=${http_x_rule_uid},rule_name=${http_x_rule_name},rule_folder=${http_x_rule_folder},rule_version=${http_x_rule_version},rule_source=${http_x_rule_source},rule_type=${http_x_rule_type}\"\ - ;\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + ;\n \n set $backend \"http://defaults-loki-query-frontend.defaults.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1\ \ {\n \n internal; # to suppress 301\n }\n }\n}\n" kind: ConfigMap metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: defaults-loki-gateway + namespace: defaults diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/deployment.yaml similarity index 89% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/deployment.yaml index 0694fe8..8f8ad79 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/deployment.yaml @@ -3,29 +3,29 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: defaults-loki-gateway + namespace: defaults spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki strategy: type: RollingUpdate template: metadata: annotations: - checksum/config: d983d4b135c64732f88dea989ad8aa77d312f04b272722a7fea4a9f3368128c2 + checksum/config: b5a9bab97896fd78c11a9ea9263bd757d47c2e6d49d83ae6de1d205fbb0cfd95 labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki spec: affinity: @@ -34,7 +34,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: false @@ -123,11 +123,11 @@ spec: runAsUser: 101 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-gateway + serviceAccountName: defaults-loki-gateway terminationGracePeriodSeconds: 30 volumes: - configMap: - name: loki-gateway + name: defaults-loki-gateway name: config - emptyDir: {} name: tmp diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service-exporter.yaml similarity index 74% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service-exporter.yaml index 335b79e..de95a35 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway-exporter - namespace: syn-loki + name: defaults-loki-gateway-exporter + namespace: defaults spec: ports: - name: http-metrics @@ -18,6 +18,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service.yaml similarity index 77% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service.yaml index 9c4984b..d769623 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/service.yaml @@ -4,13 +4,13 @@ metadata: annotations: null labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' - name: loki-gateway - namespace: syn-loki + name: defaults-loki-gateway + namespace: defaults spec: ports: - name: http @@ -19,6 +19,6 @@ spec: targetPort: http selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/serviceaccount.yaml similarity index 71% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/serviceaccount.yaml index 0ab016f..eef35fb 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -4,9 +4,9 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: defaults-loki-gateway + namespace: defaults diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/service.yaml similarity index 82% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/service.yaml index ca98c4f..9aa42bd 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-index-gateway - namespace: syn-loki + name: defaults-loki-index-gateway + namespace: defaults spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-index-gateway-headless - namespace: syn-loki + name: defaults-loki-index-gateway-headless + namespace: defaults spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/workload.yaml similarity index 89% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/workload.yaml index 1f6b347..425c5db 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/workload.yaml @@ -3,29 +3,29 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-index-gateway - namespace: syn-loki + name: defaults-loki-index-gateway + namespace: defaults spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - serviceName: loki-index-gateway-headless + serviceName: defaults-loki-index-gateway-headless template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749 kubectl.kubernetes.io/default-container: index-gateway labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -37,7 +37,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -58,7 +58,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -121,7 +121,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: defaults-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ingester/pdb.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/pdb.yaml similarity index 76% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ingester/pdb.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/pdb.yaml index c455ea7..267623d 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ingester/pdb.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/pdb.yaml @@ -3,12 +3,12 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: defaults-loki-ingester + namespace: defaults spec: maxUnavailable: 1 selector: @@ -19,5 +19,5 @@ spec: - ingester matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/service.yaml similarity index 82% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/service.yaml index 103726e..8b1fbfa 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: defaults-loki-ingester + namespace: defaults spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ingester-headless - namespace: syn-loki + name: defaults-loki-ingester-headless + namespace: defaults spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ingester/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/workload.yaml similarity index 89% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ingester/workload.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/workload.yaml index fc1c190..b03042a 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ingester/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/workload.yaml @@ -3,12 +3,12 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: defaults-loki-ingester + namespace: defaults spec: podManagementPolicy: Parallel replicas: 3 @@ -16,17 +16,17 @@ spec: selector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - serviceName: loki-ingester-headless + serviceName: defaults-loki-ingester-headless template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749 kubectl.kubernetes.io/default-container: ingester labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -38,7 +38,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -60,7 +60,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -123,13 +123,13 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: defaults-loki terminationGracePeriodSeconds: 300 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/memcached/serviceaccount.yaml similarity index 71% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/memcached/serviceaccount.yaml index befdd16..e8ddf8d 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -4,9 +4,9 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: memcached - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-memcached - namespace: syn-loki + name: defaults-loki-memcached + namespace: defaults diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/.keep.yaml similarity index 100% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/.keep.yaml diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/loki-rules.yaml similarity index 84% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/loki-rules.yaml index 2efecb4..5754960 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/loki-rules.yaml @@ -2,12 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-loki-rules - namespace: syn-loki + name: defaults-loki-loki-rules + namespace: defaults spec: groups: - name: loki_rules @@ -15,85 +15,85 @@ spec: - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)) labels: - cluster: loki + cluster: defaults-loki record: job:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)) labels: - cluster: loki + cluster: defaults-loki record: job:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) / sum(rate(loki_request_duration_seconds_count[1m])) by (job) labels: - cluster: loki + cluster: defaults-loki record: job:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job) labels: - cluster: loki + cluster: defaults-loki record: job:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) labels: - cluster: loki + cluster: defaults-loki record: job:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job) labels: - cluster: loki + cluster: defaults-loki record: job:loki_request_duration_seconds_count:sum_rate - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)) labels: - cluster: loki + cluster: defaults-loki record: job_route:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)) labels: - cluster: loki + cluster: defaults-loki record: job_route:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) / sum(rate(loki_request_duration_seconds_count[1m])) by (job, route) labels: - cluster: loki + cluster: defaults-loki record: job_route:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route) labels: - cluster: loki + cluster: defaults-loki record: job_route:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) labels: - cluster: loki + cluster: defaults-loki record: job_route:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job, route) labels: - cluster: loki + cluster: defaults-loki record: job_route:loki_request_duration_seconds_count:sum_rate - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route)) labels: - cluster: loki + cluster: defaults-loki record: namespace_job_route:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route)) labels: - cluster: loki + cluster: defaults-loki record: namespace_job_route:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job, route) / sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: defaults-loki record: namespace_job_route:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route) labels: - cluster: loki + cluster: defaults-loki record: namespace_job_route:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: defaults-loki record: namespace_job_route:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: defaults-loki record: namespace_job_route:loki_request_duration_seconds_count:sum_rate diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml similarity index 76% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml index edf226f..700f8fe 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml @@ -2,12 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki - namespace: syn-loki + name: defaults-loki + namespace: defaults spec: endpoints: - interval: 15s @@ -15,12 +15,12 @@ spec: port: http-metrics relabelings: - action: replace - replacement: syn-loki/$1 + replacement: defaults/$1 sourceLabels: - job targetLabel: job - action: replace - replacement: loki + replacement: defaults-loki targetLabel: cluster scheme: http selector: @@ -30,5 +30,5 @@ spec: values: - 'false' matchLabels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/service.yaml similarity index 81% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/service.yaml index 6373201..97842c7 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-overrides-exporter - namespace: syn-loki + name: defaults-loki-overrides-exporter + namespace: defaults spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-overrides-exporter-headless - namespace: syn-loki + name: defaults-loki-overrides-exporter-headless + namespace: defaults spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/workload.yaml similarity index 90% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/workload.yaml index 8200128..6fc58a7 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/workload.yaml @@ -3,28 +3,28 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-overrides-exporter - namespace: syn-loki + name: defaults-loki-overrides-exporter + namespace: defaults spec: replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749 kubectl.kubernetes.io/default-container: overrides-exporter labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -36,7 +36,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -57,7 +57,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -120,7 +120,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: defaults-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/querier/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/service.yaml similarity index 82% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/querier/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/service.yaml index c3ff71d..4cba8a7 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/querier/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-querier - namespace: syn-loki + name: defaults-loki-querier + namespace: defaults spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-querier-headless - namespace: syn-loki + name: defaults-loki-querier-headless + namespace: defaults spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/workload.yaml similarity index 90% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/workload.yaml index 8e884b7..7fc54e3 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/querier/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-querier - namespace: syn-loki + name: defaults-loki-querier + namespace: defaults spec: replicas: 3 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749 kubectl.kubernetes.io/default-container: querier labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -62,7 +62,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -125,13 +125,13 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: defaults-loki terminationGracePeriodSeconds: 30 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/service.yaml similarity index 82% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/service.yaml index e4fb538..e557667 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-frontend - namespace: syn-loki + name: defaults-loki-query-frontend + namespace: defaults spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-query-frontend-headless - namespace: syn-loki + name: defaults-loki-query-frontend-headless + namespace: defaults spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/workload.yaml similarity index 90% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/workload.yaml index d530387..14bfbd0 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-frontend/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-frontend - namespace: syn-loki + name: defaults-loki-query-frontend + namespace: defaults spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749 kubectl.kubernetes.io/default-container: query-frontend labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -62,7 +62,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: defaults-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/pdb.yaml similarity index 71% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/pdb.yaml index 1331b7c..6c9c814 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/pdb.yaml @@ -3,16 +3,16 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: defaults-loki-query-scheduler + namespace: defaults spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/service.yaml similarity index 82% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/service.yaml index 244ac9b..eeb5640 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: defaults-loki-query-scheduler + namespace: defaults spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-query-scheduler-headless - namespace: syn-loki + name: defaults-loki-query-scheduler-headless + namespace: defaults spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/workload.yaml similarity index 89% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/workload.yaml index e309432..2d328fe 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/query-scheduler/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: defaults-loki-query-scheduler + namespace: defaults spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749 kubectl.kubernetes.io/default-container: query-scheduler labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -60,7 +60,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -117,7 +117,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: defaults-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/pdb.yaml similarity index 68% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/pdb.yaml index e0dd622..00d57ee 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/pdb.yaml @@ -3,14 +3,14 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - name: loki-results-cache - namespace: syn-loki + name: defaults-loki-results-cache + namespace: defaults spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/service.yaml similarity index 78% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/service.yaml index f7b1722..5d85405 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-results-cache - namespace: syn-loki + name: defaults-loki-results-cache + namespace: defaults spec: clusterIP: None ports: @@ -21,6 +21,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/statefulset.yaml similarity index 91% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/statefulset.yaml index be0a592..98d063b 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/results-cache/statefulset.yaml @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-results-cache - name: loki-results-cache - namespace: syn-loki + name: defaults-loki-results-cache + namespace: defaults spec: podManagementPolicy: Parallel replicas: 2 selector: matchLabels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki name: memcached-results-cache - serviceName: loki-results-cache + serviceName: defaults-loki-results-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki name: memcached-results-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 11211 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-memcached + serviceAccountName: defaults-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ruler/service.yaml similarity index 82% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ruler/service.yaml index 3cb0cf9..74cc371 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ruler/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ruler - namespace: syn-loki + name: defaults-loki-ruler + namespace: defaults spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ruler-headless - namespace: syn-loki + name: defaults-loki-ruler-headless + namespace: defaults spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ruler/workload.yaml similarity index 89% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ruler/workload.yaml index cac7c0f..fd38f59 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ruler/workload.yaml @@ -3,29 +3,29 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ruler - namespace: syn-loki + name: defaults-loki-ruler + namespace: defaults spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki - serviceName: loki-ruler-headless + serviceName: defaults-loki-ruler-headless template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749 kubectl.kubernetes.io/default-container: ruler labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -37,7 +37,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -58,7 +58,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: defaults-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -121,7 +121,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: defaults-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/runtime-configmap.yaml similarity index 77% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/runtime-configmap.yaml index 0608979..a048c41 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -5,9 +5,9 @@ data: kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki-runtime - namespace: syn-loki + namespace: defaults diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/service-memberlist.yaml similarity index 74% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/service-memberlist.yaml index 15e5ae9..e354328 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/service-memberlist.yaml @@ -3,12 +3,12 @@ kind: Service metadata: annotations: null labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-memberlist - namespace: syn-loki + name: defaults-loki-memberlist + namespace: defaults spec: clusterIP: None ports: @@ -17,7 +17,7 @@ spec: protocol: TCP targetPort: http-memberlist selector: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/serviceaccount.yaml similarity index 69% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml rename to tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/serviceaccount.yaml index 9ad651b..7876a9e 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml +++ b/tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/serviceaccount.yaml @@ -3,9 +3,9 @@ automountServiceAccountToken: true kind: ServiceAccount metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: defaults app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki - namespace: syn-loki + name: defaults-loki + namespace: defaults diff --git a/tests/golden/legacy/loki/loki/20_prometheus_rule.yaml b/tests/golden/defaults/defaults/defaults/20_prometheus_rule.yaml similarity index 87% rename from tests/golden/legacy/loki/loki/20_prometheus_rule.yaml rename to tests/golden/defaults/defaults/defaults/20_prometheus_rule.yaml index 6223200..f94aa17 100644 --- a/tests/golden/legacy/loki/loki/20_prometheus_rule.yaml +++ b/tests/golden/defaults/defaults/defaults/20_prometheus_rule.yaml @@ -5,6 +5,6 @@ metadata: labels: name: loki-custom name: loki-custom - namespace: syn-loki + namespace: defaults spec: groups: [] diff --git a/tests/golden/defaults/loki/loki/01_secrets.yaml b/tests/golden/defaults/loki/loki/01_secrets.yaml deleted file mode 100644 index 62edfc1..0000000 --- a/tests/golden/defaults/loki/loki/01_secrets.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -data: {} -kind: Secret -metadata: - annotations: {} - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: loki-bucket-secret - name: loki-bucket-secret - name: loki-bucket-secret - namespace: syn-loki -stringData: - S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/loki/s3_access_key - S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/loki/s3_secret_key -type: Opaque diff --git a/tests/golden/extra-config/loki/apps/loki.yaml b/tests/golden/extra-config/extra-config/apps/extra-config.yaml similarity index 100% rename from tests/golden/extra-config/loki/apps/loki.yaml rename to tests/golden/extra-config/extra-config/apps/extra-config.yaml diff --git a/tests/golden/extra-config/extra-config/extra-config/00_namespace.yaml b/tests/golden/extra-config/extra-config/extra-config/00_namespace.yaml new file mode 100644 index 0000000..c36e33c --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/00_namespace.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: Namespace +metadata: + annotations: {} + labels: + name: extra-config + name: extra-config diff --git a/tests/golden/extra-config/loki/loki/01_secrets.yaml b/tests/golden/extra-config/extra-config/extra-config/01_secrets.yaml similarity index 56% rename from tests/golden/extra-config/loki/loki/01_secrets.yaml rename to tests/golden/extra-config/extra-config/extra-config/01_secrets.yaml index 9d7342a..e091116 100644 --- a/tests/golden/extra-config/loki/loki/01_secrets.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/01_secrets.yaml @@ -5,13 +5,13 @@ metadata: annotations: {} labels: app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: loki-bucket-secret - name: loki-bucket-secret - name: loki-bucket-secret - namespace: syn-loki + app.kubernetes.io/name: extra-config-bucket-secret + name: extra-config-bucket-secret + name: extra-config-bucket-secret + namespace: extra-config stringData: - S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/loki/s3_access_key - S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/loki/s3_secret_key + S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/extra-config/s3_access_key + S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/extra-config/s3_secret_key type: Opaque --- apiVersion: v1 @@ -21,12 +21,12 @@ metadata: annotations: {} labels: app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: loki-nginx-htpasswd - name: loki-nginx-htpasswd - name: loki-nginx-htpasswd - namespace: syn-loki + app.kubernetes.io/name: extra-config-nginx-htpasswd + name: extra-config-nginx-htpasswd + name: extra-config-nginx-htpasswd + namespace: extra-config stringData: - .htpasswd: t-silent-test-1234/c-green-test-1234/loki/htpasswd + .htpasswd: t-silent-test-1234/c-green-test-1234/extra-config/htpasswd type: Opaque --- apiVersion: v1 @@ -39,7 +39,7 @@ metadata: app.kubernetes.io/name: metrics-receive-example-com-tls name: metrics-receive-example-com-tls name: metrics-receive-example-com-tls - namespace: syn-loki + namespace: extra-config stringData: tls.cert: | -----BEGIN CERTIFICATE----- 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 new file mode 100644 index 0000000..faaa854 --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -0,0 +1,19 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: extra-config-loki-clusterrole +rules: + - apiGroups: + - '' + resources: + - configmaps + - secrets + verbs: + - get + - watch + - list 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 new file mode 100644 index 0000000..846dc1f --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -0,0 +1,17 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + labels: + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: extra-config-loki-clusterrolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: extra-config-loki-clusterrole +subjects: + - kind: ServiceAccount + name: extra-config-loki + namespace: extra-config diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 66% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/pdb.yaml index d150c18..5033010 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,14 +3,14 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - name: loki-chunks-cache - namespace: syn-loki + name: extra-config-loki-chunks-cache + namespace: extra-config spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki 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 new file mode 100644 index 0000000..f6a1201 --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -0,0 +1,26 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: {} + labels: + app.kubernetes.io/component: memcached-chunks-cache + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: extra-config-loki-chunks-cache + namespace: extra-config +spec: + clusterIP: None + ports: + - name: memcached-client + port: 11211 + targetPort: client + - name: http-metrics + port: 9150 + targetPort: http-metrics + selector: + app.kubernetes.io/component: memcached-chunks-cache + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 90% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index b3b63ff..7a60c75 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-chunks-cache - name: loki-chunks-cache - namespace: syn-loki + name: extra-config-loki-chunks-cache + namespace: extra-config spec: podManagementPolicy: Parallel replicas: 2 selector: matchLabels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: memcached-chunks-cache - serviceName: loki-chunks-cache + serviceName: extra-config-loki-chunks-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: memcached-chunks-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: dockerhub.vshn.net/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 11211 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-memcached + serviceAccountName: extra-config-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 80% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/service.yaml index 33dfcac..21ad201 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-compactor - namespace: syn-loki + name: extra-config-loki-compactor + namespace: extra-config spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-compactor-headless - namespace: syn-loki + name: extra-config-loki-compactor-headless + namespace: extra-config spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 88% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/compactor/workload.yaml index 519f8ae..8cfb0e3 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,12 +3,12 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-compactor - namespace: syn-loki + name: extra-config-loki-compactor + namespace: extra-config spec: podManagementPolicy: Parallel replicas: 1 @@ -16,17 +16,17 @@ spec: selector: matchLabels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - serviceName: loki-compactor-headless + serviceName: extra-config-loki-compactor-headless template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: compactor labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -38,7 +38,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -59,7 +59,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -122,7 +122,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/config.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/config.yaml similarity index 73% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/config.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/config.yaml index 3189c4d..12065de 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/config.yaml @@ -5,11 +5,11 @@ data: auth_enabled: true bloom_build: builder: - planner_address: loki-bloom-planner-headless.syn-loki.svc.cluster.local:9095 + planner_address: extra-config-loki-bloom-planner-headless.extra-config.svc.cluster.local:9095 enabled: false bloom_gateway: client: - addresses: dnssrvnoa+_grpc._tcp.loki-bloom-gateway-headless.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_grpc._tcp.extra-config-loki-bloom-gateway-headless.extra-config.svc.cluster.local enabled: false chunk_store_config: chunk_cache_config: @@ -22,28 +22,28 @@ data: batch_size: 4 parallelism: 5 memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-chunks-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.extra-config-loki-chunks-cache.extra-config.svc.cluster.local consistent_hash: true max_idle_conns: 72 timeout: 2000ms common: - compactor_grpc_address: 'loki-compactor.syn-loki.svc.cluster.local:9095' + compactor_grpc_address: 'extra-config-loki-compactor.extra-config.svc.cluster.local:9095' path_prefix: /var/loki replication_factor: 3 storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-chunks + bucketnames: extra-config-chunks endpoint: s3.example.com insecure: false region: us-east-1 s3forcepathstyle: true secret_access_key: ${S3_SECRET_ACCESS_KEY} frontend: - scheduler_address: loki-query-scheduler-headless.syn-loki.svc.cluster.local:9095 - tail_proxy_url: http://loki-querier.syn-loki.svc.cluster.local:3100 + scheduler_address: extra-config-loki-query-scheduler-headless.extra-config.svc.cluster.local:9095 + tail_proxy_url: http://extra-config-loki-querier.extra-config.svc.cluster.local:3100 frontend_worker: - scheduler_address: loki-query-scheduler-headless.syn-loki.svc.cluster.local:9095 + scheduler_address: extra-config-loki-query-scheduler-headless.extra-config.svc.cluster.local:9095 index_gateway: mode: simple ingester: @@ -63,7 +63,7 @@ data: advertise_port: 7946 bind_port: 7946 join_members: - - loki-memberlist.syn-loki.svc.cluster.local + - extra-config-loki-memberlist.extra-config.svc.cluster.local max_join_backoff: 1m max_join_retries: 10 min_join_backoff: 1s @@ -83,7 +83,7 @@ data: writeback_size_limit: 500MB default_validity: 12h memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-results-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.extra-config-loki-results-cache.extra-config.svc.cluster.local consistent_hash: true timeout: 500ms update_interval: 1m @@ -91,7 +91,7 @@ data: storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-ruler + bucketnames: extra-config-ruler endpoint: s3.example.com insecure: false region: us-east-1 @@ -129,23 +129,23 @@ data: working_directory: /var/loki/data/bloomshipper boltdb_shipper: index_gateway_client: - server_address: dns+loki-index-gateway-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+extra-config-loki-index-gateway-headless.extra-config.svc.cluster.local:9095 hedging: at: 250ms max_per_second: 20 up_to: 3 tsdb_shipper: index_gateway_client: - server_address: dns+loki-index-gateway-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+extra-config-loki-index-gateway-headless.extra-config.svc.cluster.local:9095 use_thanos_objstore: false tracing: enabled: true kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki - namespace: syn-loki + namespace: extra-config diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 80% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/service.yaml index 16803fe..da14c1a 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-distributor - namespace: syn-loki + name: extra-config-loki-distributor + namespace: extra-config spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-distributor-headless - namespace: syn-loki + name: extra-config-loki-distributor-headless + namespace: extra-config spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 89% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/distributor/workload.yaml index f015c4e..eb4eb6a 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-distributor - namespace: syn-loki + name: extra-config-loki-distributor + namespace: extra-config spec: replicas: 3 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -24,11 +24,11 @@ spec: template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: distributor labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -40,7 +40,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -62,7 +62,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 80% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/configmap.yaml index 84f239f..e5788c6 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -215,74 +215,74 @@ data: \ 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://loki-querier.syn-loki.svc.cluster.local:3100\"\ + \ 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\ - \ location = /api/prom/push {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ location = /api/prom/push {\n \n set $backend \"http://extra-config-loki-distributor.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/push\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-distributor.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /distributor/ring\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-distributor.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /otlp/v1/logs\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-distributor.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ingester\n \ - \ location = /flush {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /flush {\n \n set $backend \"http://extra-config-loki-ingester.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /ingester/\ - \ {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-ingester.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /ingester\ \ {\n \n internal; # to suppress 301\n }\n\n # Ring\n \ - \ location = /ring {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /ring {\n \n set $backend \"http://extra-config-loki-ingester.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # MemberListKV\n\ - \ location = /memberlist {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /memberlist {\n \n set $backend \"http://extra-config-loki-ingester.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ruler\n location\ - \ = /ruler/ring {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ = /ruler/ring {\n \n set $backend \"http://extra-config-loki-ruler.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-ruler.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/rules/\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-ruler.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-ruler.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /loki/api/v1/rules/\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-ruler.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/alerts\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-ruler.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-ruler.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Compactor\n \ - \ location = /compactor/ring {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ location = /compactor/ring {\n \n set $backend \"http://extra-config-loki-compactor.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/delete\ - \ {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-compactor.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/cache/generation_numbers\ - \ {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-compactor.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # IndexGateway\n\ - \ location = /indexgateway/ring {\n \n set $backend \"http://loki-index-gateway.syn-loki.svc.cluster.local:3100\"\ + \ location = /indexgateway/ring {\n \n set $backend \"http://extra-config-loki-index-gateway.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryScheduler\n\ - \ location = /scheduler/ring {\n \n set $backend \"http://loki-query-scheduler.syn-loki.svc.cluster.local:3100\"\ + \ location = /scheduler/ring {\n \n set $backend \"http://extra-config-loki-query-scheduler.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Config\n location\ - \ = /config {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ = /config {\n \n set $backend \"http://extra-config-loki-ingester.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryFrontend,\ \ Querier\n location = /api/prom/tail {\n proxy_set_header Upgrade $http_upgrade;\n\ \ proxy_set_header Connection \"upgrade\";\n \n set $backend \ - \ \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\";\n proxy_pass\ - \ $backend$request_uri;\n }\n location = /loki/api/v1/tail {\n \ - \ proxy_set_header Upgrade $http_upgrade;\n proxy_set_header Connection\ - \ \"upgrade\";\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + \ \"http://extra-config-loki-query-frontend.extra-config.svc.cluster.local:3100\"\ + ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/tail\ + \ {\n proxy_set_header Upgrade $http_upgrade;\n proxy_set_header Connection\ + \ \"upgrade\";\n \n set $backend \"http://extra-config-loki-query-frontend.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/\ - \ {\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://extra-config-loki-query-frontend.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom\ \ {\n \n internal; # to suppress 301\n }\n location ^~\ \ /loki/api/v1/ {\n # pass custom headers set by Grafana as X-Query-Tags\ \ which are logged as key/value pairs in metrics.go log messages\n proxy_set_header\ \ X-Query-Tags \"${query_tags},user=${http_x_grafana_user},dashboard_id=${http_x_dashboard_uid},dashboard_title=${http_x_dashboard_title},panel_id=${http_x_panel_id},panel_title=${http_x_panel_title},source_rule_uid=${http_x_rule_uid},rule_name=${http_x_rule_name},rule_folder=${http_x_rule_folder},rule_version=${http_x_rule_version},rule_source=${http_x_rule_source},rule_type=${http_x_rule_type}\"\ - ;\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + ;\n \n set $backend \"http://extra-config-loki-query-frontend.extra-config.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1\ \ {\n \n internal; # to suppress 301\n }\n }\n}\n" kind: ConfigMap metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: extra-config-loki-gateway + namespace: extra-config diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 88% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/deployment.yaml index e4a2e01..0129706 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,29 +3,29 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: extra-config-loki-gateway + namespace: extra-config spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki strategy: type: RollingUpdate template: metadata: annotations: - checksum/config: 80874b01148f6cd5d1c5bf3d13ab031467eb027853c112bc14ac1ab8cd5be797 + checksum/config: c033b3221c75fb9b6adfe9719712f9b6a3d92aed6568b4115eb36c3aaf691395 labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki spec: affinity: @@ -34,7 +34,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: false @@ -125,15 +125,15 @@ spec: runAsUser: 101 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-gateway + serviceAccountName: extra-config-loki-gateway terminationGracePeriodSeconds: 30 volumes: - configMap: - name: loki-gateway + name: extra-config-loki-gateway name: config - name: auth secret: - secretName: loki-nginx-htpasswd + secretName: extra-config-nginx-htpasswd - emptyDir: {} name: tmp - emptyDir: {} diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 78% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/ingress.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/ingress.yaml index 3702f9b..17aa857 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,13 +3,13 @@ kind: Ingress metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 custom-label: my-label helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: extra-config-loki-gateway + namespace: extra-config spec: rules: - host: metrics-receive.example.com @@ -17,7 +17,7 @@ spec: paths: - backend: service: - name: loki-gateway + name: extra-config-loki-gateway port: number: 80 path: / 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 new file mode 100644 index 0000000..852e0ae --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: null + labels: + app.kubernetes.io/component: gateway + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: extra-config-loki-gateway-exporter + namespace: extra-config +spec: + ports: + - name: http-metrics + port: 4040 + protocol: TCP + targetPort: http-metrics + selector: + app.kubernetes.io/component: gateway + 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/gateway/service.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service.yaml new file mode 100644 index 0000000..b313fd3 --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/service.yaml @@ -0,0 +1,24 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: null + labels: + app.kubernetes.io/component: gateway + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + prometheus.io/service-monitor: 'false' + name: extra-config-loki-gateway + namespace: extra-config +spec: + ports: + - name: http + port: 80 + protocol: TCP + targetPort: http + selector: + app.kubernetes.io/component: gateway + 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/gateway/serviceaccount.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/serviceaccount.yaml new file mode 100644 index 0000000..cc48276 --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +automountServiceAccountToken: false +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/component: gateway + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: extra-config-loki-gateway + namespace: extra-config diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 80% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/service.yaml index ca98c4f..253ce84 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-index-gateway - namespace: syn-loki + name: extra-config-loki-index-gateway + namespace: extra-config spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-index-gateway-headless - namespace: syn-loki + name: extra-config-loki-index-gateway-headless + namespace: extra-config spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 88% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/index-gateway/workload.yaml index c111424..c8cbe3d 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,29 +3,29 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-index-gateway - namespace: syn-loki + name: extra-config-loki-index-gateway + namespace: extra-config spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - serviceName: loki-index-gateway-headless + serviceName: extra-config-loki-index-gateway-headless template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: index-gateway labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -37,7 +37,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -58,7 +58,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -121,7 +121,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 70% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/ingester/pdb-zone.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/pdb-zone.yaml index 59ad557..3f14c2e 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,17 +3,17 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester-rollout - namespace: syn-loki + name: extra-config-loki-ingester-rollout + namespace: extra-config spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki rollout-group: ingester diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 81% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/service.yaml index 548048d..05710f9 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: extra-config-loki-ingester + namespace: extra-config spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ingester-headless - namespace: syn-loki + name: extra-config-loki-ingester-headless + namespace: extra-config spec: clusterIP: None ports: @@ -63,7 +63,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- null @@ -74,14 +74,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ingester-zone-a-headless - namespace: syn-loki + name: extra-config-loki-ingester-zone-a-headless + namespace: extra-config spec: clusterIP: None ports: @@ -99,7 +99,7 @@ spec: targetPort: grpc selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: ingester-zone-a rollout-group: ingester @@ -112,14 +112,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ingester-zone-b-headless - namespace: syn-loki + name: extra-config-loki-ingester-zone-b-headless + namespace: extra-config spec: clusterIP: None ports: @@ -137,7 +137,7 @@ spec: targetPort: grpc selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: ingester-zone-b rollout-group: ingester @@ -150,14 +150,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ingester-zone-c-headless - namespace: syn-loki + name: extra-config-loki-ingester-zone-c-headless + namespace: extra-config spec: clusterIP: None ports: @@ -175,7 +175,7 @@ spec: targetPort: grpc selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: ingester-zone-c rollout-group: ingester diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/ingester/statefulset-zone.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/statefulset-zone.yaml similarity index 90% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/ingester/statefulset-zone.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/statefulset-zone.yaml index 01f3747..fc2ddbc 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/ingester/statefulset-zone.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ingester/statefulset-zone.yaml @@ -5,15 +5,15 @@ metadata: rollout-max-unavailable: '1' labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: ingester-zone-a rollout-group: ingester - name: loki-ingester-zone-a - namespace: syn-loki + name: extra-config-loki-ingester-zone-a + namespace: extra-config spec: podManagementPolicy: Parallel replicas: 1 @@ -21,19 +21,19 @@ spec: selector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: ingester-zone-a rollout-group: ingester - serviceName: loki-ingester-zone-a-headless + serviceName: extra-config-loki-ingester-zone-a-headless template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: ingester labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -76,7 +76,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -139,13 +139,13 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 300 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname @@ -174,15 +174,15 @@ metadata: rollout-max-unavailable: '1' labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: ingester-zone-b rollout-group: ingester - name: loki-ingester-zone-b - namespace: syn-loki + name: extra-config-loki-ingester-zone-b + namespace: extra-config spec: podManagementPolicy: Parallel replicas: 1 @@ -190,19 +190,19 @@ spec: selector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: ingester-zone-b rollout-group: ingester - serviceName: loki-ingester-zone-b-headless + serviceName: extra-config-loki-ingester-zone-b-headless template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: ingester labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -245,7 +245,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -308,13 +308,13 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 300 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname @@ -343,15 +343,15 @@ metadata: rollout-max-unavailable: '1' labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: ingester-zone-c rollout-group: ingester - name: loki-ingester-zone-c - namespace: syn-loki + name: extra-config-loki-ingester-zone-c + namespace: extra-config spec: podManagementPolicy: Parallel replicas: 1 @@ -359,19 +359,19 @@ spec: selector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: ingester-zone-c rollout-group: ingester - serviceName: loki-ingester-zone-c-headless + serviceName: extra-config-loki-ingester-zone-c-headless template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: ingester labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -414,7 +414,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -477,13 +477,13 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 300 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname 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 new file mode 100644 index 0000000..cfba5a6 --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +automountServiceAccountToken: false +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/component: memcached + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: extra-config-loki-memcached + namespace: extra-config diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/monitoring/.keep.yaml similarity index 100% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/monitoring/.keep.yaml diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 80% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/service.yaml index 6373201..3183fa2 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-overrides-exporter - namespace: syn-loki + name: extra-config-loki-overrides-exporter + namespace: extra-config spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-overrides-exporter-headless - namespace: syn-loki + name: extra-config-loki-overrides-exporter-headless + namespace: extra-config spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 89% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/overrides-exporter/workload.yaml index 33c5f1d..19bb736 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,28 +3,28 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-overrides-exporter - namespace: syn-loki + name: extra-config-loki-overrides-exporter + namespace: extra-config spec: replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: overrides-exporter labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -36,7 +36,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -57,7 +57,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -120,7 +120,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 80% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/querier/service.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/service.yaml index c3ff71d..7da9ea7 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-querier - namespace: syn-loki + name: extra-config-loki-querier + namespace: extra-config spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-querier-headless - namespace: syn-loki + name: extra-config-loki-querier-headless + namespace: extra-config spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 89% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/querier/workload.yaml index 1f401e6..c19d1dd 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-querier - namespace: syn-loki + name: extra-config-loki-querier + namespace: extra-config spec: replicas: 3 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: querier labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -63,7 +63,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -126,13 +126,13 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 30 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 80% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/service.yaml index e4fb538..a1dc0ff 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-frontend - namespace: syn-loki + name: extra-config-loki-query-frontend + namespace: extra-config spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-query-frontend-headless - namespace: syn-loki + name: extra-config-loki-query-frontend-headless + namespace: extra-config spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 89% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-frontend/workload.yaml index c28970c..c59c227 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-frontend - namespace: syn-loki + name: extra-config-loki-query-frontend + namespace: extra-config spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: query-frontend labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -62,7 +62,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 69% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/pdb.yaml index 1331b7c..ccd7ba3 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -3,16 +3,16 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: extra-config-loki-query-scheduler + namespace: extra-config spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 80% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/service.yaml index 244ac9b..59fc073 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: extra-config-loki-query-scheduler + namespace: extra-config spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-query-scheduler-headless - namespace: syn-loki + name: extra-config-loki-query-scheduler-headless + namespace: extra-config spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 89% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/query-scheduler/workload.yaml index 2142769..ebb8543 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: extra-config-loki-query-scheduler + namespace: extra-config spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: query-scheduler labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -60,7 +60,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -117,7 +117,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 66% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/pdb.yaml index e0dd622..f029c4b 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -3,14 +3,14 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - name: loki-results-cache - namespace: syn-loki + name: extra-config-loki-results-cache + namespace: extra-config spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki 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 new file mode 100644 index 0000000..dcb5bd2 --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/service.yaml @@ -0,0 +1,26 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: {} + labels: + app.kubernetes.io/component: memcached-results-cache + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: extra-config-loki-results-cache + namespace: extra-config +spec: + clusterIP: None + ports: + - name: memcached-client + port: 11211 + targetPort: client + - name: http-metrics + port: 9150 + targetPort: http-metrics + selector: + app.kubernetes.io/component: memcached-results-cache + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 90% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/results-cache/statefulset.yaml index 3ba3ebe..91aca3e 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-results-cache - name: loki-results-cache - namespace: syn-loki + name: extra-config-loki-results-cache + namespace: extra-config spec: podManagementPolicy: Parallel replicas: 2 selector: matchLabels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: memcached-results-cache - serviceName: loki-results-cache + serviceName: extra-config-loki-results-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki name: memcached-results-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: dockerhub.vshn.net/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 11211 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-memcached + serviceAccountName: extra-config-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/prometheus/loki/loki/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 similarity index 81% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/service.yaml index 3cb0cf9..62c008a 100644 --- a/tests/golden/prometheus/loki/loki/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 @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ruler - namespace: syn-loki + name: extra-config-loki-ruler + namespace: extra-config spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ruler-headless - namespace: syn-loki + name: extra-config-loki-ruler-headless + namespace: extra-config spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/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 similarity index 88% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml rename to tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/ruler/workload.yaml index 3f649f0..e695654 100644 --- a/tests/golden/extra-config/loki/loki/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 @@ -3,29 +3,29 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ruler - namespace: syn-loki + name: extra-config-loki-ruler + namespace: extra-config spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki - serviceName: loki-ruler-headless + serviceName: extra-config-loki-ruler-headless template: metadata: annotations: - checksum/config: ef7e4e1428196d5f360adf616f57243174b2d1a6cf5180603f91bc7ba17deaeb + checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513 kubectl.kubernetes.io/default-container: ruler labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -37,7 +37,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: extra-config app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -58,7 +58,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: extra-config-bucket-secret image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -121,7 +121,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: extra-config-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} 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 new file mode 100644 index 0000000..5ad2b68 --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +data: + runtime-config.yaml: | + {} +kind: ConfigMap +metadata: + labels: + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: 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 new file mode 100644 index 0000000..12f6d9e --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/service-memberlist.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: null + labels: + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: extra-config-loki-memberlist + namespace: extra-config +spec: + clusterIP: None + ports: + - name: tcp + port: 7946 + protocol: TCP + targetPort: http-memberlist + selector: + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/part-of: memberlist + type: ClusterIP 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 new file mode 100644 index 0000000..fcec894 --- /dev/null +++ b/tests/golden/extra-config/extra-config/extra-config/10_helm_loki/loki/templates/serviceaccount.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +automountServiceAccountToken: true +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/instance: extra-config + app.kubernetes.io/name: loki + app.kubernetes.io/version: 3.7.2 + helm.sh/chart: loki-17.4.11 + name: extra-config-loki + namespace: extra-config diff --git a/tests/golden/openshift/loki/loki/20_prometheus_rule.yaml b/tests/golden/extra-config/extra-config/extra-config/20_prometheus_rule.yaml similarity index 85% rename from tests/golden/openshift/loki/loki/20_prometheus_rule.yaml rename to tests/golden/extra-config/extra-config/extra-config/20_prometheus_rule.yaml index 6223200..468881d 100644 --- a/tests/golden/openshift/loki/loki/20_prometheus_rule.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/20_prometheus_rule.yaml @@ -5,6 +5,6 @@ metadata: labels: name: loki-custom name: loki-custom - namespace: syn-loki + namespace: extra-config spec: groups: [] diff --git a/tests/golden/extra-config/loki/loki/30_network_policies.yaml b/tests/golden/extra-config/extra-config/extra-config/30_network_policies.yaml similarity index 96% rename from tests/golden/extra-config/loki/loki/30_network_policies.yaml rename to tests/golden/extra-config/extra-config/extra-config/30_network_policies.yaml index 5b3cf7f..7139e1a 100644 --- a/tests/golden/extra-config/loki/loki/30_network_policies.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/30_network_policies.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/name: allow-from-other-namespaces name: allow-from-other-namespaces name: allow-from-other-namespaces - namespace: syn-loki + namespace: extra-config spec: ingress: - from: diff --git a/tests/golden/legacy/loki/apps/loki.yaml b/tests/golden/legacy/legacy/apps/legacy.yaml similarity index 100% rename from tests/golden/legacy/loki/apps/loki.yaml rename to tests/golden/legacy/legacy/apps/legacy.yaml diff --git a/tests/golden/legacy/loki/loki/00_namespace.yaml b/tests/golden/legacy/legacy/legacy/00_namespace.yaml similarity index 65% rename from tests/golden/legacy/loki/loki/00_namespace.yaml rename to tests/golden/legacy/legacy/legacy/00_namespace.yaml index 8d33e92..d7e4531 100644 --- a/tests/golden/legacy/loki/loki/00_namespace.yaml +++ b/tests/golden/legacy/legacy/legacy/00_namespace.yaml @@ -3,5 +3,5 @@ kind: Namespace metadata: annotations: {} labels: - name: syn-loki - name: syn-loki + name: legacy + name: legacy diff --git a/tests/golden/legacy/legacy/legacy/01_secrets.yaml b/tests/golden/legacy/legacy/legacy/01_secrets.yaml new file mode 100644 index 0000000..7319e9f --- /dev/null +++ b/tests/golden/legacy/legacy/legacy/01_secrets.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +data: {} +kind: Secret +metadata: + annotations: {} + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: legacy-bucket-secret + name: legacy-bucket-secret + name: legacy-bucket-secret + namespace: legacy +stringData: + S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/legacy/s3_access_key + S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/legacy/s3_secret_key +type: Opaque diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrole.yaml similarity index 81% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrole.yaml index 478b54f..8b05fba 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-clusterrole + name: legacy-loki-clusterrole rules: - apiGroups: - '' diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml similarity index 64% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml index b0223be..2b5e6fe 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -2,16 +2,16 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-clusterrolebinding + name: legacy-loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: loki-clusterrole + name: legacy-loki-clusterrole subjects: - kind: ServiceAccount - name: loki - namespace: syn-loki + name: legacy-loki + namespace: legacy diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/pdb.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/pdb.yaml similarity index 72% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/pdb.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/pdb.yaml index 5252d36..c5eb9ff 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/pdb.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/pdb.yaml @@ -3,16 +3,16 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-backend - namespace: syn-loki + name: legacy-loki-backend + namespace: legacy spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/query-scheduler-discovery.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/query-scheduler-discovery.yaml similarity index 78% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/query-scheduler-discovery.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/query-scheduler-discovery.yaml index bc4a1a5..48fc221 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/query-scheduler-discovery.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/query-scheduler-discovery.yaml @@ -4,11 +4,11 @@ metadata: annotations: null labels: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki prometheus.io/service-monitor: 'false' - name: loki-query-scheduler-discovery - namespace: syn-loki + name: legacy-loki-query-scheduler-discovery + namespace: legacy spec: clusterIP: None ports: @@ -23,6 +23,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/service.yaml similarity index 83% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/service.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/service.yaml index 5f7b690..2481d23 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-backend - namespace: syn-loki + name: legacy-loki-backend + namespace: legacy spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-backend-headless - namespace: syn-loki + name: legacy-loki-backend-headless + namespace: legacy spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/workload.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/workload.yaml similarity index 93% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/workload.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/workload.yaml index 57a602c..8c3f467 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/backend/workload.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/backend/workload.yaml @@ -3,12 +3,12 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki-backend - namespace: syn-loki + namespace: legacy spec: persistentVolumeClaimRetentionPolicy: whenDeleted: Delete @@ -19,17 +19,17 @@ spec: selector: matchLabels: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - serviceName: loki-backend-headless + serviceName: legacy-loki-backend-headless template: metadata: annotations: - checksum/config: b3924dfbea23502aac68c3a6a0d39ee535670207bfc6a359ac5b079f534861c1 + checksum/config: b44dc2a41f07cbdbc2f2bfc21c14563d4677b2ba7189014f4c36cce5ed7065ae kubectl.kubernetes.io/default-container: backend labels: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: backend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -63,7 +63,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: legacy-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -181,7 +181,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: legacy-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/service.yaml similarity index 79% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/service.yaml index 299d71e..53b2a35 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-chunks-cache - namespace: syn-loki + name: legacy-loki-chunks-cache + namespace: legacy spec: clusterIP: None ports: @@ -21,6 +21,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml similarity index 92% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index a92e985..2bb78e5 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-chunks-cache - name: loki-chunks-cache - namespace: syn-loki + name: legacy-loki-chunks-cache + namespace: legacy spec: podManagementPolicy: Parallel replicas: 1 selector: matchLabels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki name: memcached-chunks-cache - serviceName: loki-chunks-cache + serviceName: legacy-loki-chunks-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki name: memcached-chunks-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: legacy-bucket-secret image: docker.io/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -126,7 +126,7 @@ spec: runAsUser: 11211 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-memcached + serviceAccountName: legacy-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/config.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/config.yaml similarity index 81% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/config.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/config.yaml index 77af818..084146a 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/config.yaml @@ -5,11 +5,11 @@ data: auth_enabled: true bloom_build: builder: - planner_address: loki-backend-headless.syn-loki.svc.cluster.local:9095 + planner_address: legacy-loki-backend-headless.legacy.svc.cluster.local:9095 enabled: false bloom_gateway: client: - addresses: dnssrvnoa+_grpc._tcp.loki-backend-headless.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_grpc._tcp.legacy-loki-backend-headless.legacy.svc.cluster.local enabled: false chunk_store_config: chunk_cache_config: @@ -22,18 +22,18 @@ data: batch_size: 4 parallelism: 5 memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-chunks-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.legacy-loki-chunks-cache.legacy.svc.cluster.local consistent_hash: true max_idle_conns: 72 timeout: 2000ms common: - compactor_grpc_address: 'loki-backend.syn-loki.svc.cluster.local:9095' + compactor_grpc_address: 'legacy-loki-backend.legacy.svc.cluster.local:9095' path_prefix: /var/loki replication_factor: 3 storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-chunks + bucketnames: legacy-chunks insecure: false s3forcepathstyle: true secret_access_key: ${S3_SECRET_ACCESS_KEY} @@ -61,7 +61,7 @@ data: advertise_port: 7946 bind_port: 7946 join_members: - - loki-memberlist.syn-loki.svc.cluster.local + - legacy-loki-memberlist.legacy.svc.cluster.local max_join_backoff: 1m max_join_retries: 10 min_join_backoff: 1s @@ -81,7 +81,7 @@ data: writeback_size_limit: 500MB default_validity: 12h memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-results-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.legacy-loki-results-cache.legacy.svc.cluster.local consistent_hash: true timeout: 500ms update_interval: 1m @@ -89,7 +89,7 @@ data: storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-ruler + bucketnames: legacy-ruler insecure: false s3forcepathstyle: true secret_access_key: ${S3_SECRET_ACCESS_KEY} @@ -125,23 +125,23 @@ data: working_directory: /var/loki/data/bloomshipper boltdb_shipper: index_gateway_client: - server_address: dns+loki-backend-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+legacy-loki-backend-headless.legacy.svc.cluster.local:9095 hedging: at: 250ms max_per_second: 20 up_to: 3 tsdb_shipper: index_gateway_client: - server_address: dns+loki-backend-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+legacy-loki-backend-headless.legacy.svc.cluster.local:9095 use_thanos_objstore: false tracing: enabled: true kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki - namespace: syn-loki + namespace: legacy diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/configmap.yaml similarity index 84% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/configmap.yaml index d5f393e..ebd162a 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/configmap.yaml @@ -215,74 +215,74 @@ data: \ 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://loki-querier.syn-loki.svc.cluster.local:3100\";\n proxy_pass\ + \ \"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://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/push\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /distributor/ring\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /otlp/v1/logs\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ingester\n \ - \ location = /flush {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /flush {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /ingester/\ - \ {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /ingester\ \ {\n \n internal; # to suppress 301\n }\n\n # Ring\n \ - \ location = /ring {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /ring {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # MemberListKV\n\ - \ location = /memberlist {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /memberlist {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ruler\n location\ - \ = /ruler/ring {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ = /ruler/ring {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/rules/\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /loki/api/v1/rules/\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/alerts\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Compactor\n \ - \ location = /compactor/ring {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ location = /compactor/ring {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/delete\ - \ {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/cache/generation_numbers\ - \ {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # IndexGateway\n\ - \ location = /indexgateway/ring {\n \n set $backend \"http://loki-index-gateway.syn-loki.svc.cluster.local:3100\"\ + \ location = /indexgateway/ring {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryScheduler\n\ - \ location = /scheduler/ring {\n \n set $backend \"http://loki-query-scheduler.syn-loki.svc.cluster.local:3100\"\ + \ location = /scheduler/ring {\n \n set $backend \"http://legacy-loki-backend.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Config\n location\ - \ = /config {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ = /config {\n \n set $backend \"http://legacy-loki-write.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryFrontend,\ \ Querier\n location = /api/prom/tail {\n proxy_set_header Upgrade $http_upgrade;\n\ \ proxy_set_header Connection \"upgrade\";\n \n set $backend \ - \ \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\";\n proxy_pass\ + \ \"http://legacy-loki-read.legacy.svc.cluster.local:3100\";\n proxy_pass\ \ $backend$request_uri;\n }\n location = /loki/api/v1/tail {\n \ \ proxy_set_header Upgrade $http_upgrade;\n proxy_set_header Connection\ - \ \"upgrade\";\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + \ \"upgrade\";\n \n set $backend \"http://legacy-loki-read.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/\ - \ {\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://legacy-loki-read.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom\ \ {\n \n internal; # to suppress 301\n }\n location ^~\ \ /loki/api/v1/ {\n # pass custom headers set by Grafana as X-Query-Tags\ \ which are logged as key/value pairs in metrics.go log messages\n proxy_set_header\ \ X-Query-Tags \"${query_tags},user=${http_x_grafana_user},dashboard_id=${http_x_dashboard_uid},dashboard_title=${http_x_dashboard_title},panel_id=${http_x_panel_id},panel_title=${http_x_panel_title},source_rule_uid=${http_x_rule_uid},rule_name=${http_x_rule_name},rule_folder=${http_x_rule_folder},rule_version=${http_x_rule_version},rule_source=${http_x_rule_source},rule_type=${http_x_rule_type}\"\ - ;\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + ;\n \n set $backend \"http://legacy-loki-read.legacy.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1\ \ {\n \n internal; # to suppress 301\n }\n }\n}\n" kind: ConfigMap metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: legacy-loki-gateway + namespace: legacy diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/deployment.yaml similarity index 90% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/deployment.yaml index 5a6dae5..6751402 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/deployment.yaml @@ -3,29 +3,29 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: legacy-loki-gateway + namespace: legacy spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki strategy: type: RollingUpdate template: metadata: annotations: - checksum/config: 2ac29b210397fb257fb28bb7defc2a7245d4fff101baf745bc1ca1281b373f26 + checksum/config: c4d6e784251df14cc0030fb879b89e13f22af4961a5fde94e662af9d7a51419b labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki spec: affinity: @@ -34,7 +34,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: false @@ -125,11 +125,11 @@ spec: runAsUser: 101 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-gateway + serviceAccountName: legacy-loki-gateway terminationGracePeriodSeconds: 30 volumes: - configMap: - name: loki-gateway + name: legacy-loki-gateway name: config - emptyDir: {} name: tmp diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service-exporter.yaml similarity index 75% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service-exporter.yaml index 335b79e..5ebb7f1 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway-exporter - namespace: syn-loki + name: legacy-loki-gateway-exporter + namespace: legacy spec: ports: - name: http-metrics @@ -18,6 +18,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service.yaml similarity index 78% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service.yaml index 9c4984b..499c2e3 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/service.yaml @@ -4,13 +4,13 @@ metadata: annotations: null labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' - name: loki-gateway - namespace: syn-loki + name: legacy-loki-gateway + namespace: legacy spec: ports: - name: http @@ -19,6 +19,6 @@ spec: targetPort: http selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/serviceaccount.yaml similarity index 72% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/serviceaccount.yaml index 0ab016f..0c76e75 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -4,9 +4,9 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: legacy-loki-gateway + namespace: legacy diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/memcached/serviceaccount.yaml similarity index 72% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/memcached/serviceaccount.yaml index befdd16..c15f47f 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -4,9 +4,9 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: memcached - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-memcached - namespace: syn-loki + name: legacy-loki-memcached + namespace: legacy diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/.keep.yaml similarity index 100% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/.keep.yaml diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/loki-rules.yaml similarity index 85% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/loki-rules.yaml index 2efecb4..8697598 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/loki-rules.yaml @@ -2,12 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-loki-rules - namespace: syn-loki + name: legacy-loki-loki-rules + namespace: legacy spec: groups: - name: loki_rules @@ -15,85 +15,85 @@ spec: - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)) labels: - cluster: loki + cluster: legacy-loki record: job:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)) labels: - cluster: loki + cluster: legacy-loki record: job:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) / sum(rate(loki_request_duration_seconds_count[1m])) by (job) labels: - cluster: loki + cluster: legacy-loki record: job:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job) labels: - cluster: loki + cluster: legacy-loki record: job:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) labels: - cluster: loki + cluster: legacy-loki record: job:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job) labels: - cluster: loki + cluster: legacy-loki record: job:loki_request_duration_seconds_count:sum_rate - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)) labels: - cluster: loki + cluster: legacy-loki record: job_route:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)) labels: - cluster: loki + cluster: legacy-loki record: job_route:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) / sum(rate(loki_request_duration_seconds_count[1m])) by (job, route) labels: - cluster: loki + cluster: legacy-loki record: job_route:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route) labels: - cluster: loki + cluster: legacy-loki record: job_route:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) labels: - cluster: loki + cluster: legacy-loki record: job_route:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job, route) labels: - cluster: loki + cluster: legacy-loki record: job_route:loki_request_duration_seconds_count:sum_rate - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route)) labels: - cluster: loki + cluster: legacy-loki record: namespace_job_route:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route)) labels: - cluster: loki + cluster: legacy-loki record: namespace_job_route:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job, route) / sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: legacy-loki record: namespace_job_route:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route) labels: - cluster: loki + cluster: legacy-loki record: namespace_job_route:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: legacy-loki record: namespace_job_route:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: legacy-loki record: namespace_job_route:loki_request_duration_seconds_count:sum_rate diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml similarity index 77% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml index edf226f..9000b70 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml @@ -2,12 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki - namespace: syn-loki + name: legacy-loki + namespace: legacy spec: endpoints: - interval: 15s @@ -15,12 +15,12 @@ spec: port: http-metrics relabelings: - action: replace - replacement: syn-loki/$1 + replacement: legacy/$1 sourceLabels: - job targetLabel: job - action: replace - replacement: loki + replacement: legacy-loki targetLabel: cluster scheme: http selector: @@ -30,5 +30,5 @@ spec: values: - 'false' matchLabels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/read/pdb.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/pdb.yaml similarity index 73% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/read/pdb.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/pdb.yaml index c617988..3b962eb 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/read/pdb.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/pdb.yaml @@ -3,16 +3,16 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-read - namespace: syn-loki + name: legacy-loki-read + namespace: legacy spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/read/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/service.yaml similarity index 83% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/read/service.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/service.yaml index 049a2bf..189977d 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/read/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-read - namespace: syn-loki + name: legacy-loki-read + namespace: legacy spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-read-headless - namespace: syn-loki + name: legacy-loki-read-headless + namespace: legacy spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/read/workload.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/workload.yaml similarity index 91% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/read/workload.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/workload.yaml index b34e1b9..9cfa2e8 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/read/workload.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/read/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki-read - namespace: syn-loki + namespace: legacy spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -24,11 +24,11 @@ spec: template: metadata: annotations: - checksum/config: b3924dfbea23502aac68c3a6a0d39ee535670207bfc6a359ac5b079f534861c1 + checksum/config: b44dc2a41f07cbdbc2f2bfc21c14563d4677b2ba7189014f4c36cce5ed7065ae kubectl.kubernetes.io/default-container: read labels: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -40,7 +40,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: read - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -61,7 +61,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: legacy-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -121,7 +121,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: legacy-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/service.yaml similarity index 79% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/service.yaml index f7b1722..8ab7336 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-results-cache - namespace: syn-loki + name: legacy-loki-results-cache + namespace: legacy spec: clusterIP: None ports: @@ -21,6 +21,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/statefulset.yaml similarity index 91% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/statefulset.yaml index 9d1d896..540b966 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/results-cache/statefulset.yaml @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-results-cache - name: loki-results-cache - namespace: syn-loki + name: legacy-loki-results-cache + namespace: legacy spec: podManagementPolicy: Parallel replicas: 1 selector: matchLabels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki name: memcached-results-cache - serviceName: loki-results-cache + serviceName: legacy-loki-results-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki name: memcached-results-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: legacy-bucket-secret image: docker.io/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -126,7 +126,7 @@ spec: runAsUser: 11211 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-memcached + serviceAccountName: legacy-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/runtime-configmap.yaml similarity index 78% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/runtime-configmap.yaml index 0608979..67c01e4 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -5,9 +5,9 @@ data: kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki-runtime - namespace: syn-loki + namespace: legacy diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/service-memberlist.yaml similarity index 75% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/service-memberlist.yaml index 15e5ae9..48d3594 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/service-memberlist.yaml @@ -3,12 +3,12 @@ kind: Service metadata: annotations: null labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-memberlist - namespace: syn-loki + name: legacy-loki-memberlist + namespace: legacy spec: clusterIP: None ports: @@ -17,7 +17,7 @@ spec: protocol: TCP targetPort: http-memberlist selector: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist type: ClusterIP diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/serviceaccount.yaml similarity index 70% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/serviceaccount.yaml index 9ad651b..2371283 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/serviceaccount.yaml @@ -3,9 +3,9 @@ automountServiceAccountToken: true kind: ServiceAccount metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki - namespace: syn-loki + name: legacy-loki + namespace: legacy diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/write/pdb.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/pdb.yaml similarity index 72% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/write/pdb.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/pdb.yaml index f68a86e..1cc0c44 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/write/pdb.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/pdb.yaml @@ -3,16 +3,16 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-write - namespace: syn-loki + name: legacy-loki-write + namespace: legacy spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/write/service.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/service.yaml similarity index 83% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/write/service.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/service.yaml index f3b375a..4314aec 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/write/service.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-write - namespace: syn-loki + name: legacy-loki-write + namespace: legacy spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-write-headless - namespace: syn-loki + name: legacy-loki-write-headless + namespace: legacy spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/write/workload.yaml b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/workload.yaml similarity index 90% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/write/workload.yaml rename to tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/workload.yaml index dce5d60..6461bfe 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/write/workload.yaml +++ b/tests/golden/legacy/legacy/legacy/10_helm_loki/loki/templates/write/workload.yaml @@ -3,12 +3,12 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki-write - namespace: syn-loki + namespace: legacy spec: podManagementPolicy: Parallel replicas: 3 @@ -16,17 +16,17 @@ spec: selector: matchLabels: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki - serviceName: loki-write-headless + serviceName: legacy-loki-write-headless template: metadata: annotations: - checksum/config: b3924dfbea23502aac68c3a6a0d39ee535670207bfc6a359ac5b079f534861c1 + checksum/config: b44dc2a41f07cbdbc2f2bfc21c14563d4677b2ba7189014f4c36cce5ed7065ae kubectl.kubernetes.io/default-container: write labels: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -38,7 +38,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: write - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: legacy app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -59,7 +59,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: legacy-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -120,7 +120,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: legacy-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/defaults/loki/loki/20_prometheus_rule.yaml b/tests/golden/legacy/legacy/legacy/20_prometheus_rule.yaml similarity index 87% rename from tests/golden/defaults/loki/loki/20_prometheus_rule.yaml rename to tests/golden/legacy/legacy/legacy/20_prometheus_rule.yaml index 6223200..c2bf10b 100644 --- a/tests/golden/defaults/loki/loki/20_prometheus_rule.yaml +++ b/tests/golden/legacy/legacy/legacy/20_prometheus_rule.yaml @@ -5,6 +5,6 @@ metadata: labels: name: loki-custom name: loki-custom - namespace: syn-loki + namespace: legacy spec: groups: [] diff --git a/tests/golden/legacy/loki/loki/01_secrets.yaml b/tests/golden/legacy/loki/loki/01_secrets.yaml deleted file mode 100644 index 62edfc1..0000000 --- a/tests/golden/legacy/loki/loki/01_secrets.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -data: {} -kind: Secret -metadata: - annotations: {} - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: loki-bucket-secret - name: loki-bucket-secret - name: loki-bucket-secret - namespace: syn-loki -stringData: - S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/loki/s3_access_key - S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/loki/s3_secret_key -type: Opaque diff --git a/tests/golden/openshift/loki/loki/01_secrets.yaml b/tests/golden/openshift/loki/loki/01_secrets.yaml deleted file mode 100644 index eeea239..0000000 --- a/tests/golden/openshift/loki/loki/01_secrets.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -data: {} -kind: Secret -metadata: - annotations: {} - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: loki-bucket-secret - name: loki-bucket-secret - name: loki-bucket-secret - namespace: syn-loki -stringData: - S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/loki/s3_access_key - S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/loki/s3_secret_key -type: Opaque ---- -apiVersion: v1 -data: {} -kind: Secret -metadata: - annotations: {} - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: loki-nginx-htpasswd - name: loki-nginx-htpasswd - name: loki-nginx-htpasswd - namespace: syn-loki -stringData: - .htpasswd: t-silent-test-1234/c-green-test-1234/loki/htpasswd -type: Opaque diff --git a/tests/golden/openshift/loki/apps/loki.yaml b/tests/golden/openshift/openshift/apps/openshift.yaml similarity index 100% rename from tests/golden/openshift/loki/apps/loki.yaml rename to tests/golden/openshift/openshift/apps/openshift.yaml diff --git a/tests/golden/extra-config/loki/loki/00_namespace.yaml b/tests/golden/openshift/openshift/openshift/00_namespace.yaml similarity index 64% rename from tests/golden/extra-config/loki/loki/00_namespace.yaml rename to tests/golden/openshift/openshift/openshift/00_namespace.yaml index 8d33e92..bd58791 100644 --- a/tests/golden/extra-config/loki/loki/00_namespace.yaml +++ b/tests/golden/openshift/openshift/openshift/00_namespace.yaml @@ -3,5 +3,5 @@ kind: Namespace metadata: annotations: {} labels: - name: syn-loki - name: syn-loki + name: openshift + name: openshift diff --git a/tests/golden/openshift/openshift/openshift/01_secrets.yaml b/tests/golden/openshift/openshift/openshift/01_secrets.yaml new file mode 100644 index 0000000..599f48b --- /dev/null +++ b/tests/golden/openshift/openshift/openshift/01_secrets.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +data: {} +kind: Secret +metadata: + annotations: {} + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: openshift-bucket-secret + name: openshift-bucket-secret + name: openshift-bucket-secret + namespace: openshift +stringData: + S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/openshift/s3_access_key + S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/openshift/s3_secret_key +type: Opaque +--- +apiVersion: v1 +data: {} +kind: Secret +metadata: + annotations: {} + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: openshift-nginx-htpasswd + name: openshift-nginx-htpasswd + name: openshift-nginx-htpasswd + namespace: openshift +stringData: + .htpasswd: t-silent-test-1234/c-green-test-1234/openshift/htpasswd +type: Opaque diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrole.yaml similarity index 80% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrole.yaml index 478b54f..b8ca494 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-clusterrole + name: openshift-loki-clusterrole rules: - apiGroups: - '' diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml similarity index 62% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml index b0223be..44b7c93 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -2,16 +2,16 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-clusterrolebinding + name: openshift-loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: loki-clusterrole + name: openshift-loki-clusterrole subjects: - kind: ServiceAccount - name: loki - namespace: syn-loki + name: openshift-loki + namespace: openshift diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/pdb.yaml similarity index 67% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/pdb.yaml index d150c18..4898748 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/pdb.yaml @@ -3,14 +3,14 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - name: loki-chunks-cache - namespace: syn-loki + name: openshift-loki-chunks-cache + namespace: openshift spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/service.yaml similarity index 78% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/service.yaml index 299d71e..a11298d 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-chunks-cache - namespace: syn-loki + name: openshift-loki-chunks-cache + namespace: openshift spec: clusterIP: None ports: @@ -21,6 +21,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml similarity index 91% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index 31cdc04..21e8e9a 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-chunks-cache - name: loki-chunks-cache - namespace: syn-loki + name: openshift-loki-chunks-cache + namespace: openshift spec: podManagementPolicy: Parallel replicas: 2 selector: matchLabels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki name: memcached-chunks-cache - serviceName: loki-chunks-cache + serviceName: openshift-loki-chunks-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki name: memcached-chunks-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -119,7 +119,7 @@ spec: initContainers: [] nodeSelector: {} securityContext: null - serviceAccountName: loki-memcached + serviceAccountName: openshift-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/service.yaml similarity index 82% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/service.yaml index 33dfcac..c405de7 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-compactor - namespace: syn-loki + name: openshift-loki-compactor + namespace: openshift spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-compactor-headless - namespace: syn-loki + name: openshift-loki-compactor-headless + namespace: openshift spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/workload.yaml similarity index 89% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/workload.yaml index 9a65672..cb22883 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/compactor/workload.yaml @@ -3,12 +3,12 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-compactor - namespace: syn-loki + name: openshift-loki-compactor + namespace: openshift spec: podManagementPolicy: Parallel replicas: 1 @@ -16,17 +16,17 @@ spec: selector: matchLabels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - serviceName: loki-compactor-headless + serviceName: openshift-loki-compactor-headless template: metadata: annotations: - checksum/config: 1828e811800360afcf724104a3d6d070719044f5e719d64ddfca1d89fda367c5 + checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8 kubectl.kubernetes.io/default-container: compactor labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -38,7 +38,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -59,7 +59,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -119,7 +119,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: openshift-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/config.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/config.yaml similarity index 75% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/config.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/config.yaml index ff7f138..993b2f3 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/config.yaml @@ -5,11 +5,11 @@ data: auth_enabled: true bloom_build: builder: - planner_address: loki-bloom-planner-headless.syn-loki.svc.cluster.local:9095 + planner_address: openshift-loki-bloom-planner-headless.openshift.svc.cluster.local:9095 enabled: false bloom_gateway: client: - addresses: dnssrvnoa+_grpc._tcp.loki-bloom-gateway-headless.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_grpc._tcp.openshift-loki-bloom-gateway-headless.openshift.svc.cluster.local enabled: false chunk_store_config: chunk_cache_config: @@ -22,18 +22,18 @@ data: batch_size: 4 parallelism: 5 memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-chunks-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.openshift-loki-chunks-cache.openshift.svc.cluster.local consistent_hash: true max_idle_conns: 72 timeout: 2000ms common: - compactor_grpc_address: 'loki-compactor.syn-loki.svc.cluster.local:9095' + compactor_grpc_address: 'openshift-loki-compactor.openshift.svc.cluster.local:9095' path_prefix: /var/loki replication_factor: 3 storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-chunks + bucketnames: openshift-chunks insecure: false s3forcepathstyle: true secret_access_key: ${S3_SECRET_ACCESS_KEY} @@ -45,10 +45,10 @@ data: retention_enabled: true working_directory: /var/loki/compactor/retention frontend: - scheduler_address: loki-query-scheduler-headless.syn-loki.svc.cluster.local:9095 - tail_proxy_url: http://loki-querier.syn-loki.svc.cluster.local:3100 + scheduler_address: openshift-loki-query-scheduler-headless.openshift.svc.cluster.local:9095 + tail_proxy_url: http://openshift-loki-querier.openshift.svc.cluster.local:3100 frontend_worker: - scheduler_address: loki-query-scheduler-headless.syn-loki.svc.cluster.local:9095 + scheduler_address: openshift-loki-query-scheduler-headless.openshift.svc.cluster.local:9095 index_gateway: mode: simple ingester: @@ -70,7 +70,7 @@ data: advertise_port: 7946 bind_port: 7946 join_members: - - loki-memberlist.syn-loki.svc.cluster.local + - openshift-loki-memberlist.openshift.svc.cluster.local max_join_backoff: 1m max_join_retries: 10 min_join_backoff: 1s @@ -90,7 +90,7 @@ data: writeback_size_limit: 500MB default_validity: 12h memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-results-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.openshift-loki-results-cache.openshift.svc.cluster.local consistent_hash: true timeout: 500ms update_interval: 1m @@ -98,7 +98,7 @@ data: storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-ruler + bucketnames: openshift-ruler insecure: false s3forcepathstyle: true secret_access_key: ${S3_SECRET_ACCESS_KEY} @@ -134,23 +134,23 @@ data: working_directory: /var/loki/data/bloomshipper boltdb_shipper: index_gateway_client: - server_address: dns+loki-index-gateway-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+openshift-loki-index-gateway-headless.openshift.svc.cluster.local:9095 hedging: at: 250ms max_per_second: 20 up_to: 3 tsdb_shipper: index_gateway_client: - server_address: dns+loki-index-gateway-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+openshift-loki-index-gateway-headless.openshift.svc.cluster.local:9095 use_thanos_objstore: false tracing: enabled: true kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki - namespace: syn-loki + namespace: openshift diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/service.yaml similarity index 81% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/service.yaml index 16803fe..88b7d07 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-distributor - namespace: syn-loki + name: openshift-loki-distributor + namespace: openshift spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-distributor-headless - namespace: syn-loki + name: openshift-loki-distributor-headless + namespace: openshift spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/workload.yaml similarity index 90% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/workload.yaml index 649d822..394cc23 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/distributor/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-distributor - namespace: syn-loki + name: openshift-loki-distributor + namespace: openshift spec: replicas: 3 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -24,11 +24,11 @@ spec: template: metadata: annotations: - checksum/config: 1828e811800360afcf724104a3d6d070719044f5e719d64ddfca1d89fda367c5 + checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8 kubectl.kubernetes.io/default-container: distributor labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -40,7 +40,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -61,7 +61,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -121,7 +121,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: openshift-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/configmap.yaml similarity index 80% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/configmap.yaml index cebe293..e6fbd70 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/configmap.yaml @@ -216,74 +216,74 @@ data: \ 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://loki-querier.syn-loki.svc.cluster.local:3100\";\n proxy_pass\ - \ $backend$request_uri;\n }\n\n # Distributor\n location = /api/prom/push\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ \"http://openshift-loki-querier.openshift.svc.cluster.local:3100\";\n \ + \ proxy_pass $backend$request_uri;\n }\n\n # Distributor\n location\ + \ = /api/prom/push {\n \n set $backend \"http://openshift-loki-distributor.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/push\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-distributor.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /distributor/ring\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-distributor.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /otlp/v1/logs\ - \ {\n \n set $backend \"http://loki-distributor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-distributor.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ingester\n \ - \ location = /flush {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /flush {\n \n set $backend \"http://openshift-loki-ingester.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /ingester/\ - \ {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-ingester.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /ingester\ \ {\n \n internal; # to suppress 301\n }\n\n # Ring\n \ - \ location = /ring {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /ring {\n \n set $backend \"http://openshift-loki-ingester.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # MemberListKV\n\ - \ location = /memberlist {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ location = /memberlist {\n \n set $backend \"http://openshift-loki-ingester.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ruler\n location\ - \ = /ruler/ring {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ = /ruler/ring {\n \n set $backend \"http://openshift-loki-ruler.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-ruler.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/rules/\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-ruler.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-ruler.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /loki/api/v1/rules/\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-ruler.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/alerts\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-ruler.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/rules\ - \ {\n \n set $backend \"http://loki-ruler.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-ruler.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Compactor\n \ - \ location = /compactor/ring {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ location = /compactor/ring {\n \n set $backend \"http://openshift-loki-compactor.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/delete\ - \ {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-compactor.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/cache/generation_numbers\ - \ {\n \n set $backend \"http://loki-compactor.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-compactor.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # IndexGateway\n\ - \ location = /indexgateway/ring {\n \n set $backend \"http://loki-index-gateway.syn-loki.svc.cluster.local:3100\"\ + \ location = /indexgateway/ring {\n \n set $backend \"http://openshift-loki-index-gateway.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryScheduler\n\ - \ location = /scheduler/ring {\n \n set $backend \"http://loki-query-scheduler.syn-loki.svc.cluster.local:3100\"\ + \ location = /scheduler/ring {\n \n set $backend \"http://openshift-loki-query-scheduler.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Config\n location\ - \ = /config {\n \n set $backend \"http://loki-ingester.syn-loki.svc.cluster.local:3100\"\ + \ = /config {\n \n set $backend \"http://openshift-loki-ingester.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryFrontend,\ \ Querier\n location = /api/prom/tail {\n proxy_set_header Upgrade $http_upgrade;\n\ \ proxy_set_header Connection \"upgrade\";\n \n set $backend \ - \ \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\";\n proxy_pass\ - \ $backend$request_uri;\n }\n location = /loki/api/v1/tail {\n \ - \ proxy_set_header Upgrade $http_upgrade;\n proxy_set_header Connection\ - \ \"upgrade\";\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + \ \"http://openshift-loki-query-frontend.openshift.svc.cluster.local:3100\"\ + ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/tail\ + \ {\n proxy_set_header Upgrade $http_upgrade;\n proxy_set_header Connection\ + \ \"upgrade\";\n \n set $backend \"http://openshift-loki-query-frontend.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/\ - \ {\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://openshift-loki-query-frontend.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom\ \ {\n \n internal; # to suppress 301\n }\n location ^~\ \ /loki/api/v1/ {\n # pass custom headers set by Grafana as X-Query-Tags\ \ which are logged as key/value pairs in metrics.go log messages\n proxy_set_header\ \ X-Query-Tags \"${query_tags},user=${http_x_grafana_user},dashboard_id=${http_x_dashboard_uid},dashboard_title=${http_x_dashboard_title},panel_id=${http_x_panel_id},panel_title=${http_x_panel_title},source_rule_uid=${http_x_rule_uid},rule_name=${http_x_rule_name},rule_folder=${http_x_rule_folder},rule_version=${http_x_rule_version},rule_source=${http_x_rule_source},rule_type=${http_x_rule_type}\"\ - ;\n \n set $backend \"http://loki-query-frontend.syn-loki.svc.cluster.local:3100\"\ + ;\n \n set $backend \"http://openshift-loki-query-frontend.openshift.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1\ \ {\n \n internal; # to suppress 301\n }\n }\n}\n" kind: ConfigMap metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: openshift-loki-gateway + namespace: openshift diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/deployment.yaml similarity index 88% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/deployment.yaml index 8f8d233..d08cb94 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/deployment.yaml @@ -3,29 +3,29 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: openshift-loki-gateway + namespace: openshift spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki strategy: type: RollingUpdate template: metadata: annotations: - checksum/config: 2734d4d185f7285b14e8d4e8a9e36ba3ac5e20c70e771896164370c70ef7089a + checksum/config: 0ebef6b14e99d83bac4cca76683b535f2665f12b43c304aa976a8bc51efb8ae4 labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki spec: affinity: @@ -34,7 +34,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: false @@ -118,15 +118,15 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki-gateway + serviceAccountName: openshift-loki-gateway terminationGracePeriodSeconds: 30 volumes: - configMap: - name: loki-gateway + name: openshift-loki-gateway name: config - name: auth secret: - secretName: loki-nginx-htpasswd + secretName: openshift-nginx-htpasswd - emptyDir: {} name: tmp - emptyDir: {} diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/ingress.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/ingress.yaml similarity index 81% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/ingress.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/ingress.yaml index 0cd9705..03d7064 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/ingress.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/ingress.yaml @@ -5,12 +5,12 @@ metadata: cert-manager.io/cluster-issuer: letsencrypt-production labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: openshift-loki-gateway + namespace: openshift spec: rules: - host: logs-receive.appuio.net @@ -18,7 +18,7 @@ spec: paths: - backend: service: - name: loki-gateway + name: openshift-loki-gateway port: number: 80 path: / diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service-exporter.yaml similarity index 74% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service-exporter.yaml index 335b79e..13b0dc1 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway-exporter - namespace: syn-loki + name: openshift-loki-gateway-exporter + namespace: openshift spec: ports: - name: http-metrics @@ -18,6 +18,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service.yaml similarity index 76% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service.yaml index 9c4984b..84db4ef 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/service.yaml @@ -4,13 +4,13 @@ metadata: annotations: null labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' - name: loki-gateway - namespace: syn-loki + name: openshift-loki-gateway + namespace: openshift spec: ports: - name: http @@ -19,6 +19,6 @@ spec: targetPort: http selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/serviceaccount.yaml similarity index 70% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/serviceaccount.yaml index 0ab016f..db670c0 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -4,9 +4,9 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: openshift-loki-gateway + namespace: openshift diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/service.yaml similarity index 81% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/service.yaml index ca98c4f..62a682e 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-index-gateway - namespace: syn-loki + name: openshift-loki-index-gateway + namespace: openshift spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-index-gateway-headless - namespace: syn-loki + name: openshift-loki-index-gateway-headless + namespace: openshift spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/workload.yaml similarity index 88% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/workload.yaml index 02c425d..09bad5e 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/index-gateway/workload.yaml @@ -3,29 +3,29 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-index-gateway - namespace: syn-loki + name: openshift-loki-index-gateway + namespace: openshift spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - serviceName: loki-index-gateway-headless + serviceName: openshift-loki-index-gateway-headless template: metadata: annotations: - checksum/config: 1828e811800360afcf724104a3d6d070719044f5e719d64ddfca1d89fda367c5 + checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8 kubectl.kubernetes.io/default-container: index-gateway labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -37,7 +37,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -58,7 +58,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -118,7 +118,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: openshift-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ingester/pdb.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/pdb.yaml similarity index 76% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ingester/pdb.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/pdb.yaml index c455ea7..61eeecd 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ingester/pdb.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/pdb.yaml @@ -3,12 +3,12 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: openshift-loki-ingester + namespace: openshift spec: maxUnavailable: 1 selector: @@ -19,5 +19,5 @@ spec: - ingester matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/service.yaml similarity index 82% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/service.yaml index 103726e..673972c 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: openshift-loki-ingester + namespace: openshift spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ingester-headless - namespace: syn-loki + name: openshift-loki-ingester-headless + namespace: openshift spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ingester/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/workload.yaml similarity index 88% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ingester/workload.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/workload.yaml index 2f98c9f..ea9f77a 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ingester/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ingester/workload.yaml @@ -3,12 +3,12 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: openshift-loki-ingester + namespace: openshift spec: podManagementPolicy: Parallel replicas: 3 @@ -16,17 +16,17 @@ spec: selector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - serviceName: loki-ingester-headless + serviceName: openshift-loki-ingester-headless template: metadata: annotations: - checksum/config: 1828e811800360afcf724104a3d6d070719044f5e719d64ddfca1d89fda367c5 + checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8 kubectl.kubernetes.io/default-container: ingester labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -38,7 +38,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -60,7 +60,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -120,13 +120,13 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: openshift-loki terminationGracePeriodSeconds: 300 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/memcached/serviceaccount.yaml similarity index 70% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/memcached/serviceaccount.yaml index befdd16..defbb2f 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -4,9 +4,9 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: memcached - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-memcached - namespace: syn-loki + name: openshift-loki-memcached + namespace: openshift diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/.keep.yaml similarity index 100% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/.keep.yaml diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/loki-rules.yaml similarity index 83% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/loki-rules.yaml index 2efecb4..552b21d 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/loki-rules.yaml @@ -2,12 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-loki-rules - namespace: syn-loki + name: openshift-loki-loki-rules + namespace: openshift spec: groups: - name: loki_rules @@ -15,85 +15,85 @@ spec: - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)) labels: - cluster: loki + cluster: openshift-loki record: job:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)) labels: - cluster: loki + cluster: openshift-loki record: job:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) / sum(rate(loki_request_duration_seconds_count[1m])) by (job) labels: - cluster: loki + cluster: openshift-loki record: job:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job) labels: - cluster: loki + cluster: openshift-loki record: job:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) labels: - cluster: loki + cluster: openshift-loki record: job:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job) labels: - cluster: loki + cluster: openshift-loki record: job:loki_request_duration_seconds_count:sum_rate - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)) labels: - cluster: loki + cluster: openshift-loki record: job_route:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)) labels: - cluster: loki + cluster: openshift-loki record: job_route:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) / sum(rate(loki_request_duration_seconds_count[1m])) by (job, route) labels: - cluster: loki + cluster: openshift-loki record: job_route:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route) labels: - cluster: loki + cluster: openshift-loki record: job_route:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) labels: - cluster: loki + cluster: openshift-loki record: job_route:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job, route) labels: - cluster: loki + cluster: openshift-loki record: job_route:loki_request_duration_seconds_count:sum_rate - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route)) labels: - cluster: loki + cluster: openshift-loki record: namespace_job_route:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route)) labels: - cluster: loki + cluster: openshift-loki record: namespace_job_route:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job, route) / sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: openshift-loki record: namespace_job_route:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route) labels: - cluster: loki + cluster: openshift-loki record: namespace_job_route:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: openshift-loki record: namespace_job_route:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: openshift-loki record: namespace_job_route:loki_request_duration_seconds_count:sum_rate diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml similarity index 75% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml index edf226f..ed4f703 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml @@ -2,12 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki - namespace: syn-loki + name: openshift-loki + namespace: openshift spec: endpoints: - interval: 15s @@ -15,12 +15,12 @@ spec: port: http-metrics relabelings: - action: replace - replacement: syn-loki/$1 + replacement: openshift/$1 sourceLabels: - job targetLabel: job - action: replace - replacement: loki + replacement: openshift-loki targetLabel: cluster scheme: http selector: @@ -30,5 +30,5 @@ spec: values: - 'false' matchLabels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/service.yaml similarity index 81% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/service.yaml index 6373201..3197ad1 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-overrides-exporter - namespace: syn-loki + name: openshift-loki-overrides-exporter + namespace: openshift spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-overrides-exporter-headless - namespace: syn-loki + name: openshift-loki-overrides-exporter-headless + namespace: openshift spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/workload.yaml similarity index 89% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/workload.yaml index 3519f99..5414448 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/overrides-exporter/workload.yaml @@ -3,28 +3,28 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-overrides-exporter - namespace: syn-loki + name: openshift-loki-overrides-exporter + namespace: openshift spec: replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki template: metadata: annotations: - checksum/config: 1828e811800360afcf724104a3d6d070719044f5e719d64ddfca1d89fda367c5 + checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8 kubectl.kubernetes.io/default-container: overrides-exporter labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -36,7 +36,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -57,7 +57,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -117,7 +117,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: openshift-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/querier/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/service.yaml similarity index 82% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/querier/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/service.yaml index c3ff71d..d658ac3 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/querier/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-querier - namespace: syn-loki + name: openshift-loki-querier + namespace: openshift spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-querier-headless - namespace: syn-loki + name: openshift-loki-querier-headless + namespace: openshift spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/workload.yaml similarity index 89% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/workload.yaml index 951f2d6..2c8b63c 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/querier/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-querier - namespace: syn-loki + name: openshift-loki-querier + namespace: openshift spec: replicas: 3 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: 1828e811800360afcf724104a3d6d070719044f5e719d64ddfca1d89fda367c5 + checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8 kubectl.kubernetes.io/default-container: querier labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -62,7 +62,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -122,13 +122,13 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: openshift-loki terminationGracePeriodSeconds: 30 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/service.yaml similarity index 81% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/service.yaml index e4fb538..aab5963 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-frontend - namespace: syn-loki + name: openshift-loki-query-frontend + namespace: openshift spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-query-frontend-headless - namespace: syn-loki + name: openshift-loki-query-frontend-headless + namespace: openshift spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/workload.yaml similarity index 90% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/workload.yaml index 6a89207..72bd619 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-frontend/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-frontend - namespace: syn-loki + name: openshift-loki-query-frontend + namespace: openshift spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: 1828e811800360afcf724104a3d6d070719044f5e719d64ddfca1d89fda367c5 + checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8 kubectl.kubernetes.io/default-container: query-frontend labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -62,7 +62,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -122,7 +122,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: openshift-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/pdb.yaml similarity index 70% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/pdb.yaml index 1331b7c..5b7de4d 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/pdb.yaml @@ -3,16 +3,16 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: openshift-loki-query-scheduler + namespace: openshift spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/service.yaml similarity index 81% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/service.yaml index 244ac9b..5aa75a4 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: openshift-loki-query-scheduler + namespace: openshift spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-query-scheduler-headless - namespace: syn-loki + name: openshift-loki-query-scheduler-headless + namespace: openshift spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/workload.yaml similarity index 89% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/workload.yaml index 22e2880..10e3f3c 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/query-scheduler/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: openshift-loki-query-scheduler + namespace: openshift spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: 1828e811800360afcf724104a3d6d070719044f5e719d64ddfca1d89fda367c5 + checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8 kubectl.kubernetes.io/default-container: query-scheduler labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -60,7 +60,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -114,7 +114,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: openshift-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/pdb.yaml similarity index 67% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/pdb.yaml index e0dd622..c68cabd 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/pdb.yaml @@ -3,14 +3,14 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - name: loki-results-cache - namespace: syn-loki + name: openshift-loki-results-cache + namespace: openshift spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/service.yaml similarity index 78% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/service.yaml index f7b1722..1f69006 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-results-cache - namespace: syn-loki + name: openshift-loki-results-cache + namespace: openshift spec: clusterIP: None ports: @@ -21,6 +21,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/statefulset.yaml similarity index 90% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/statefulset.yaml index 69fce20..57fdd2e 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/results-cache/statefulset.yaml @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-results-cache - name: loki-results-cache - namespace: syn-loki + name: openshift-loki-results-cache + namespace: openshift spec: podManagementPolicy: Parallel replicas: 2 selector: matchLabels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki name: memcached-results-cache - serviceName: loki-results-cache + serviceName: openshift-loki-results-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki name: memcached-results-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -119,7 +119,7 @@ spec: initContainers: [] nodeSelector: {} securityContext: null - serviceAccountName: loki-memcached + serviceAccountName: openshift-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ruler/service.yaml similarity index 82% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ruler/service.yaml index 3cb0cf9..905ef61 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ruler/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ruler - namespace: syn-loki + name: openshift-loki-ruler + namespace: openshift spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ruler-headless - namespace: syn-loki + name: openshift-loki-ruler-headless + namespace: openshift spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ruler/workload.yaml similarity index 88% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ruler/workload.yaml index c94537c..391fac0 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/ruler/workload.yaml @@ -3,29 +3,29 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ruler - namespace: syn-loki + name: openshift-loki-ruler + namespace: openshift spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki - serviceName: loki-ruler-headless + serviceName: openshift-loki-ruler-headless template: metadata: annotations: - checksum/config: 1828e811800360afcf724104a3d6d070719044f5e719d64ddfca1d89fda367c5 + checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8 kubectl.kubernetes.io/default-container: ruler labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -37,7 +37,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -58,7 +58,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: openshift-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -118,7 +118,7 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: openshift-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/runtime-configmap.yaml similarity index 76% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/runtime-configmap.yaml index 0608979..bf4d965 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -5,9 +5,9 @@ data: kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki-runtime - namespace: syn-loki + namespace: openshift diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/service-memberlist.yaml similarity index 73% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/service-memberlist.yaml index 15e5ae9..672a210 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/service-memberlist.yaml @@ -3,12 +3,12 @@ kind: Service metadata: annotations: null labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-memberlist - namespace: syn-loki + name: openshift-loki-memberlist + namespace: openshift spec: clusterIP: None ports: @@ -17,7 +17,7 @@ spec: protocol: TCP targetPort: http-memberlist selector: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/serviceaccount.yaml similarity index 68% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml rename to tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/serviceaccount.yaml index 9ad651b..786c990 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml +++ b/tests/golden/openshift/openshift/openshift/10_helm_loki/loki/templates/serviceaccount.yaml @@ -3,9 +3,9 @@ automountServiceAccountToken: true kind: ServiceAccount metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: openshift app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki - namespace: syn-loki + name: openshift-loki + namespace: openshift diff --git a/tests/golden/extra-config/loki/loki/20_prometheus_rule.yaml b/tests/golden/openshift/openshift/openshift/20_prometheus_rule.yaml similarity index 87% rename from tests/golden/extra-config/loki/loki/20_prometheus_rule.yaml rename to tests/golden/openshift/openshift/openshift/20_prometheus_rule.yaml index 6223200..bd18ce9 100644 --- a/tests/golden/extra-config/loki/loki/20_prometheus_rule.yaml +++ b/tests/golden/openshift/openshift/openshift/20_prometheus_rule.yaml @@ -5,6 +5,6 @@ metadata: labels: name: loki-custom name: loki-custom - namespace: syn-loki + namespace: openshift spec: groups: [] diff --git a/tests/golden/prometheus/loki/loki/00_namespace.yaml b/tests/golden/prometheus/loki/loki/00_namespace.yaml deleted file mode 100644 index 8d33e92..0000000 --- a/tests/golden/prometheus/loki/loki/00_namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - annotations: {} - labels: - name: syn-loki - name: syn-loki diff --git a/tests/golden/prometheus/loki/loki/01_secrets.yaml b/tests/golden/prometheus/loki/loki/01_secrets.yaml deleted file mode 100644 index 62edfc1..0000000 --- a/tests/golden/prometheus/loki/loki/01_secrets.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -data: {} -kind: Secret -metadata: - annotations: {} - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: loki-bucket-secret - name: loki-bucket-secret - name: loki-bucket-secret - namespace: syn-loki -stringData: - S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/loki/s3_access_key - S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/loki/s3_secret_key -type: Opaque diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml deleted file mode 100644 index 478b54f..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki-clusterrole -rules: - - apiGroups: - - '' - resources: - - configmaps - - secrets - verbs: - - get - - watch - - list diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml deleted file mode 100644 index b0223be..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - labels: - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki-clusterrolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: loki-clusterrole -subjects: - - kind: ServiceAccount - name: loki - namespace: syn-loki diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml deleted file mode 100644 index 299d71e..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: {} - labels: - app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki-chunks-cache - namespace: syn-loki -spec: - clusterIP: None - ports: - - name: memcached-client - port: 11211 - targetPort: client - - name: http-metrics - port: 9150 - targetPort: http-metrics - selector: - app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml deleted file mode 100644 index 335b79e..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: null - labels: - app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki-gateway-exporter - namespace: syn-loki -spec: - ports: - - name: http-metrics - port: 4040 - protocol: TCP - targetPort: http-metrics - selector: - app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml deleted file mode 100644 index 9c4984b..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: null - labels: - app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - prometheus.io/service-monitor: 'false' - name: loki-gateway - namespace: syn-loki -spec: - ports: - - name: http - port: 80 - protocol: TCP - targetPort: http - selector: - app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml deleted file mode 100644 index 0ab016f..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -automountServiceAccountToken: false -kind: ServiceAccount -metadata: - labels: - app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml deleted file mode 100644 index befdd16..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -automountServiceAccountToken: false -kind: ServiceAccount -metadata: - labels: - app.kubernetes.io/component: memcached - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki-memcached - namespace: syn-loki diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml deleted file mode 100644 index f7b1722..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: {} - labels: - app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki-results-cache - namespace: syn-loki -spec: - clusterIP: None - ports: - - name: memcached-client - port: 11211 - targetPort: client - - name: http-metrics - port: 9150 - targetPort: http-metrics - selector: - app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml deleted file mode 100644 index 0608979..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -data: - runtime-config.yaml: | - {} -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki-runtime - namespace: syn-loki diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml deleted file mode 100644 index 15e5ae9..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: null - labels: - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki-memberlist - namespace: syn-loki -spec: - clusterIP: None - ports: - - name: tcp - port: 7946 - protocol: TCP - targetPort: http-memberlist - selector: - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/part-of: memberlist - type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml deleted file mode 100644 index 9ad651b..0000000 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -automountServiceAccountToken: true -kind: ServiceAccount -metadata: - labels: - app.kubernetes.io/instance: loki - app.kubernetes.io/name: loki - app.kubernetes.io/version: 3.7.2 - helm.sh/chart: loki-17.4.11 - name: loki - namespace: syn-loki diff --git a/tests/golden/prometheus/loki/apps/loki.yaml b/tests/golden/prometheus/prometheus/apps/prometheus.yaml similarity index 100% rename from tests/golden/prometheus/loki/apps/loki.yaml rename to tests/golden/prometheus/prometheus/apps/prometheus.yaml diff --git a/tests/golden/openshift/loki/loki/00_namespace.yaml b/tests/golden/prometheus/prometheus/prometheus/00_namespace.yaml similarity index 63% rename from tests/golden/openshift/loki/loki/00_namespace.yaml rename to tests/golden/prometheus/prometheus/prometheus/00_namespace.yaml index 8d33e92..7eb2e58 100644 --- a/tests/golden/openshift/loki/loki/00_namespace.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/00_namespace.yaml @@ -3,5 +3,5 @@ kind: Namespace metadata: annotations: {} labels: - name: syn-loki - name: syn-loki + name: prometheus + name: prometheus diff --git a/tests/golden/prometheus/prometheus/prometheus/01_secrets.yaml b/tests/golden/prometheus/prometheus/prometheus/01_secrets.yaml new file mode 100644 index 0000000..486c935 --- /dev/null +++ b/tests/golden/prometheus/prometheus/prometheus/01_secrets.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +data: {} +kind: Secret +metadata: + annotations: {} + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: prometheus-bucket-secret + name: prometheus-bucket-secret + name: prometheus-bucket-secret + namespace: prometheus +stringData: + S3_ACCESS_KEY_ID: t-silent-test-1234/c-green-test-1234/prometheus/s3_access_key + S3_SECRET_ACCESS_KEY: t-silent-test-1234/c-green-test-1234/prometheus/s3_secret_key +type: Opaque diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrole.yaml similarity index 79% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrole.yaml index 478b54f..65d4bd9 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/backend/clusterrole.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrole.yaml @@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-clusterrole + name: prometheus-loki-clusterrole rules: - apiGroups: - '' diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml similarity index 61% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml index b0223be..948fce8 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/backend/clusterrolebinding.yaml @@ -2,16 +2,16 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-clusterrolebinding + name: prometheus-loki-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: loki-clusterrole + name: prometheus-loki-clusterrole subjects: - kind: ServiceAccount - name: loki - namespace: syn-loki + name: prometheus-loki + namespace: prometheus diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/pdb.yaml similarity index 67% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/pdb.yaml index d150c18..f3fdcb1 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/chunks-cache/pdb.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/pdb.yaml @@ -3,14 +3,14 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - name: loki-chunks-cache - namespace: syn-loki + name: prometheus-loki-chunks-cache + namespace: prometheus spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/service.yaml similarity index 78% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/service.yaml index 299d71e..882eb1d 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/chunks-cache/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-chunks-cache - namespace: syn-loki + name: prometheus-loki-chunks-cache + namespace: prometheus spec: clusterIP: None ports: @@ -21,6 +21,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml similarity index 91% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml index 4b02514..2af75e4 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/chunks-cache/statefulset.yaml @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-chunks-cache - name: loki-chunks-cache - namespace: syn-loki + name: prometheus-loki-chunks-cache + namespace: prometheus spec: podManagementPolicy: Parallel replicas: 2 selector: matchLabels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki name: memcached-chunks-cache - serviceName: loki-chunks-cache + serviceName: prometheus-loki-chunks-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-chunks-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki name: memcached-chunks-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 11211 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-memcached + serviceAccountName: prometheus-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/service.yaml similarity index 81% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/service.yaml index 33dfcac..361d5c2 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/compactor/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-compactor - namespace: syn-loki + name: prometheus-loki-compactor + namespace: prometheus spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-compactor-headless - namespace: syn-loki + name: prometheus-loki-compactor-headless + namespace: prometheus spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/workload.yaml similarity index 89% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/workload.yaml index 1f313f6..b10fc6c 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/compactor/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/compactor/workload.yaml @@ -3,12 +3,12 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-compactor - namespace: syn-loki + name: prometheus-loki-compactor + namespace: prometheus spec: podManagementPolicy: Parallel replicas: 1 @@ -16,17 +16,17 @@ spec: selector: matchLabels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - serviceName: loki-compactor-headless + serviceName: prometheus-loki-compactor-headless template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: 4121d9329e92666f9ca2fef9fc79381d6a19642c517c0698c628a0694f6a8ffa kubectl.kubernetes.io/default-container: compactor labels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -38,7 +38,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: compactor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -59,7 +59,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -122,7 +122,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: prometheus-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/config.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/config.yaml similarity index 73% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/config.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/config.yaml index 13935fe..6237f0f 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/config.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/config.yaml @@ -5,11 +5,11 @@ data: auth_enabled: true bloom_build: builder: - planner_address: loki-bloom-planner-headless.syn-loki.svc.cluster.local:9095 + planner_address: prometheus-loki-bloom-planner-headless.prometheus.svc.cluster.local:9095 enabled: false bloom_gateway: client: - addresses: dnssrvnoa+_grpc._tcp.loki-bloom-gateway-headless.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_grpc._tcp.prometheus-loki-bloom-gateway-headless.prometheus.svc.cluster.local enabled: false chunk_store_config: chunk_cache_config: @@ -22,26 +22,26 @@ data: batch_size: 4 parallelism: 5 memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-chunks-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.prometheus-loki-chunks-cache.prometheus.svc.cluster.local consistent_hash: true max_idle_conns: 72 timeout: 2000ms common: - compactor_grpc_address: 'loki-compactor.syn-loki.svc.cluster.local:9095' + compactor_grpc_address: 'prometheus-loki-compactor.prometheus.svc.cluster.local:9095' path_prefix: /var/loki replication_factor: 3 storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-chunks + bucketnames: prometheus-chunks insecure: false s3forcepathstyle: true secret_access_key: ${S3_SECRET_ACCESS_KEY} frontend: - scheduler_address: loki-query-scheduler-headless.syn-loki.svc.cluster.local:9095 - tail_proxy_url: http://loki-querier.syn-loki.svc.cluster.local:3100 + scheduler_address: prometheus-loki-query-scheduler-headless.prometheus.svc.cluster.local:9095 + tail_proxy_url: http://prometheus-loki-querier.prometheus.svc.cluster.local:3100 frontend_worker: - scheduler_address: loki-query-scheduler-headless.syn-loki.svc.cluster.local:9095 + scheduler_address: prometheus-loki-query-scheduler-headless.prometheus.svc.cluster.local:9095 index_gateway: mode: simple ingester: @@ -61,7 +61,7 @@ data: advertise_port: 7946 bind_port: 7946 join_members: - - loki-memberlist.syn-loki.svc.cluster.local + - prometheus-loki-memberlist.prometheus.svc.cluster.local max_join_backoff: 1m max_join_retries: 10 min_join_backoff: 1s @@ -81,7 +81,7 @@ data: writeback_size_limit: 500MB default_validity: 12h memcached_client: - addresses: dnssrvnoa+_memcached-client._tcp.loki-results-cache.syn-loki.svc.cluster.local + addresses: dnssrvnoa+_memcached-client._tcp.prometheus-loki-results-cache.prometheus.svc.cluster.local consistent_hash: true timeout: 500ms update_interval: 1m @@ -89,7 +89,7 @@ data: storage: s3: access_key_id: ${S3_ACCESS_KEY_ID} - bucketnames: loki-ruler + bucketnames: prometheus-ruler insecure: false s3forcepathstyle: true secret_access_key: ${S3_SECRET_ACCESS_KEY} @@ -125,23 +125,23 @@ data: working_directory: /var/loki/data/bloomshipper boltdb_shipper: index_gateway_client: - server_address: dns+loki-index-gateway-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+prometheus-loki-index-gateway-headless.prometheus.svc.cluster.local:9095 hedging: at: 250ms max_per_second: 20 up_to: 3 tsdb_shipper: index_gateway_client: - server_address: dns+loki-index-gateway-headless.syn-loki.svc.cluster.local:9095 + server_address: dns+prometheus-loki-index-gateway-headless.prometheus.svc.cluster.local:9095 use_thanos_objstore: false tracing: enabled: true kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki - namespace: syn-loki + namespace: prometheus diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/service.yaml similarity index 81% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/service.yaml index 16803fe..870302c 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/distributor/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-distributor - namespace: syn-loki + name: prometheus-loki-distributor + namespace: prometheus spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-distributor-headless - namespace: syn-loki + name: prometheus-loki-distributor-headless + namespace: prometheus spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/workload.yaml similarity index 90% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/workload.yaml index 5f5c0f7..3580628 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/distributor/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/distributor/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-distributor - namespace: syn-loki + name: prometheus-loki-distributor + namespace: prometheus spec: replicas: 3 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -24,11 +24,11 @@ spec: template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: 4121d9329e92666f9ca2fef9fc79381d6a19642c517c0698c628a0694f6a8ffa kubectl.kubernetes.io/default-container: distributor labels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -40,7 +40,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: distributor - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -61,7 +61,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -124,7 +124,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: prometheus-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/configmap.yaml similarity index 80% rename from tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/configmap.yaml index e1b451f..5a542a5 100644 --- a/tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/gateway/configmap.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/configmap.yaml @@ -215,74 +215,74 @@ data: \ 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://loki-read.syn-loki.svc.cluster.local:3100\";\n proxy_pass\ - \ $backend$request_uri;\n }\n\n # Distributor\n location = /api/prom/push\ - \ {\n \n set $backend \"http://loki-write.syn-loki.svc.cluster.local:3100\"\ + \ \"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\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/push\ - \ {\n \n set $backend \"http://loki-write.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-distributor.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /distributor/ring\ - \ {\n \n set $backend \"http://loki-write.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-distributor.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /otlp/v1/logs\ - \ {\n \n set $backend \"http://loki-write.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-distributor.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ingester\n \ - \ location = /flush {\n \n set $backend \"http://loki-write.syn-loki.svc.cluster.local:3100\"\ + \ location = /flush {\n \n set $backend \"http://prometheus-loki-ingester.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /ingester/\ - \ {\n \n set $backend \"http://loki-write.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-ingester.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /ingester\ \ {\n \n internal; # to suppress 301\n }\n\n # Ring\n \ - \ location = /ring {\n \n set $backend \"http://loki-write.syn-loki.svc.cluster.local:3100\"\ + \ location = /ring {\n \n set $backend \"http://prometheus-loki-ingester.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # MemberListKV\n\ - \ location = /memberlist {\n \n set $backend \"http://loki-write.syn-loki.svc.cluster.local:3100\"\ + \ location = /memberlist {\n \n set $backend \"http://prometheus-loki-ingester.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Ruler\n location\ - \ = /ruler/ring {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ = /ruler/ring {\n \n set $backend \"http://prometheus-loki-ruler.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom/rules\ - \ {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-ruler.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/rules/\ - \ {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-ruler.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/rules\ - \ {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-ruler.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /loki/api/v1/rules/\ - \ {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-ruler.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/alerts\ - \ {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-ruler.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /prometheus/api/v1/rules\ - \ {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-ruler.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Compactor\n \ - \ location = /compactor/ring {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ location = /compactor/ring {\n \n set $backend \"http://prometheus-loki-compactor.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/delete\ - \ {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-compactor.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/cache/generation_numbers\ - \ {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-compactor.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # IndexGateway\n\ - \ location = /indexgateway/ring {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ location = /indexgateway/ring {\n \n set $backend \"http://prometheus-loki-index-gateway.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryScheduler\n\ - \ location = /scheduler/ring {\n \n set $backend \"http://loki-backend.syn-loki.svc.cluster.local:3100\"\ + \ location = /scheduler/ring {\n \n set $backend \"http://prometheus-loki-query-scheduler.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # Config\n location\ - \ = /config {\n \n set $backend \"http://loki-write.syn-loki.svc.cluster.local:3100\"\ + \ = /config {\n \n set $backend \"http://prometheus-loki-ingester.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n\n # QueryFrontend,\ \ Querier\n location = /api/prom/tail {\n proxy_set_header Upgrade $http_upgrade;\n\ \ proxy_set_header Connection \"upgrade\";\n \n set $backend \ - \ \"http://loki-read.syn-loki.svc.cluster.local:3100\";\n proxy_pass \ - \ $backend$request_uri;\n }\n location = /loki/api/v1/tail {\n \ - \ proxy_set_header Upgrade $http_upgrade;\n proxy_set_header Connection \"\ - upgrade\";\n \n set $backend \"http://loki-read.syn-loki.svc.cluster.local:3100\"\ + \ \"http://prometheus-loki-query-frontend.prometheus.svc.cluster.local:3100\"\ + ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1/tail\ + \ {\n proxy_set_header Upgrade $http_upgrade;\n proxy_set_header Connection\ + \ \"upgrade\";\n \n set $backend \"http://prometheus-loki-query-frontend.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location ^~ /api/prom/\ - \ {\n \n set $backend \"http://loki-read.syn-loki.svc.cluster.local:3100\"\ + \ {\n \n set $backend \"http://prometheus-loki-query-frontend.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /api/prom\ \ {\n \n internal; # to suppress 301\n }\n location ^~\ \ /loki/api/v1/ {\n # pass custom headers set by Grafana as X-Query-Tags\ \ which are logged as key/value pairs in metrics.go log messages\n proxy_set_header\ \ X-Query-Tags \"${query_tags},user=${http_x_grafana_user},dashboard_id=${http_x_dashboard_uid},dashboard_title=${http_x_dashboard_title},panel_id=${http_x_panel_id},panel_title=${http_x_panel_title},source_rule_uid=${http_x_rule_uid},rule_name=${http_x_rule_name},rule_folder=${http_x_rule_folder},rule_version=${http_x_rule_version},rule_source=${http_x_rule_source},rule_type=${http_x_rule_type}\"\ - ;\n \n set $backend \"http://loki-read.syn-loki.svc.cluster.local:3100\"\ + ;\n \n set $backend \"http://prometheus-loki-query-frontend.prometheus.svc.cluster.local:3100\"\ ;\n proxy_pass $backend$request_uri;\n }\n location = /loki/api/v1\ \ {\n \n internal; # to suppress 301\n }\n }\n}\n" kind: ConfigMap metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: prometheus-loki-gateway + namespace: prometheus diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/deployment.yaml similarity index 89% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/deployment.yaml index 0694fe8..d37445b 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/gateway/deployment.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/deployment.yaml @@ -3,29 +3,29 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: prometheus-loki-gateway + namespace: prometheus spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki strategy: type: RollingUpdate template: metadata: annotations: - checksum/config: d983d4b135c64732f88dea989ad8aa77d312f04b272722a7fea4a9f3368128c2 + checksum/config: b4214835af6e0a0bd71f9c1ca89bb401473522575693ed543fbc4f55d6b6f56d labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki spec: affinity: @@ -34,7 +34,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: false @@ -123,11 +123,11 @@ spec: runAsUser: 101 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-gateway + serviceAccountName: prometheus-loki-gateway terminationGracePeriodSeconds: 30 volumes: - configMap: - name: loki-gateway + name: prometheus-loki-gateway name: config - emptyDir: {} name: tmp diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service-exporter.yaml similarity index 73% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service-exporter.yaml index 335b79e..acd9ee9 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/gateway/service-exporter.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service-exporter.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway-exporter - namespace: syn-loki + name: prometheus-loki-gateway-exporter + namespace: prometheus spec: ports: - name: http-metrics @@ -18,6 +18,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service.yaml similarity index 75% rename from tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service.yaml index 9c4984b..6cfd486 100644 --- a/tests/golden/extra-config/loki/loki/10_helm_loki/loki/templates/gateway/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/service.yaml @@ -4,13 +4,13 @@ metadata: annotations: null labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' - name: loki-gateway - namespace: syn-loki + name: prometheus-loki-gateway + namespace: prometheus spec: ports: - name: http @@ -19,6 +19,6 @@ spec: targetPort: http selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/serviceaccount.yaml similarity index 70% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/serviceaccount.yaml index 0ab016f..b025a0b 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/gateway/serviceaccount.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/gateway/serviceaccount.yaml @@ -4,9 +4,9 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-gateway - namespace: syn-loki + name: prometheus-loki-gateway + namespace: prometheus diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/service.yaml similarity index 81% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/service.yaml index ca98c4f..4797323 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/index-gateway/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-index-gateway - namespace: syn-loki + name: prometheus-loki-index-gateway + namespace: prometheus spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-index-gateway-headless - namespace: syn-loki + name: prometheus-loki-index-gateway-headless + namespace: prometheus spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/workload.yaml similarity index 88% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/workload.yaml index 1f6b347..11ace8c 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/index-gateway/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/index-gateway/workload.yaml @@ -3,29 +3,29 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-index-gateway - namespace: syn-loki + name: prometheus-loki-index-gateway + namespace: prometheus spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - serviceName: loki-index-gateway-headless + serviceName: prometheus-loki-index-gateway-headless template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: 4121d9329e92666f9ca2fef9fc79381d6a19642c517c0698c628a0694f6a8ffa kubectl.kubernetes.io/default-container: index-gateway labels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -37,7 +37,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: index-gateway - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -58,7 +58,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -121,7 +121,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: prometheus-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ingester/pdb.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/pdb.yaml similarity index 75% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ingester/pdb.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/pdb.yaml index c455ea7..43638a0 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/ingester/pdb.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/pdb.yaml @@ -3,12 +3,12 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: prometheus-loki-ingester + namespace: prometheus spec: maxUnavailable: 1 selector: @@ -19,5 +19,5 @@ spec: - ingester matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/service.yaml similarity index 81% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/service.yaml index 103726e..8c69552 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ingester/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: prometheus-loki-ingester + namespace: prometheus spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ingester-headless - namespace: syn-loki + name: prometheus-loki-ingester-headless + namespace: prometheus spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ingester/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/workload.yaml similarity index 88% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ingester/workload.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/workload.yaml index fc1c190..8bfb345 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ingester/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ingester/workload.yaml @@ -3,12 +3,12 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ingester - namespace: syn-loki + name: prometheus-loki-ingester + namespace: prometheus spec: podManagementPolicy: Parallel replicas: 3 @@ -16,17 +16,17 @@ spec: selector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - serviceName: loki-ingester-headless + serviceName: prometheus-loki-ingester-headless template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: 4121d9329e92666f9ca2fef9fc79381d6a19642c517c0698c628a0694f6a8ffa kubectl.kubernetes.io/default-container: ingester labels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -38,7 +38,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -60,7 +60,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -123,13 +123,13 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: prometheus-loki terminationGracePeriodSeconds: 300 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: ingester - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/memcached/serviceaccount.yaml similarity index 70% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/memcached/serviceaccount.yaml index befdd16..6830a8d 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/memcached/serviceaccount.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/memcached/serviceaccount.yaml @@ -4,9 +4,9 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/component: memcached - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-memcached - namespace: syn-loki + name: prometheus-loki-memcached + namespace: prometheus diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/.keep.yaml similarity index 100% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/monitoring/.keep.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/.keep.yaml diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/loki-rules.yaml similarity index 83% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/loki-rules.yaml index 2efecb4..6221967 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/loki-rules.yaml @@ -2,12 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-loki-rules - namespace: syn-loki + name: prometheus-loki-loki-rules + namespace: prometheus spec: groups: - name: loki_rules @@ -15,85 +15,85 @@ spec: - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)) labels: - cluster: loki + cluster: prometheus-loki record: job:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)) labels: - cluster: loki + cluster: prometheus-loki record: job:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) / sum(rate(loki_request_duration_seconds_count[1m])) by (job) labels: - cluster: loki + cluster: prometheus-loki record: job:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job) labels: - cluster: loki + cluster: prometheus-loki record: job:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) labels: - cluster: loki + cluster: prometheus-loki record: job:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job) labels: - cluster: loki + cluster: prometheus-loki record: job:loki_request_duration_seconds_count:sum_rate - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)) labels: - cluster: loki + cluster: prometheus-loki record: job_route:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)) labels: - cluster: loki + cluster: prometheus-loki record: job_route:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) / sum(rate(loki_request_duration_seconds_count[1m])) by (job, route) labels: - cluster: loki + cluster: prometheus-loki record: job_route:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route) labels: - cluster: loki + cluster: prometheus-loki record: job_route:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) labels: - cluster: loki + cluster: prometheus-loki record: job_route:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job, route) labels: - cluster: loki + cluster: prometheus-loki record: job_route:loki_request_duration_seconds_count:sum_rate - expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route)) labels: - cluster: loki + cluster: prometheus-loki record: namespace_job_route:loki_request_duration_seconds:99quantile - expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route)) labels: - cluster: loki + cluster: prometheus-loki record: namespace_job_route:loki_request_duration_seconds:50quantile - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job, route) / sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: prometheus-loki record: namespace_job_route:loki_request_duration_seconds:avg - expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace, job, route) labels: - cluster: loki + cluster: prometheus-loki record: namespace_job_route:loki_request_duration_seconds_bucket:sum_rate - expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: prometheus-loki record: namespace_job_route:loki_request_duration_seconds_sum:sum_rate - expr: sum(rate(loki_request_duration_seconds_count[1m])) by (namespace, job, route) labels: - cluster: loki + cluster: prometheus-loki record: namespace_job_route:loki_request_duration_seconds_count:sum_rate diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml similarity index 75% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml index edf226f..1eb12c4 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml @@ -2,12 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki - namespace: syn-loki + name: prometheus-loki + namespace: prometheus spec: endpoints: - interval: 15s @@ -15,12 +15,12 @@ spec: port: http-metrics relabelings: - action: replace - replacement: syn-loki/$1 + replacement: prometheus/$1 sourceLabels: - job targetLabel: job - action: replace - replacement: loki + replacement: prometheus-loki targetLabel: cluster scheme: http selector: @@ -30,5 +30,5 @@ spec: values: - 'false' matchLabels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/service.yaml similarity index 81% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/service.yaml index 6373201..9887b97 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/overrides-exporter/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-overrides-exporter - namespace: syn-loki + name: prometheus-loki-overrides-exporter + namespace: prometheus spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-overrides-exporter-headless - namespace: syn-loki + name: prometheus-loki-overrides-exporter-headless + namespace: prometheus spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/workload.yaml similarity index 89% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/workload.yaml index 8200128..fac57f7 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/overrides-exporter/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/overrides-exporter/workload.yaml @@ -3,28 +3,28 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-overrides-exporter - namespace: syn-loki + name: prometheus-loki-overrides-exporter + namespace: prometheus spec: replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: 4121d9329e92666f9ca2fef9fc79381d6a19642c517c0698c628a0694f6a8ffa kubectl.kubernetes.io/default-container: overrides-exporter labels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -36,7 +36,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: overrides-exporter - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -57,7 +57,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -120,7 +120,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: prometheus-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/querier/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/service.yaml similarity index 81% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/querier/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/service.yaml index c3ff71d..855c855 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/querier/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-querier - namespace: syn-loki + name: prometheus-loki-querier + namespace: prometheus spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-querier-headless - namespace: syn-loki + name: prometheus-loki-querier-headless + namespace: prometheus spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/workload.yaml similarity index 89% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/workload.yaml index 8e884b7..f72bc9f 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/querier/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/querier/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-querier - namespace: syn-loki + name: prometheus-loki-querier + namespace: prometheus spec: replicas: 3 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: 4121d9329e92666f9ca2fef9fc79381d6a19642c517c0698c628a0694f6a8ffa kubectl.kubernetes.io/default-container: querier labels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -62,7 +62,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -125,13 +125,13 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: prometheus-loki terminationGracePeriodSeconds: 30 topologySpreadConstraints: - labelSelector: matchLabels: app.kubernetes.io/component: querier - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki maxSkew: 1 topologyKey: kubernetes.io/hostname diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/service.yaml similarity index 81% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/service.yaml index e4fb538..b6d343e 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-frontend/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-frontend - namespace: syn-loki + name: prometheus-loki-query-frontend + namespace: prometheus spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-query-frontend-headless - namespace: syn-loki + name: prometheus-loki-query-frontend-headless + namespace: prometheus spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/workload.yaml similarity index 90% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/workload.yaml index d530387..f053bae 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/query-frontend/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-frontend/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-frontend - namespace: syn-loki + name: prometheus-loki-query-frontend + namespace: prometheus spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: 4121d9329e92666f9ca2fef9fc79381d6a19642c517c0698c628a0694f6a8ffa kubectl.kubernetes.io/default-container: query-frontend labels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: query-frontend - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -62,7 +62,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: prometheus-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/pdb.yaml similarity index 70% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/pdb.yaml index 1331b7c..655a7ee 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/query-scheduler/pdb.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/pdb.yaml @@ -3,16 +3,16 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: prometheus-loki-query-scheduler + namespace: prometheus spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/service.yaml similarity index 81% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/service.yaml index 244ac9b..fa833e7 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/query-scheduler/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: prometheus-loki-query-scheduler + namespace: prometheus spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-query-scheduler-headless - namespace: syn-loki + name: prometheus-loki-query-scheduler-headless + namespace: prometheus spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/workload.yaml similarity index 89% rename from tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/workload.yaml index e309432..9688b0b 100644 --- a/tests/golden/prometheus/loki/loki/10_helm_loki/loki/templates/query-scheduler/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/query-scheduler/workload.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-query-scheduler - namespace: syn-loki + name: prometheus-loki-query-scheduler + namespace: prometheus spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki strategy: rollingUpdate: @@ -25,11 +25,11 @@ spec: template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: 4121d9329e92666f9ca2fef9fc79381d6a19642c517c0698c628a0694f6a8ffa kubectl.kubernetes.io/default-container: query-scheduler labels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -41,7 +41,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: query-scheduler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -60,7 +60,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -117,7 +117,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: prometheus-loki terminationGracePeriodSeconds: 30 volumes: - emptyDir: {} diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/pdb.yaml similarity index 67% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/pdb.yaml index e0dd622..35f57fa 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/results-cache/pdb.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/pdb.yaml @@ -3,14 +3,14 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - name: loki-results-cache - namespace: syn-loki + name: prometheus-loki-results-cache + namespace: prometheus spec: maxUnavailable: 1 selector: matchLabels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/service.yaml similarity index 77% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/service.yaml index f7b1722..c1f3b74 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/results-cache/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-results-cache - namespace: syn-loki + name: prometheus-loki-results-cache + namespace: prometheus spec: clusterIP: None ports: @@ -21,6 +21,6 @@ spec: targetPort: http-metrics selector: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/statefulset.yaml similarity index 91% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/statefulset.yaml index be0a592..b2e1909 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/results-cache/statefulset.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/results-cache/statefulset.yaml @@ -4,30 +4,30 @@ metadata: annotations: {} labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: memcached-results-cache - name: loki-results-cache - namespace: syn-loki + name: prometheus-loki-results-cache + namespace: prometheus spec: podManagementPolicy: Parallel replicas: 2 selector: matchLabels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki name: memcached-results-cache - serviceName: loki-results-cache + serviceName: prometheus-loki-results-cache template: metadata: annotations: bucketSecretVersion: '0' labels: app.kubernetes.io/component: memcached-results-cache - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki name: memcached-results-cache spec: @@ -43,7 +43,7 @@ spec: env: null envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/library/memcached:1.6.42-alpine imagePullPolicy: IfNotPresent livenessProbe: @@ -125,7 +125,7 @@ spec: runAsUser: 11211 seccompProfile: type: RuntimeDefault - serviceAccountName: loki-memcached + serviceAccountName: prometheus-loki-memcached terminationGracePeriodSeconds: 60 tolerations: [] topologySpreadConstraints: [] diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ruler/service.yaml similarity index 81% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ruler/service.yaml index 3cb0cf9..e3c3729 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/ruler/service.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ruler/service.yaml @@ -4,12 +4,12 @@ metadata: annotations: null labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ruler - namespace: syn-loki + name: prometheus-loki-ruler + namespace: prometheus spec: ports: - name: http-metrics @@ -27,7 +27,7 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP --- @@ -37,14 +37,14 @@ metadata: annotations: null labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 prometheus.io/service-monitor: 'false' variant: headless - name: loki-ruler-headless - namespace: syn-loki + name: prometheus-loki-ruler-headless + namespace: prometheus spec: clusterIP: None ports: @@ -63,6 +63,6 @@ spec: publishNotReadyAddresses: true selector: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki type: ClusterIP diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ruler/workload.yaml similarity index 88% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ruler/workload.yaml index cac7c0f..22bde45 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/ruler/workload.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/ruler/workload.yaml @@ -3,29 +3,29 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-ruler - namespace: syn-loki + name: prometheus-loki-ruler + namespace: prometheus spec: replicas: 2 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki - serviceName: loki-ruler-headless + serviceName: prometheus-loki-ruler-headless template: metadata: annotations: - checksum/config: 0d304c8e8cd773f042bee70064c291b099e0fbd43aff91917a59868f1e7ccb2c + checksum/config: 4121d9329e92666f9ca2fef9fc79381d6a19642c517c0698c628a0694f6a8ffa kubectl.kubernetes.io/default-container: ruler labels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: 3.7.2 @@ -37,7 +37,7 @@ spec: - labelSelector: matchLabels: app.kubernetes.io/component: ruler - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki topologyKey: kubernetes.io/hostname automountServiceAccountToken: true @@ -58,7 +58,7 @@ spec: fieldPath: status.podIP envFrom: - secretRef: - name: loki-bucket-secret + name: prometheus-bucket-secret image: docker.io/docker.io/grafana/loki:3.7.2 imagePullPolicy: IfNotPresent livenessProbe: @@ -121,7 +121,7 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccountName: loki + serviceAccountName: prometheus-loki terminationGracePeriodSeconds: 300 volumes: - emptyDir: {} diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/runtime-configmap.yaml similarity index 75% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/runtime-configmap.yaml index 0608979..b05009d 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/runtime-configmap.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/runtime-configmap.yaml @@ -5,9 +5,9 @@ data: kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 name: loki-runtime - namespace: syn-loki + namespace: prometheus diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/service-memberlist.yaml similarity index 73% rename from tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/service-memberlist.yaml index 15e5ae9..d097052 100644 --- a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/service-memberlist.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/service-memberlist.yaml @@ -3,12 +3,12 @@ kind: Service metadata: annotations: null labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki-memberlist - namespace: syn-loki + name: prometheus-loki-memberlist + namespace: prometheus spec: clusterIP: None ports: @@ -17,7 +17,7 @@ spec: protocol: TCP targetPort: http-memberlist selector: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/part-of: memberlist type: ClusterIP diff --git a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/serviceaccount.yaml similarity index 67% rename from tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml rename to tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/serviceaccount.yaml index 9ad651b..0a7fbc6 100644 --- a/tests/golden/openshift/loki/loki/10_helm_loki/loki/templates/serviceaccount.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/10_helm_loki/loki/templates/serviceaccount.yaml @@ -3,9 +3,9 @@ automountServiceAccountToken: true kind: ServiceAccount metadata: labels: - app.kubernetes.io/instance: loki + app.kubernetes.io/instance: prometheus app.kubernetes.io/name: loki app.kubernetes.io/version: 3.7.2 helm.sh/chart: loki-17.4.11 - name: loki - namespace: syn-loki + name: prometheus-loki + namespace: prometheus diff --git a/tests/golden/prometheus/loki/loki/20_prometheus_rule.yaml b/tests/golden/prometheus/prometheus/prometheus/20_prometheus_rule.yaml similarity index 94% rename from tests/golden/prometheus/loki/loki/20_prometheus_rule.yaml rename to tests/golden/prometheus/prometheus/prometheus/20_prometheus_rule.yaml index b2da639..ddf8486 100644 --- a/tests/golden/prometheus/loki/loki/20_prometheus_rule.yaml +++ b/tests/golden/prometheus/prometheus/prometheus/20_prometheus_rule.yaml @@ -6,7 +6,7 @@ metadata: monitoring.syn.tools/enabled: 'true' name: loki-custom name: loki-custom - namespace: syn-loki + namespace: prometheus spec: groups: - name: loki-custom.rules