Skip to content

Commit 7c61035

Browse files
mikhail-klimkomikhail-klimko
authored
feat(onprem): fix internal-gateway; upd mongosh image (#988)
1 parent 7b03cc1 commit 7c61035

File tree

11 files changed

+266
-79
lines changed

11 files changed

+266
-79
lines changed

‎codefresh/.ci/values-all-images.yaml

Whitespace-only changes.

‎codefresh/.ci/values/cfapi-roles-hpa.yaml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
ingress:
2+
enabled: true
3+
tls:
4+
enabled: true
5+
cert: "" # placeholder for ${WEB_TLS_CERT}
6+
key: "" # placeholder for ${WEB_TLS_KEY}
7+
services:
8+
cfapi: null
9+
cfapi-endpoints:
10+
- /api/
11+
cfapi-downloadlogmanager:
12+
- /api/progress/download
13+
- /api/public/progress/download
14+
cfapi-admin:
15+
- /api/admin/
16+
cfapi-ws:
17+
- /ws
18+
cfapi-teams:
19+
- /api/team
20+
cfapi-kubernetes-endpoints:
21+
- /api/kubernetes
22+
cfapi-test-reporting:
23+
- /api/testReporting
24+
cfapi-kubernetesresourcemonitor:
25+
- /api/k8s-monitor/
26+
cfapi-environments:
27+
- /api/environments-v2/argo/events
28+
cfapi-gitops-resource-receiver:
29+
- /api/gitops/resources
30+
- /api/gitops/rollout
31+
32+
global:
33+
appUrl: "" # placeholder for ${CF_APP_HOST}
34+
firebaseSecret: "" # placeholder for ${FIREBASE_SECRET}
35+
36+
cfapiService: cfapi-internal
37+
cfapiEndpointsService: cfapi-endpoints
38+
39+
cfapi: &cf-api
40+
enabled: false
41+
hpa:
42+
enabled: true
43+
44+
cfapi-internal:
45+
!!merge <<: *cf-api
46+
enabled: true
47+
cfapi-ws:
48+
!!merge <<: *cf-api
49+
enabled: true
50+
cfapi-admin:
51+
!!merge <<: *cf-api
52+
enabled: true
53+
cfapi-endpoints:
54+
!!merge <<: *cf-api
55+
enabled: true
56+
cfapi-terminators:
57+
!!merge <<: *cf-api
58+
enabled: true
59+
cfapi-sso-group-synchronizer:
60+
!!merge <<: *cf-api
61+
enabled: true
62+
cfapi-buildmanager:
63+
!!merge <<: *cf-api
64+
enabled: true
65+
cfapi-cacheevictmanager:
66+
!!merge <<: *cf-api
67+
enabled: true
68+
cfapi-eventsmanagersubscriptions:
69+
!!merge <<: *cf-api
70+
enabled: true
71+
cfapi-kubernetesresourcemonitor:
72+
!!merge <<: *cf-api
73+
enabled: true
74+
cfapi-environments:
75+
!!merge <<: *cf-api
76+
enabled: true
77+
cfapi-gitops-resource-receiver:
78+
!!merge <<: *cf-api
79+
enabled: true
80+
cfapi-downloadlogmanager:
81+
!!merge <<: *cf-api
82+
enabled: true
83+
cfapi-teams:
84+
!!merge <<: *cf-api
85+
enabled: true
86+
cfapi-kubernetes-endpoints:
87+
!!merge <<: *cf-api
88+
enabled: true
89+
cfapi-test-reporting:
90+
!!merge <<: *cf-api
91+
enabled: true

‎codefresh/.ci/values/classic-only.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
global:
2+
appUrl: "" # placeholder for ${CF_APP_HOST}
3+
firebaseSecret: "" # placeholder for ${FIREBASE_SECRET}
4+
5+
cfapi:
6+
hpa:
7+
enabled: true
8+
9+
ingress:
10+
enabled: true
11+
tls:
12+
enabled: true
13+
cert: "" # placeholder for ${WEB_TLS_CERT}
14+
key: "" # placeholder for ${WEB_TLS_KEY}
15+
16+
argo-platform:
17+
enabled: false

‎codefresh/.ci/values/defaults-hpa.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
global:
2+
appUrl: "" # placeholder for ${CF_APP_HOST}
3+
firebaseSecret: "" # placeholder for ${FIREBASE_SECRET}
4+
5+
cfapi:
6+
hpa:
7+
enabled: true
8+
9+
ingress:
10+
enabled: true
11+
tls:
12+
enabled: true
13+
cert: "" # placeholder for ${WEB_TLS_CERT}
14+
key: "" # placeholder for ${WEB_TLS_KEY}
15+
16+
argo-platform:
17+
enabled: true
18+
19+
analytics-reporter:
20+
hpa:
21+
enabled: true
22+
23+
api-events:
24+
hpa:
25+
enabled: true
26+
27+
api-graphql:
28+
hpa:
29+
enabled: true
30+
31+
event-handler:
32+
hpa:
33+
enabled: true
34+
35+
ui:
36+
hpa:
37+
enabled: true
38+
39+
audit:
40+
hpa:
41+
enabled: true
42+
43+
abac:
44+
hpa:
45+
enabled: true

‎codefresh/.ci/values/registry.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
imageCredentials:
2+
registry: gcr.io
3+
username: _json_key
4+
password: "" # placeholder for ${GCR_SA_KEY}

‎codefresh/Chart.lock

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,58 +58,58 @@ dependencies:
5858
version: 1.13.2
5959
- name: cfapi
6060
repository: https://chartmuseum.codefresh.io/cfapi
61-
version: 21.222.4
61+
version: 21.222.6
6262
- name: cfapi
6363
repository: https://chartmuseum.codefresh.io/cfapi
64-
version: 21.222.4
64+
version: 21.222.6
6565
- name: cfapi
6666
repository: https://chartmuseum.codefresh.io/cfapi
67-
version: 21.222.4
67+
version: 21.222.6
6868
- name: cfapi
6969
repository: https://chartmuseum.codefresh.io/cfapi
70-
version: 21.222.4
70+
version: 21.222.6
7171
- name: cfapi
7272
repository: https://chartmuseum.codefresh.io/cfapi
73-
version: 21.222.4
73+
version: 21.222.6
7474
- name: cfapi
7575
repository: https://chartmuseum.codefresh.io/cfapi
76-
version: 21.222.4
76+
version: 21.222.6
7777
- name: cfapi
7878
repository: https://chartmuseum.codefresh.io/cfapi
79-
version: 21.222.4
79+
version: 21.222.6
8080
- name: cfapi
8181
repository: https://chartmuseum.codefresh.io/cfapi
82-
version: 21.222.4
82+
version: 21.222.6
8383
- name: cfapi
8484
repository: https://chartmuseum.codefresh.io/cfapi
85-
version: 21.222.4
85+
version: 21.222.6
8686
- name: cfapi
8787
repository: https://chartmuseum.codefresh.io/cfapi
88-
version: 21.222.4
88+
version: 21.222.6
8989
- name: cfapi
9090
repository: https://chartmuseum.codefresh.io/cfapi
91-
version: 21.222.4
91+
version: 21.222.6
9292
- name: cfapi
9393
repository: https://chartmuseum.codefresh.io/cfapi
94-
version: 21.222.4
94+
version: 21.222.6
9595
- name: cfapi
9696
repository: https://chartmuseum.codefresh.io/cfapi
97-
version: 21.222.4
97+
version: 21.222.6
9898
- name: cfapi
9999
repository: https://chartmuseum.codefresh.io/cfapi
100-
version: 21.222.4
100+
version: 21.222.6
101101
- name: cfapi
102102
repository: https://chartmuseum.codefresh.io/cfapi
103-
version: 21.222.4
103+
version: 21.222.6
104104
- name: cfapi
105105
repository: https://chartmuseum.codefresh.io/cfapi
106-
version: 21.222.4
106+
version: 21.222.6
107107
- name: cfapi
108108
repository: https://chartmuseum.codefresh.io/cfapi
109-
version: 21.222.4
109+
version: 21.222.6
110110
- name: cfui
111111
repository: https://chartmuseum.codefresh.io/cfui
112-
version: 14.88.41
112+
version: 14.88.42
113113
- name: k8s-monitor
114114
repository: https://chartmuseum.codefresh.io/k8s-monitor
115115
version: 4.10.0
@@ -139,12 +139,12 @@ dependencies:
139139
version: 0.45.5
140140
- name: argo-platform
141141
repository: https://chartmuseum.codefresh.io/argo-platform
142-
version: 1.2247.0
142+
version: 1.2248.0
143143
- name: argo-hub-platform
144144
repository: https://chartmuseum.codefresh.io/argo-hub-platform
145145
version: 0.1.1
146146
- name: codefresh-tunnel-server
147147
repository: https://chartmuseum.codefresh.io/codefresh-tunnel-server
148148
version: 0.1.12
149-
digest: sha256:ec4ddab3e1e3d856cd3d842c7bf8b3280ce08df1234ab7d4eab99245d8da6777
150-
generated: "2023-05-14T20:55:03.78868933+03:00"
149+
digest: sha256:e857522b7672673554bde5f5e18abfb632e9b8c1e30c1d28f1eb0bd143032b54
150+
generated: "2023-05-16T01:14:50.304862813+03:00"

‎codefresh/Chart.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
description: Helm Chart for Codefresh On-Prem
33
name: codefresh
4-
version: 2.0.0-alpha.8
4+
version: 2.0.0-alpha.9
55
keywords:
66
- codefresh
77
home: https://codefresh.io/
@@ -16,7 +16,10 @@ annotations:
1616
artifacthub.io/alternativeName: "codefresh-onprem"
1717
artifacthub.io/prerelease: "true"
1818
artifacthub.io/changes: |
19-
- Bump ingress-nginx
19+
- kind: fixed
20+
description: Fixed internal-gateway template when multiple cf-api roles enabled
21+
- kind: changed
22+
description: Changed image for post-upgrade hook and mongo seed job
2023
dependencies:
2124
- name: cf-common
2225
repository: https://chartmuseum.codefresh.io/cf-common

‎codefresh/README.md

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Codefresh On-Premises
22

3-
![Version: 2.0.0-alpha.8](https://img.shields.io/badge/Version-2.0.0--alpha.8-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
3+
![Version: 2.0.0-alpha.9](https://img.shields.io/badge/Version-2.0.0--alpha.9-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
44

55
## Table of Content
66

@@ -427,13 +427,6 @@ Use the example below to override repository for all templates:
427427

428428
```yaml
429429
430-
seed:
431-
mongoSeedJob:
432-
image:
433-
repository: codefresh/mongodb
434-
postgresSeedJob:
435-
repository: codefresh/postgresql
436-
437430
ingress-nginx:
438431
controller:
439432
image:
@@ -502,7 +495,7 @@ global:
502495
# -- Change endpoints cfapi service address
503496
cfapiEndpointsService: cfapi-endpoints
504497
505-
cfapi:
498+
cfapi: &cf-api
506499
# -- Disable default cfapi deployment
507500
enabled: false
508501
# -- (optional) Enable the autoscaler
@@ -511,41 +504,58 @@ cfapi:
511504
enabled: true
512505
# Enable cf-api roles
513506
cfapi-internal:
507+
!!merge <<: *cf-api
514508
enabled: true
515509
cfapi-ws:
510+
!!merge <<: *cf-api
516511
enabled: true
517512
cfapi-admin:
513+
!!merge <<: *cf-api
518514
enabled: true
519515
cfapi-endpoints:
516+
!!merge <<: *cf-api
520517
enabled: true
521518
cfapi-terminators:
519+
!!merge <<: *cf-api
522520
enabled: true
523521
cfapi-sso-group-synchronizer:
522+
!!merge <<: *cf-api
524523
enabled: true
525524
cfapi-buildmanager:
525+
!!merge <<: *cf-api
526526
enabled: true
527527
cfapi-cacheevictmanager:
528+
!!merge <<: *cf-api
528529
enabled: true
529530
cfapi-eventsmanagersubscriptions:
531+
!!merge <<: *cf-api
530532
enabled: true
531533
cfapi-kubernetesresourcemonitor:
534+
!!merge <<: *cf-api
532535
enabled: true
533536
cfapi-environments:
537+
!!merge <<: *cf-api
534538
enabled: true
535539
cfapi-gitops-resource-receiver:
540+
!!merge <<: *cf-api
536541
enabled: true
537542
cfapi-downloadlogmanager:
543+
!!merge <<: *cf-api
538544
enabled: true
539545
cfapi-teams:
546+
!!merge <<: *cf-api
540547
enabled: true
541548
cfapi-kubernetes-endpoints:
549+
!!merge <<: *cf-api
542550
enabled: true
543551
cfapi-test-reporting:
552+
!!merge <<: *cf-api
544553
enabled: true
545554
546555
# Change ingress paths
547556
ingress:
548557
services:
558+
cfapi: null # Set default cfapi path to null!
549559
cfapi-endpoints:
550560
- /api/
551561
cfapi-downloadlogmanager:
@@ -914,7 +924,7 @@ The bare minimal workload footprint for the new services (without HPA or PDB) is
914924
| cf-platform-analytics-etlstarter.redis.enabled | bool | `false` | Disable redis subchart |
915925
| cf-platform-analytics-etlstarter.system-etl-postgres | object | `{"enabled":true}` | Only postgres ETL should be running in onprem~ |
916926
| cf-platform-analytics-platform | object | See below | platform-analytics |
917-
| cfapi | object | `{"affinity":{},"container":{"env":{"AUDIT_AUTO_CREATE_DB":true,"GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh"},"image":{"registry":"gcr.io/codefresh-enterprise"}},"controller":{"replicas":2},"enabled":true,"hpa":{"enabled":false,"maxReplicas":10,"minReplicas":2,"targetCPUUtilizationPercentage":70},"nodeSelector":{},"pdb":{"enabled":false,"minAvailable":"50%"},"podSecurityContext":{},"resources":{"limits":{},"requests":{"cpu":"500m","memory":"1Gi"}},"tolerations":[]}` | cf-api |
927+
| cfapi | object | `{"affinity":{},"container":{"env":{"AUDIT_AUTO_CREATE_DB":true,"GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh"},"image":{"registry":"gcr.io/codefresh-enterprise"}},"controller":{"replicas":2},"enabled":true,"hpa":{"enabled":false,"maxReplicas":10,"minReplicas":2,"targetCPUUtilizationPercentage":70},"nodeSelector":{},"pdb":{"enabled":false,"minAvailable":"50%"},"podSecurityContext":{},"resources":{"limits":{},"requests":{"cpu":"200m","memory":"256Mi"}},"tolerations":[]}` | cf-api |
918928
| cfapi.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh"},"image":{"registry":"gcr.io/codefresh-enterprise"}}` | Container configuration |
919929
| cfapi.container.env | object | See below | Env vars |
920930
| cfapi.container.image | object | `{"registry":"gcr.io/codefresh-enterprise"}` | Image |
@@ -930,7 +940,7 @@ The bare minimal workload footprint for the new services (without HPA or PDB) is
930940
| cfapi.pdb | object | `{"enabled":false,"minAvailable":"50%"}` | Pod disruption budget configuration |
931941
| cfapi.pdb.enabled | bool | `false` | Enable PDB |
932942
| cfapi.pdb.minAvailable | string | `"50%"` | Minimum number of replicas in percentage |
933-
| cfapi.resources | object | `{"limits":{},"requests":{"cpu":"500m","memory":"1Gi"}}` | Resource requests and limits |
943+
| cfapi.resources | object | `{"limits":{},"requests":{"cpu":"200m","memory":"256Mi"}}` | Resource requests and limits |
934944
| cfsign | object | See below | tls-sign |
935945
| cfui | object | See below | cf-ui |
936946
| charts-manager | object | See below | charts-manager |

0 commit comments

Comments
 (0)