Skip to content

Commit 4e63f61

Browse files
gabemonterorh-tap-build-team[bot]
gabemontero
and
rh-tap-build-team[bot]
authored
KFLUXBUGS-863: introduce results fixes with requisite performance related tuning (dev/stage) (#3884)
* update components/monitoring/grafana/base/dashboards/pipeline-service/kustomization.yaml * update components/pipeline-service/development/kustomization.yaml * update components/pipeline-service/staging/base/kustomization.yaml * update components/pipeline-service/staging/stone-stage-p01/deploy.yaml * update components/pipeline-service/staging/stone-stg-m01/deploy.yaml * update components/pipeline-service/staging/stone-stg-rh01/deploy.yaml * KFLUXBUGS-863: introduce results fixes with requisite performance related tuning (dev/stage) rh-pre-commit.version: 2.3.0 rh-pre-commit.check-secrets: ENABLED --------- Co-authored-by: rh-tap-build-team[bot] <127938674+rh-tap-build-team[bot]@users.noreply.github.com>
1 parent e95d2b1 commit 4e63f61

File tree

12 files changed

+221
-32
lines changed

12 files changed

+221
-32
lines changed

‎components/monitoring/grafana/base/dashboards/pipeline-service/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
resources:
5-
- https://github.com/openshift-pipelines/pipeline-service/operator/gitops/argocd/grafana/?ref=72287aca6503f631b917debc27683a508f7e45ad
5+
- https://github.com/openshift-pipelines/pipeline-service/operator/gitops/argocd/grafana/?ref=3ed2e97d4eacb0252b153edd2d6006637acb528e

‎components/pipeline-service/development/bump-results-watcher-replicas.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
- op: replace
22
path: /spec/replicas
33
# default pipeline-service setting is 1
4-
value: 2
4+
value: 1

‎components/pipeline-service/development/config.env

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
DB_USER=
2+
DB_PASSWORD=
3+
DB_HOST=
4+
DB_PORT=5432
5+
DB_NAME=
6+
DB_SSLMODE=disable
7+
DB_SSLROOTCERT=
8+
DB_ENABLE_AUTO_MIGRATION=true
9+
SERVER_PORT=8080
10+
PROMETHEUS_PORT=9090
11+
PROMETHEUS_HISTOGRAM=true
12+
TLS_PATH=/etc/tls
13+
AUTH_DISABLE=false
14+
AUTH_IMPERSONATE=true
15+
LOG_LEVEL=info
16+
LOGS_API=false
17+
LOGS_TYPE=File
18+
LOGS_BUFFER_SIZE=5242880
19+
LOGS_PATH=/logs
20+
S3_BUCKET_NAME=
21+
S3_ENDPOINT=
22+
S3_HOSTNAME_IMMUTABLE=false
23+
S3_REGION=
24+
S3_ACCESS_KEY_ID=
25+
S3_SECRET_ACCESS_KEY=
26+
S3_MULTI_PART_SIZE=5242880
27+
GCS_BUCKET_NAME=
28+
STORAGE_EMULATOR_HOST=
29+
K8S_QPS=50
30+
K8S_BURST=100
31+
PROFILING=true
32+
PROFILING_PORT=6060

‎components/pipeline-service/development/kustomization.yaml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,22 @@ commonAnnotations:
88
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
99

1010
resources:
11-
- https://github.com/openshift-pipelines/pipeline-service.git/developer/openshift/gitops/argocd/pipeline-service?ref=72287aca6503f631b917debc27683a508f7e45ad
12-
- https://github.com/openshift-pipelines/pipeline-service.git/developer/openshift/gitops/argocd/pipeline-service-storage?ref=72287aca6503f631b917debc27683a508f7e45ad
11+
- https://github.com/openshift-pipelines/pipeline-service.git/developer/openshift/gitops/argocd/pipeline-service?ref=3ed2e97d4eacb0252b153edd2d6006637acb528e
12+
- https://github.com/openshift-pipelines/pipeline-service.git/developer/openshift/gitops/argocd/pipeline-service-storage?ref=3ed2e97d4eacb0252b153edd2d6006637acb528e
1313
- ../base/rbac
1414

15-
images:
16-
- name: quay.io/redhat-appstudio/tekton-results-api
17-
newTag: bae7851ff584423503af324200f52cd28ca99116
18-
- name: quay.io/redhat-appstudio/tekton-results-watcher
19-
newTag: bae7851ff584423503af324200f52cd28ca99116
15+
# generate a new configmap with updated values (logs api, db ssl mode) and replace the default one
16+
configMapGenerator:
17+
- behavior: replace
18+
files:
19+
- config.env
20+
name: api-config
21+
options:
22+
disableNameSuffixHash: true
23+
- behavior: merge
24+
name: config-observability
25+
literals:
26+
- profiling.enable="true"
2027

2128
patches:
2229
- path: chains-tekton-config-patches.yaml
@@ -56,3 +63,8 @@ patches:
5663
target:
5764
kind: TektonConfig
5865
name: config
66+
- path: update-results-watcher-performance.yaml
67+
target:
68+
kind: Deployment
69+
namespace: tekton-results
70+
name: tekton-results-watcher

‎components/pipeline-service/development/update-results-watcher-performance.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
- op: add
3+
path: /spec/template/spec/containers/0/args/-
4+
value: -threadiness
5+
- op: add
6+
path: /spec/template/spec/containers/0/args/-
7+
value: "50"
8+
- op: add
9+
path: /spec/template/spec/containers/0/args/-
10+
value: -qps
11+
- op: add
12+
path: /spec/template/spec/containers/0/args/-
13+
value: "50"
14+
- op: add
15+
path: /spec/template/spec/containers/0/args/-
16+
value: -burst
17+
- op: add
18+
path: /spec/template/spec/containers/0/args/-
19+
value: "100"
20+
- op: add
21+
path: /spec/template/spec/containers/0/args/-
22+
value: -update_log_timeout
23+
- op: add
24+
path: /spec/template/spec/containers/0/args/-
25+
value: "9m"
26+
- op: add
27+
path: /spec/template/spec/containers/0/args/-
28+
value: -dynamic_reconcile_timeout
29+
- op: add
30+
path: /spec/template/spec/containers/0/args/-
31+
value: "9m"

‎components/pipeline-service/staging/base/bump-results-watcher-replicas.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
- op: replace
22
path: /spec/replicas
33
# default pipeline-service setting is 1
4-
value: 2
4+
value: 1

‎components/pipeline-service/staging/base/config.env

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
DB_USER=
2+
DB_PASSWORD=
3+
DB_HOST=
4+
DB_PORT=5432
5+
DB_NAME=
6+
DB_SSLMODE=disable
7+
DB_SSLROOTCERT=
8+
DB_ENABLE_AUTO_MIGRATION=true
9+
SERVER_PORT=8080
10+
PROMETHEUS_PORT=9090
11+
PROMETHEUS_HISTOGRAM=true
12+
TLS_PATH=/etc/tls
13+
AUTH_DISABLE=false
14+
AUTH_IMPERSONATE=true
15+
LOG_LEVEL=info
16+
LOGS_API=false
17+
LOGS_TYPE=File
18+
LOGS_BUFFER_SIZE=5242880
19+
LOGS_PATH=/logs
20+
S3_BUCKET_NAME=
21+
S3_ENDPOINT=
22+
S3_HOSTNAME_IMMUTABLE=false
23+
S3_REGION=
24+
S3_ACCESS_KEY_ID=
25+
S3_SECRET_ACCESS_KEY=
26+
S3_MULTI_PART_SIZE=5242880
27+
GCS_BUCKET_NAME=
28+
STORAGE_EMULATOR_HOST=
29+
K8S_QPS=50
30+
K8S_BURST=100
31+
PROFILING=true
32+
PROFILING_PORT=6060

‎components/pipeline-service/staging/base/kustomization.yaml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,24 @@ commonAnnotations:
88
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
99

1010
resources:
11-
- https://github.com/openshift-pipelines/pipeline-service.git/operator/gitops/argocd/pipeline-service?ref=72287aca6503f631b917debc27683a508f7e45ad
11+
- https://github.com/openshift-pipelines/pipeline-service.git/operator/gitops/argocd/pipeline-service?ref=3ed2e97d4eacb0252b153edd2d6006637acb528e
1212
- pipelines-as-code-secret.yaml
1313
- ../../base/external-secrets
1414
- ../../base/testing
1515
- ../../base/rbac
1616

17-
images:
18-
- name: quay.io/redhat-appstudio/tekton-results-api
19-
newTag: bae7851ff584423503af324200f52cd28ca99116
20-
- name: quay.io/redhat-appstudio/tekton-results-watcher
21-
newTag: bae7851ff584423503af324200f52cd28ca99116
17+
# generate a new configmap with updated values (logs api, db ssl mode) and replace the default one
18+
configMapGenerator:
19+
- behavior: replace
20+
files:
21+
- config.env
22+
name: api-config
23+
options:
24+
disableNameSuffixHash: true
25+
- behavior: merge
26+
name: config-observability
27+
literals:
28+
- profiling.enable="true"
2229

2330
patches:
2431
- path: chains-tekton-config-patches.yaml

‎components/pipeline-service/staging/base/update-results-watcher-performance.yaml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,34 @@
44
value: "250m"
55
- op: replace
66
path: /spec/template/spec/containers/1/resources/limits/cpu
7-
value: "250m"
7+
value: "250m"
8+
- op: add
9+
path: /spec/template/spec/containers/1/args/-
10+
value: -threadiness
11+
- op: add
12+
path: /spec/template/spec/containers/1/args/-
13+
value: "50"
14+
- op: add
15+
path: /spec/template/spec/containers/1/args/-
16+
value: -qps
17+
- op: add
18+
path: /spec/template/spec/containers/1/args/-
19+
value: "50"
20+
- op: add
21+
path: /spec/template/spec/containers/1/args/-
22+
value: -burst
23+
- op: add
24+
path: /spec/template/spec/containers/1/args/-
25+
value: "100"
26+
- op: add
27+
path: /spec/template/spec/containers/1/args/-
28+
value: -update_log_timeout
29+
- op: add
30+
path: /spec/template/spec/containers/1/args/-
31+
value: "9m"
32+
- op: add
33+
path: /spec/template/spec/containers/1/args/-
34+
value: -dynamic_reconcile_timeout
35+
- op: add
36+
path: /spec/template/spec/containers/1/args/-
37+
value: "9m"

‎components/pipeline-service/staging/stone-stage-p01/deploy.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ subjects:
897897
---
898898
apiVersion: v1
899899
data:
900-
config.env: |
900+
config.env: |-
901901
DB_USER=
902902
DB_PASSWORD=
903903
DB_HOST=
@@ -926,6 +926,10 @@ data:
926926
S3_MULTI_PART_SIZE=5242880
927927
GCS_BUCKET_NAME=
928928
STORAGE_EMULATOR_HOST=
929+
K8S_QPS=50
930+
K8S_BURST=100
931+
PROFILING=true
932+
PROFILING_PORT=6060
929933
kind: ConfigMap
930934
metadata:
931935
annotations:
@@ -1054,6 +1058,7 @@ data:
10541058
metrics.taskrun.duration-type: "histogram"
10551059
metrics.pipelinerun.level: "pipeline"
10561060
metrics.pipelinerun.duration-type: "histogram"
1061+
profiling.enable: "true"
10571062
kind: ConfigMap
10581063
metadata:
10591064
annotations:
@@ -1335,7 +1340,7 @@ spec:
13351340
secretKeyRef:
13361341
key: db.name
13371342
name: tekton-results-database
1338-
image: quay.io/redhat-appstudio/tekton-results-api:bae7851ff584423503af324200f52cd28ca99116
1343+
image: quay.io/redhat-appstudio/tekton-results-api:ed360eccc021ad5eedf8ea9c0732912ef602b15a
13391344
livenessProbe:
13401345
httpGet:
13411346
path: /healthz
@@ -1404,7 +1409,7 @@ metadata:
14041409
name: tekton-results-watcher
14051410
namespace: tekton-results
14061411
spec:
1407-
replicas: 2
1412+
replicas: 1
14081413
selector:
14091414
matchLabels:
14101415
app.kubernetes.io/name: tekton-results-watcher
@@ -1470,6 +1475,16 @@ spec:
14701475
- -check_owner=false
14711476
- -completed_run_grace_period
14721477
- 10m
1478+
- -threadiness
1479+
- "50"
1480+
- -qps
1481+
- "50"
1482+
- -burst
1483+
- "100"
1484+
- -update_log_timeout
1485+
- 9m
1486+
- -dynamic_reconcile_timeout
1487+
- 9m
14731488
env:
14741489
- name: SYSTEM_NAMESPACE
14751490
valueFrom:
@@ -1487,7 +1502,7 @@ spec:
14871502
value: tekton-results-api-service.tekton-pipelines.svc.cluster.local:8080
14881503
- name: AUTH_MODE
14891504
value: token
1490-
image: quay.io/redhat-appstudio/tekton-results-watcher:bae7851ff584423503af324200f52cd28ca99116
1505+
image: quay.io/redhat-appstudio/tekton-results-watcher:ed360eccc021ad5eedf8ea9c0732912ef602b15a
14911506
name: watcher
14921507
ports:
14931508
- containerPort: 9090
@@ -1635,7 +1650,7 @@ spec:
16351650
)" \
16361651
--dry-run=client \
16371652
-o yaml | kubectl apply -f -
1638-
image: quay.io/konflux-ci/appstudio-utils:ab6b0b8e40e440158e7288c73aff1cf83a2cc8a9@sha256:24179f0efd06c65d16868c2d7eb82573cce8e43533de6cea14fec3b7446e0b14
1653+
image: quay.io/redhat-appstudio/appstudio-utils:dbbdd82734232e6289e8fbae5b4c858481a7c057
16391654
imagePullPolicy: Always
16401655
name: chains-secret-generation
16411656
resources:

0 commit comments

Comments
 (0)