Skip to content

Commit 6ac3350

Browse files
ktkfreektkfree
authored
Merge pull request #250 from openinfradev/develop
20241002 release from develop
2 parents 345bc1b + 43b9811 commit 6ac3350

File tree

22 files changed

+1165
-28
lines changed

22 files changed

+1165
-28
lines changed

‎aws-msa-reference/lma/site-values.yaml

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ global:
1616

1717
lokiHost: loki-loki-distributed-gateway
1818
lokiPort: 80
19+
lokiuserHost: loki-user-loki-distributed-gateway
20+
lokiuserPort: 80
1921
s3Service: "minio.lma.svc:9000" # depends on $lmaNameSpace (ex. minio.taco-system.svc)
2022

2123
lmaNameSpace: lma
@@ -148,13 +150,17 @@ charts:
148150
- name: taco-loki
149151
host: $(lokiHost)
150152
port: $(lokiPort)
153+
lokiuser:
154+
- name: taco-loki-user
155+
host: $(lokiuserHost)
156+
port: $(lokiuserPort)
151157
targetLogs:
152158
- tag: kube.*
153159
bufferChunkSize: 2M
154160
bufferMaxSize: 5M
155-
do_not_store_as_default: true
161+
do_not_store_as_default: false
156162
index: container
157-
loki_name: taco-loki
163+
loki_name: taco-loki-user
158164
memBufLimit: 20MB
159165
multi_index:
160166
- index: platform
@@ -275,7 +281,7 @@ charts:
275281
storegateway.persistence.size: 8Gi
276282
ruler.nodeSelector: $(nodeSelector)
277283
ruler.service.type: LoadBalancer
278-
ruler.service.annotations: $(awsNlbAnnotation)
284+
ruler.service.annotations: $(awsNlbAnnotation)
279285
ruler.alertmanagers:
280286
- http://alertmanager-operated:9093
281287
ruler.persistence.size: 8Gi
@@ -285,7 +291,7 @@ charts:
285291
rules:
286292
- alert: "PrometheusDown"
287293
expr: absent(up{prometheus="lma/lma-prometheus"})
288-
294+
289295
- name: thanos-config
290296
override:
291297
objectStorage:
@@ -341,10 +347,42 @@ charts:
341347
aws:
342348
s3: http://$(defaultUser):$(defaultPassword)@$(s3Service)/minio
343349

350+
- name: loki-user
351+
override:
352+
global.dnsService: kube-dns
353+
# global.clusterDomain: $(clusterName) # annotate cluste because the cluster name is still cluster.local regardless cluster
354+
gateway.service.type: LoadBalancer
355+
gateway.service.annotations: $(awsNlbAnnotation)
356+
ingester.persistence.storageClass: $(storageClassName)
357+
distributor.persistence.storageClass: $(storageClassName)
358+
queryFrontend.persistence.storageClass: $(storageClassName)
359+
ruler.persistence.storageClass: $(storageClassName)
360+
indexGateway.persistence.storageClass: $(storageClassName)
361+
# select target node's label
362+
ingester.nodeSelector: $(nodeSelector)
363+
distributor.nodeSelector: $(nodeSelector)
364+
querier.nodeSelector: $(nodeSelector)
365+
queryFrontend.nodeSelector: $(nodeSelector)
366+
queryScheduler.nodeSelector: $(nodeSelector)
367+
tableManager.nodeSelector: $(nodeSelector)
368+
gateway.nodeSelector: $(nodeSelector)
369+
compactor.nodeSelector: $(nodeSelector)
370+
ruler.nodeSelector: $(nodeSelector)
371+
indexGateway.nodeSelector: $(nodeSelector)
372+
memcachedChunks.nodeSelector: $(nodeSelector)
373+
memcachedFrontend.nodeSelector: $(nodeSelector)
374+
memcachedIndexQueries.nodeSelector: $(nodeSelector)
375+
memcachedIndexWrites.nodeSelector: $(nodeSelector)
376+
loki:
377+
storageConfig:
378+
aws:
379+
s3: http://$(defaultUser):$(defaultPassword)@$(s3Service)/minio
380+
344381
- name: lma-bucket
345382
override:
346383
s3.enabled: true
347384
s3.buckets:
348385
- name: $(clusterName)-tks-thanos
349386
- name: $(clusterName)-tks-loki
387+
- name: $(clusterName)-tks-loki-user
350388
tks.iamRoles: $(tksIamRoles)

‎aws-msa-reference/tks-cluster/site-values.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ charts:
2727
sshKeyName: $(sshKeyName)
2828
cluster:
2929
name: $(clusterName)
30-
kubernetesVersion: v1.26.10
30+
kubernetesVersion: v1.29.8
3131
eksEnabled: false
3232
multitenancyId:
3333
kind: AWSClusterRoleIdentity
@@ -54,6 +54,8 @@ charts:
5454
kubeadmControlPlane:
5555
replicas: $(tksCpNode)
5656
controlPlaneMachineType: $(tksCpNodeType)
57+
ami:
58+
id: ami-02e4e8f09921cfe97
5759
machinePool:
5860
- name: taco
5961
machineType: $(tksInfraNodeType)
@@ -69,6 +71,8 @@ charts:
6971
taco-ingress-gateway: enabled
7072
roleAdditionalPolicies:
7173
- "arn:aws:iam::aws:policy/AmazonS3FullAccess"
74+
ami:
75+
id: ami-02e4e8f09921cfe97
7276
machineDeployment:
7377
- name: normal
7478
numberOfAZ: 3 # ap-northeast-2
@@ -80,6 +84,8 @@ charts:
8084
rootVolume:
8185
size: 50
8286
type: gp2
87+
ami:
88+
id: ami-02e4e8f09921cfe97
8389

8490
- name: ingress-nginx
8591
override:

‎aws-reference/lma/site-values.yaml

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ global:
1616

1717
lokiHost: loki-loki-distributed-gateway
1818
lokiPort: 80
19+
lokiuserHost: loki-user-loki-distributed-gateway
20+
lokiuserPort: 80
1921
s3Service: "minio.lma.svc:9000" # depends on $lmaNameSpace (ex. minio.taco-system.svc)
2022

2123
lmaNameSpace: lma
@@ -148,13 +150,17 @@ charts:
148150
- name: taco-loki
149151
host: $(lokiHost)
150152
port: $(lokiPort)
153+
lokiuser:
154+
- name: taco-loki-user
155+
host: $(lokiuserHost)
156+
port: $(lokiuserPort)
151157
targetLogs:
152158
- tag: kube.*
153159
bufferChunkSize: 2M
154160
bufferMaxSize: 5M
155-
do_not_store_as_default: true
161+
do_not_store_as_default: false
156162
index: container
157-
loki_name: taco-loki
163+
loki_name: taco-loki-user
158164
memBufLimit: 20MB
159165
multi_index:
160166
- index: platform
@@ -244,7 +250,6 @@ charts:
244250
consoleIngress.nodeSelector: $(nodeSelector)
245251
postJob.nodeSelector: $(nodeSelector)
246252

247-
248253
- name: thanos
249254
override:
250255
global.storageClass: $(storageClassName)
@@ -341,10 +346,42 @@ charts:
341346
aws:
342347
s3: http://$(defaultUser):$(defaultPassword)@$(s3Service)/minio
343348

349+
- name: loki-user
350+
override:
351+
global.dnsService: kube-dns
352+
# global.clusterDomain: $(clusterName) # annotate cluste because the cluster name is still cluster.local regardless cluster
353+
gateway.service.type: LoadBalancer
354+
gateway.service.annotations: $(awsNlbAnnotation)
355+
ingester.persistence.storageClass: $(storageClassName)
356+
distributor.persistence.storageClass: $(storageClassName)
357+
queryFrontend.persistence.storageClass: $(storageClassName)
358+
ruler.persistence.storageClass: $(storageClassName)
359+
indexGateway.persistence.storageClass: $(storageClassName)
360+
# select target node's label
361+
ingester.nodeSelector: $(nodeSelector)
362+
distributor.nodeSelector: $(nodeSelector)
363+
querier.nodeSelector: $(nodeSelector)
364+
queryFrontend.nodeSelector: $(nodeSelector)
365+
queryScheduler.nodeSelector: $(nodeSelector)
366+
tableManager.nodeSelector: $(nodeSelector)
367+
gateway.nodeSelector: $(nodeSelector)
368+
compactor.nodeSelector: $(nodeSelector)
369+
ruler.nodeSelector: $(nodeSelector)
370+
indexGateway.nodeSelector: $(nodeSelector)
371+
memcachedChunks.nodeSelector: $(nodeSelector)
372+
memcachedFrontend.nodeSelector: $(nodeSelector)
373+
memcachedIndexQueries.nodeSelector: $(nodeSelector)
374+
memcachedIndexWrites.nodeSelector: $(nodeSelector)
375+
loki:
376+
storageConfig:
377+
aws:
378+
s3: http://$(defaultUser):$(defaultPassword)@$(s3Service)/minio
379+
344380
- name: lma-bucket
345381
override:
346382
s3.enabled: true
347383
s3.buckets:
348384
- name: $(clusterName)-tks-thanos
349385
- name: $(clusterName)-tks-loki
386+
- name: $(clusterName)-tks-loki-user
350387
tks.iamRoles: $(tksIamRoles)

‎aws-reference/tks-cluster/site-values.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ charts:
2727
sshKeyName: $(sshKeyName)
2828
cluster:
2929
name: $(clusterName)
30-
kubernetesVersion: v1.26.10
30+
kubernetesVersion: v1.29.8
3131
eksEnabled: false
3232
multitenancyId:
3333
kind: AWSClusterRoleIdentity
@@ -54,6 +54,8 @@ charts:
5454
kubeadmControlPlane:
5555
replicas: $(tksCpNode)
5656
controlPlaneMachineType: $(tksCpNodeType)
57+
ami:
58+
id: ami-02e4e8f09921cfe97
5759
machinePool:
5860
- name: taco
5961
machineType: $(tksInfraNodeType)
@@ -69,6 +71,8 @@ charts:
6971
taco-ingress-gateway: enabled
7072
roleAdditionalPolicies:
7173
- "arn:aws:iam::aws:policy/AmazonS3FullAccess"
74+
ami:
75+
id: ami-02e4e8f09921cfe97
7276
machineDeployment:
7377
- name: normal
7478
numberOfAZ: 3 # ap-northeast-2
@@ -80,6 +84,8 @@ charts:
8084
rootVolume:
8185
size: 50
8286
type: gp2
87+
ami:
88+
id: ami-02e4e8f09921cfe97
8389

8490
- name: ingress-nginx
8591
override:

‎byoh-reference/lma/site-values.yaml

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ global:
1616

1717
lokiHost: loki-loki-distributed-gateway
1818
lokiPort: 80
19+
lokiuserHost: loki-user-loki-distributed-gateway
20+
lokiuserPort: 80
1921
s3Service: "minio.lma.svc:9000" # depends on $lmaNameSpace (ex. minio.taco-system.svc)
2022

2123
lmaNameSpace: lma
@@ -151,13 +153,17 @@ charts:
151153
- name: taco-loki
152154
host: $(lokiHost)
153155
port: $(lokiPort)
156+
lokiuser:
157+
- name: taco-loki-user
158+
host: $(lokiuserHost)
159+
port: $(lokiuserPort)
154160
targetLogs:
155161
- tag: kube.*
156162
bufferChunkSize: 2M
157163
bufferMaxSize: 5M
158-
do_not_store_as_default: true
164+
do_not_store_as_default: false
159165
index: container
160-
loki_name: taco-loki
166+
loki_name: taco-loki-user
161167
memBufLimit: 20MB
162168
multi_index:
163169
- index: platform
@@ -282,18 +288,20 @@ charts:
282288
# - --deduplication.replica-label="replica"
283289
storegateway.persistence.size: 8Gi
284290
ruler.nodeSelector: $(nodeSelector)
285-
ruler.service.type: LoadBalancer
286-
ruler.service.annotations: $(awsNlbAnnotation)
287291
ruler.alertmanagers:
288292
- http://alertmanager-operated:9093
289293
ruler.persistence.size: 8Gi
294+
ruler.service:
295+
type: NodePort
296+
nodePort: 30007
290297
ruler.config:
291298
groups:
292299
- name: "tks"
293300
rules:
294301
- alert: "PrometheusDown"
295302
expr: absent(up{prometheus="lma/lma-prometheus"})
296303

304+
297305
- name: thanos-config
298306
override:
299307
objectStorage:
@@ -350,6 +358,38 @@ charts:
350358
aws:
351359
s3: http://$(defaultUser):$(defaultPassword)@$(s3Service)/minio
352360

361+
- name: loki-user
362+
override:
363+
global.dnsService: kube-dns
364+
gateway.service:
365+
type: NodePort
366+
nodePort: 30006
367+
gateway.service.annotations: $(awsNlbAnnotation)
368+
ingester.persistence.storageClass: $(storageClassName)
369+
distributor.persistence.storageClass: $(storageClassName)
370+
queryFrontend.persistence.storageClass: $(storageClassName)
371+
ruler.persistence.storageClass: $(storageClassName)
372+
indexGateway.persistence.storageClass: $(storageClassName)
373+
# select target node's label
374+
ingester.nodeSelector: $(nodeSelector)
375+
distributor.nodeSelector: $(nodeSelector)
376+
querier.nodeSelector: $(nodeSelector)
377+
queryFrontend.nodeSelector: $(nodeSelector)
378+
queryScheduler.nodeSelector: $(nodeSelector)
379+
tableManager.nodeSelector: $(nodeSelector)
380+
gateway.nodeSelector: $(nodeSelector)
381+
compactor.nodeSelector: $(nodeSelector)
382+
ruler.nodeSelector: $(nodeSelector)
383+
indexGateway.nodeSelector: $(nodeSelector)
384+
memcachedChunks.nodeSelector: $(nodeSelector)
385+
memcachedFrontend.nodeSelector: $(nodeSelector)
386+
memcachedIndexQueries.nodeSelector: $(nodeSelector)
387+
memcachedIndexWrites.nodeSelector: $(nodeSelector)
388+
loki:
389+
storageConfig:
390+
aws:
391+
s3: http://$(defaultUser):$(defaultPassword)@$(s3Service)/minio
392+
353393
- name: lma-bucket
354394
override:
355395
s3.enabled: true

‎byoh-reference/tks-cluster/site-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ charts:
1818
override:
1919
cluster:
2020
name: $(clusterName)
21-
kubernetesVersion: v1.25.11
21+
kubernetesVersion: v1.29.8
2222
byoCluster:
2323
bundleLookupBaseRegistry: harbor.taco-cat.xyz/cluster_api_provider_bringyourownhost
2424
controlPlaneEndpoint:

‎byok-reference/lma/kustomization.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
resources:
2+
- ../base
3+
4+
transformers:
5+
- site-values.yaml

0 commit comments

Comments
 (0)