Skip to content

Commit

Permalink
chore(kubernetes): add ndots to apps
Browse files Browse the repository at this point in the history
  • Loading branch information
buroa committed Jan 5, 2024
1 parent 00774d7 commit da9afb4
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 16 deletions.
1 change: 1 addition & 0 deletions kubernetes/apps/default/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ metadata:
name: default
labels:
kustomize.toolkit.fluxcd.io/prune: disabled
kyverno.io/add-ndots: "true"
1 change: 1 addition & 0 deletions kubernetes/apps/home/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ metadata:
name: home
labels:
kustomize.toolkit.fluxcd.io/prune: disabled
kyverno.io/add-ndots: "true"
1 change: 1 addition & 0 deletions kubernetes/apps/media/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ metadata:
name: media
labels:
kustomize.toolkit.fluxcd.io/prune: disabled
kyverno.io/add-ndots: "true"
10 changes: 5 additions & 5 deletions kubernetes/apps/monitoring/grafana/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ spec:
name: &secret grafana-secret
replicas: 3
env:
GF_AUTH_GENERIC_OAUTH_TOKEN_URL: http://authelia.security.svc.cluster.local:9091/api/oidc/token
GF_AUTH_GENERIC_OAUTH_API_URL: http://authelia.security.svc.cluster.local:9091/api/oidc/userinfo
GF_AUTH_GENERIC_OAUTH_TOKEN_URL: http://authelia.security.svc.cluster.local.:9091/api/oidc/token
GF_AUTH_GENERIC_OAUTH_API_URL: http://authelia.security.svc.cluster.local.:9091/api/oidc/userinfo
GF_AUTH_GENERIC_OAUTH_AUTH_URL: https://auth.${PUBLIC_DOMAIN}/api/oidc/authorization
GF_AUTH_GENERIC_OAUTH_CLIENT_ID: grafana
GF_DATE_FORMATS_USE_BROWSER_LOCALE: true
Expand Down Expand Up @@ -163,22 +163,22 @@ spec:
type: prometheus
uid: prometheus
access: proxy
url: http://thanos-query-frontend.monitoring.svc.cluster.local:9090
url: http://thanos-query-frontend.monitoring.svc.cluster.local.:9090
jsonData:
prometheusType: Thanos
isDefault: true
- name: Alertmanager
type: alertmanager
uid: alertmanager
access: proxy
url: http://alertmanager-operated.monitoring.svc.cluster.local:9093
url: http://alertmanager-operated.monitoring.svc.cluster.local.:9093
jsonData:
implementation: prometheus
- name: Loki
type: loki
uid: loki
access: proxy
url: http://loki-gateway.monitoring.svc.cluster.local:80
url: http://loki-gateway.monitoring.svc.cluster.local.:80
jsonData:
maxLines: 250
dashboards:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/monitoring/karma/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
repository: ghcr.io/prymitive/karma
tag: v0.118@sha256:f116547287c662263e03b6a82e1deb18157c3a213787506ceb38bb7d24298844
env:
ALERTMANAGER_URI: http://alertmanager-operated.monitoring.svc.cluster.local:9093
ALERTMANAGER_URI: http://alertmanager-operated.monitoring.svc.cluster.local.:9093
probes:
liveness: &probes
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/monitoring/loki/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ spec:
ruler:
enable_api: true
enable_alertmanager_v2: true
alertmanager_url: http://alertmanager-operated.monitoring.svc.cluster.local:9093
alertmanager_url: http://alertmanager-operated.monitoring.svc.cluster.local.:9093
storage:
type: local
local:
Expand Down
8 changes: 4 additions & 4 deletions kubernetes/apps/monitoring/thanos/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ spec:
type: REDIS
config:
addr: >-
redis-node-0.redis-headless.databases.svc.cluster.local:26379,
redis-node-1.redis-headless.databases.svc.cluster.local:26379,
redis-node-2.redis-headless.databases.svc.cluster.local:26379
redis-node-0.redis-headless.databases.svc.cluster.local.:26379,
redis-node-1.redis-headless.databases.svc.cluster.local.:26379,
redis-node-2.redis-headless.databases.svc.cluster.local.:26379
master_name: redis-master
ingress:
enabled: true
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
replicaLabel: __replica__
clusterName: k8s
alertmanagers:
- http://alertmanager-operated.monitoring.svc.cluster.local:9093
- http://alertmanager-operated.monitoring.svc.cluster.local.:9093
extraFlags:
- --web.prefix-header=X-Forwarded-Prefix
config: |-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ sinks:
type: vector
inputs:
- kubernetes_logs
address: "vector-aggregator.monitoring.svc.cluster.local:6000"
address: "vector-aggregator.monitoring.svc.cluster.local.:6000"
version: "2"
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ sinks:
type: loki
inputs:
- kubernetes_transform
endpoint: http://loki-gateway.monitoring.svc.cluster.local:80
endpoint: http://loki-gateway.monitoring.svc.cluster.local.:80
encoding:
codec: json
batch:
Expand All @@ -105,7 +105,7 @@ sinks:
type: loki
inputs:
- talos_kernel_transform
endpoint: http://loki-gateway.monitoring.svc.cluster.local:80
endpoint: http://loki-gateway.monitoring.svc.cluster.local.:80
encoding:
codec: json
except_fields:
Expand All @@ -122,7 +122,7 @@ sinks:
type: loki
inputs:
- talos_service_transform
endpoint: http://loki-gateway.monitoring.svc.cluster.local:80
endpoint: http://loki-gateway.monitoring.svc.cluster.local.:80
encoding:
codec: json
except_fields:
Expand All @@ -139,7 +139,7 @@ sinks:
type: loki
inputs:
- unifi_kernel_transform
endpoint: http://loki-gateway.monitoring.svc.cluster.local:80
endpoint: http://loki-gateway.monitoring.svc.cluster.local.:80
encoding:
codec: json
batch:
Expand Down
1 change: 1 addition & 0 deletions kubernetes/apps/networking/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ metadata:
name: networking
labels:
kustomize.toolkit.fluxcd.io/prune: disabled
kyverno.io/add-ndots: "true"
1 change: 1 addition & 0 deletions kubernetes/apps/security/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ metadata:
name: security
labels:
kustomize.toolkit.fluxcd.io/prune: disabled
kyverno.io/add-ndots: "true"

0 comments on commit da9afb4

Please sign in to comment.