Skip to content

Commit 3fce182

Browse files
mikhail-klimkomikhail-klimko
authored
feat(onprem): add argo-hub chart / new etl-starter (#964)
1 parent 4626d04 commit 3fce182

File tree

8 files changed

+138
-187
lines changed

8 files changed

+138
-187
lines changed

‎codefresh/Chart.lock

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dependencies:
33
repository: https://chartmuseum.codefresh.io/cf-common
44
version: 0.7.0
55
- name: internal-gateway
6-
repository: https://chartmuseum-dev.codefresh.io/internal-gateway
6+
repository: https://chartmuseum.codefresh.io/internal-gateway
77
version: 0.1.1
88
- name: consul
99
repository: https://charts.bitnami.com/bitnami
@@ -49,67 +49,67 @@ dependencies:
4949
version: 1.23.1
5050
- name: context-manager
5151
repository: https://chartmuseum.codefresh.io/context-manager
52-
version: 2.23.4
52+
version: 2.24.0
5353
- name: pipeline-manager
5454
repository: https://chartmuseum.codefresh.io/pipeline-manager
5555
version: 3.126.0
5656
- name: gitops-dashboard-manager
5757
repository: https://chartmuseum.codefresh.io/gitops-dashboard-manager
58-
version: 1.13.0
58+
version: 1.13.1
5959
- name: cfapi
6060
repository: https://chartmuseum-dev.codefresh.io/cfapi
61-
version: 21.221.13-cr-17544
61+
version: 21.221.35-cr-17544
6262
- name: cfapi-internal
6363
repository: https://chartmuseum-dev.codefresh.io/cfapi-internal
64-
version: 21.221.13-cr-17544
64+
version: 21.221.35-cr-17544
6565
- name: cfapi-ws
6666
repository: https://chartmuseum-dev.codefresh.io/cfapi-ws
67-
version: 21.221.13-cr-17544
67+
version: 21.221.35-cr-17544
6868
- name: cfapi-admin
6969
repository: https://chartmuseum-dev.codefresh.io/cfapi-admin
70-
version: 21.221.13-cr-17544
70+
version: 21.221.35-cr-17544
7171
- name: cfapi-endpoints
7272
repository: https://chartmuseum-dev.codefresh.io/cfapi-endpoints
73-
version: 21.221.13-cr-17544
73+
version: 21.221.35-cr-17544
7474
- name: cfapi-terminators
7575
repository: https://chartmuseum-dev.codefresh.io/cfapi-terminators
76-
version: 21.221.13-cr-17544
76+
version: 21.221.35-cr-17544
7777
- name: cfapi-sso-group-synchronizer
7878
repository: https://chartmuseum-dev.codefresh.io/cfapi-sso-group-synchronizer
79-
version: 21.221.13-cr-17544
79+
version: 21.221.35-cr-17544
8080
- name: cfapi-buildmanager
8181
repository: https://chartmuseum-dev.codefresh.io/cfapi-buildmanager
82-
version: 21.221.13-cr-17544
82+
version: 21.221.35-cr-17544
8383
- name: cfapi-cacheevictmanager
8484
repository: https://chartmuseum-dev.codefresh.io/cfapi-cacheevictmanager
85-
version: 21.221.13-cr-17544
85+
version: 21.221.35-cr-17544
8686
- name: cfapi-eventsmanagersubscriptions
8787
repository: https://chartmuseum-dev.codefresh.io/cfapi-eventsmanagersubscriptions
88-
version: 21.221.13-cr-17544
88+
version: 21.221.35-cr-17544
8989
- name: cfapi-kubernetesresourcemonitor
9090
repository: https://chartmuseum-dev.codefresh.io/cfapi-kubernetesresourcemonitor
91-
version: 21.221.13-cr-17544
91+
version: 21.221.35-cr-17544
9292
- name: cfapi-environments
9393
repository: https://chartmuseum-dev.codefresh.io/cfapi-environments
94-
version: 21.221.13-cr-17544
94+
version: 21.221.35-cr-17544
9595
- name: cfapi-gitops-resource-receiver
9696
repository: https://chartmuseum-dev.codefresh.io/cfapi-gitops-resource-receiver
97-
version: 21.221.13-cr-17544
97+
version: 21.221.35-cr-17544
9898
- name: cfapi-downloadlogmanager
9999
repository: https://chartmuseum-dev.codefresh.io/cfapi-downloadlogmanager
100-
version: 21.221.13-cr-17544
100+
version: 21.221.35-cr-17544
101101
- name: cfapi-teams
102102
repository: https://chartmuseum-dev.codefresh.io/cfapi-teams
103-
version: 21.221.13-cr-17544
103+
version: 21.221.35-cr-17544
104104
- name: cfapi-kubernetes-endpoints
105105
repository: https://chartmuseum-dev.codefresh.io/cfapi-kubernetes-endpoints
106-
version: 21.221.13-cr-17544
106+
version: 21.221.35-cr-17544
107107
- name: cfapi-test-reporting
108108
repository: https://chartmuseum-dev.codefresh.io/cfapi-test-reporting
109-
version: 21.221.13-cr-17544
109+
version: 21.221.35-cr-17544
110110
- name: cfui
111111
repository: https://chartmuseum.codefresh.io/cfui
112-
version: 14.88.13
112+
version: 14.88.32
113113
- name: k8s-monitor
114114
repository: https://chartmuseum.codefresh.io/k8s-monitor
115115
version: 4.10.0
@@ -132,16 +132,19 @@ dependencies:
132132
repository: https://chartmuseum.codefresh.io/cronus
133133
version: 0.7.2
134134
- name: cf-platform-analytics-platform
135-
repository: https://chartmuseum-dev.codefresh.io/cf-platform-analytics-platform
136-
version: 0.44.0-cr-17903
135+
repository: https://chartmuseum.codefresh.io/cf-platform-analytics-platform
136+
version: 0.45.0
137137
- name: cf-platform-analytics-etlstarter
138-
repository: https://chartmuseum-dev.codefresh.io/cf-platform-analytics-etlstarter
139-
version: 0.44.0-cr-17903
138+
repository: https://chartmuseum.codefresh.io/cf-platform-analytics-etlstarter
139+
version: 0.45.0
140140
- name: argo-platform
141141
repository: https://chartmuseum.codefresh.io/argo-platform
142-
version: 1.2207.0
142+
version: 1.2237.0
143+
- name: argo-hub-platform
144+
repository: https://chartmuseum.codefresh.io/argo-hub-platform
145+
version: 0.1.1
143146
- name: codefresh-tunnel-server
144147
repository: https://chartmuseum.codefresh.io/codefresh-tunnel-server
145148
version: 0.1.12
146-
digest: sha256:126e9e3419d1dcdf644627c6c447041381a0754e1e3d06128bedc7ff592bcd1f
147-
generated: "2023-04-23T16:03:44.709824805+03:00"
149+
digest: sha256:ce8c13c9168c56a88ae8f84ea5462fd8de42cef22ce8a6a526c4dfa8d8f7b9c0
150+
generated: "2023-05-04T23:28:57.610921975+03:00"

‎codefresh/Chart.yaml

Lines changed: 29 additions & 23 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.1
4+
version: 2.0.0-alpha.2
55
keywords:
66
- codefresh
77
home: https://codefresh.io/
@@ -21,7 +21,7 @@ dependencies:
2121
- cf-infra
2222
- argo-platform
2323
- name: internal-gateway
24-
repository: https://chartmuseum-dev.codefresh.io/internal-gateway
24+
repository: https://chartmuseum.codefresh.io/internal-gateway
2525
version: "0.1.1"
2626
condition: argo-platform.enabled
2727
- name: consul
@@ -136,104 +136,104 @@ dependencies:
136136
- cf-infra
137137
- argo-platform
138138
- name: cfapi
139-
version: "21.221.13-cr-17544"
139+
version: "21.221.35-cr-17544"
140140
repository: https://chartmuseum-dev.codefresh.io/cfapi
141141
condition: cfapi.enabled
142142
tags:
143143
- cf-infra
144144
- argo-platform
145145
- name: cfapi-internal
146-
version: "21.221.13-cr-17544"
146+
version: "21.221.35-cr-17544"
147147
repository: https://chartmuseum-dev.codefresh.io/cfapi-internal
148148
condition: cfapi-internal.enabled
149149
tags:
150150
- cf-infra
151151
- name: cfapi-ws
152-
version: "21.221.13-cr-17544"
152+
version: "21.221.35-cr-17544"
153153
repository: https://chartmuseum-dev.codefresh.io/cfapi-ws
154154
condition: cfapi-ws.enabled
155155
tags:
156156
- cf-infra
157157
- name: cfapi-admin
158-
version: "21.221.13-cr-17544"
158+
version: "21.221.35-cr-17544"
159159
repository: https://chartmuseum-dev.codefresh.io/cfapi-admin
160160
condition: cfapi-admin.enabled
161161
tags:
162162
- cf-infra
163163
- name: cfapi-endpoints
164-
version: "21.221.13-cr-17544"
164+
version: "21.221.35-cr-17544"
165165
repository: https://chartmuseum-dev.codefresh.io/cfapi-endpoints
166166
condition: cfapi-endpoints.enabled
167167
tags:
168168
- cf-infra
169169
- name: cfapi-terminators
170-
version: "21.221.13-cr-17544"
170+
version: "21.221.35-cr-17544"
171171
repository: https://chartmuseum-dev.codefresh.io/cfapi-terminators
172172
condition: cfapi-terminators.enabled
173173
tags:
174174
- cf-infra
175175
- name: cfapi-sso-group-synchronizer
176-
version: "21.221.13-cr-17544"
176+
version: "21.221.35-cr-17544"
177177
repository: https://chartmuseum-dev.codefresh.io/cfapi-sso-group-synchronizer
178178
condition: cfapi-sso-group-synchronizer.enabled
179179
tags:
180180
- cf-infra
181181
- name: cfapi-buildmanager
182-
version: "21.221.13-cr-17544"
182+
version: "21.221.35-cr-17544"
183183
repository: https://chartmuseum-dev.codefresh.io/cfapi-buildmanager
184184
condition: cfapi-buildmanager.enabled
185185
tags:
186186
- cf-infra
187187
- name: cfapi-cacheevictmanager
188-
version: "21.221.13-cr-17544"
188+
version: "21.221.35-cr-17544"
189189
repository: https://chartmuseum-dev.codefresh.io/cfapi-cacheevictmanager
190190
condition: cfapi-cacheevictmanager.enabled
191191
tags:
192192
- cf-infra
193193
- name: cfapi-eventsmanagersubscriptions
194-
version: "21.221.13-cr-17544"
194+
version: "21.221.35-cr-17544"
195195
repository: https://chartmuseum-dev.codefresh.io/cfapi-eventsmanagersubscriptions
196196
condition: cfapi-eventsmanagersubscriptions.enabled
197197
tags:
198198
- cf-infra
199199
- name: cfapi-kubernetesresourcemonitor
200-
version: "21.221.13-cr-17544"
200+
version: "21.221.35-cr-17544"
201201
repository: https://chartmuseum-dev.codefresh.io/cfapi-kubernetesresourcemonitor
202202
condition: cfapi-kubernetesresourcemonitor.enabled
203203
tags:
204204
- cf-infra
205205
- name: cfapi-environments
206-
version: "21.221.13-cr-17544"
206+
version: "21.221.35-cr-17544"
207207
repository: https://chartmuseum-dev.codefresh.io/cfapi-environments
208208
condition: cfapi-environments.enabled
209209
tags:
210210
- cf-infra
211211
- name: cfapi-gitops-resource-receiver
212-
version: "21.221.13-cr-17544"
212+
version: "21.221.35-cr-17544"
213213
repository: https://chartmuseum-dev.codefresh.io/cfapi-gitops-resource-receiver
214214
condition: cfapi-gitops-resource-receiver.enabled
215215
tags:
216216
- cf-infra
217217
- name: cfapi-downloadlogmanager
218-
version: "21.221.13-cr-17544"
218+
version: "21.221.35-cr-17544"
219219
repository: https://chartmuseum-dev.codefresh.io/cfapi-downloadlogmanager
220220
condition: cfapi-downloadlogmanager.enabled
221221
tags:
222222
- cf-infra
223223
- name: cfapi-teams
224-
version: "21.221.13-cr-17544"
224+
version: "21.221.35-cr-17544"
225225
repository: https://chartmuseum-dev.codefresh.io/cfapi-teams
226226
condition: cfapi-teams.enabled
227227
tags:
228228
- cf-infra
229229
- name: cfapi-kubernetes-endpoints
230-
version: "21.221.13-cr-17544"
230+
version: "21.221.35-cr-17544"
231231
repository: https://chartmuseum-dev.codefresh.io/cfapi-kubernetes-endpoints
232232
condition: cfapi-kubernetes-endpoints.enabled
233233
tags:
234234
- cf-infra
235235
- name: cfapi-test-reporting
236-
version: "21.221.13-cr-17544"
236+
version: "21.221.35-cr-17544"
237237
repository: https://chartmuseum-dev.codefresh.io/cfapi-test-reporting
238238
condition: cfapi-test-reporting.enabled
239239
tags:
@@ -289,14 +289,14 @@ dependencies:
289289
tags:
290290
- cf-infra
291291
- name: cf-platform-analytics-platform
292-
version: "0.44.0-cr-17903"
293-
repository: https://chartmuseum-dev.codefresh.io/cf-platform-analytics-platform
292+
version: "*"
293+
repository: https://chartmuseum.codefresh.io/cf-platform-analytics-platform
294294
condition: argo-platform.enabled
295295
tags:
296296
- argo-platform
297297
- name: cf-platform-analytics-etlstarter
298-
version: "0.44.0-cr-17903"
299-
repository: https://chartmuseum-dev.codefresh.io/cf-platform-analytics-etlstarter
298+
version: "*"
299+
repository: https://chartmuseum.codefresh.io/cf-platform-analytics-etlstarter
300300
condition: argo-platform.enabled
301301
tags:
302302
- argo-platform
@@ -306,6 +306,12 @@ dependencies:
306306
condition: argo-platform.enabled
307307
tags:
308308
- argo-platform
309+
- name: argo-hub-platform
310+
version: "*"
311+
repository: https://chartmuseum.codefresh.io/argo-hub-platform
312+
condition: argo-platform.enabled
313+
tags:
314+
- argo-platform
309315
- name: codefresh-tunnel-server
310316
version: "*"
311317
repository: https://chartmuseum.codefresh.io/codefresh-tunnel-server

‎codefresh/README.md

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

3-
![Version: 2.0.0-alpha.1](https://img.shields.io/badge/Version-2.0.0--alpha.1-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.2](https://img.shields.io/badge/Version-2.0.0--alpha.2-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
44

55
## Prerequisites
66

@@ -95,7 +95,7 @@ TODO
9595

9696
| Key | Type | Default | Description |
9797
|-----|------|---------|-------------|
98-
| argo-hub | object | See below | argo-hub |
98+
| argo-hub-platform | object | See below | argo-hub-platform |
9999
| argo-platform | object | See below | argo-platform |
100100
| builder | object | `{"enabled":true}` | builder |
101101
| cf-broadcaster | object | See below | broadcaster |
@@ -234,7 +234,7 @@ TODO
234234
| cfui | object | See below | cf-ui |
235235
| charts-manager | object | See below | charts-manager |
236236
| cluster-providers | object | See below | cluster-providers |
237-
| codefresh-tunnel-server | object | See below | codefresh-tunnel-server |
237+
| codefresh-tunnel-server | object | See below | codefresh-tunnel-server Don't enable! Not supported at the moment. |
238238
| consul | object | See below | consul |
239239
| context-manager | object | See below | context-manager |
240240
| cronus | object | See below | cronus |
@@ -269,6 +269,7 @@ TODO
269269
| global.gitopsDashboardManagerService | string | `"gitops-dashboard-manager"` | Default gitops-dashboarad-manager service name. |
270270
| global.helmRepoManagerService | string | `"helm-repo-manager"` | Default helm-repo-manager service name. |
271271
| global.hermesService | string | `"hermes"` | Default hermes service name. |
272+
| global.imagePullSecrets | list | `[]` | Global Docker registry secret names as array |
272273
| global.imageRegistry | string | `""` | Global Docker image registry |
273274
| global.kubeIntegrationPort | int | `9000` | Default kube-integration service port. |
274275
| global.kubeIntegrationService | string | `"kube-integration"` | Default kube-integration service name. |

‎codefresh/templates/_helpers.tpl

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,17 @@ Return the secret containing TLS certificates for Ingress
8080
{{- printf "%s-%s" (include "codefresh.fullname" .) .Values.ingress.tls.secretName -}}
8181
{{- end -}}
8282
{{- end -}}
83+
84+
{{/*
85+
Calculate Mongo Uri (for On-Prem)
86+
Usage:
87+
{{ include "codefresh.calculateMongoUri" (dict "dbName" .Values.path.to.the.value "mongoURI" .Values.path.to.the.value) }}
88+
*/}}
89+
{{- define "codefresh.calculateMongoUri" -}}
90+
{{- if contains "?" .mongoURI -}}
91+
{{- $mongoURI := (splitList "?" .mongoURI) -}}
92+
{{- printf "%s%s?%s" (first $mongoURI) .dbName (last $mongoURI) }}
93+
{{- else -}}
94+
{{- printf "%s/%s" .mongoURI .dbName -}}
95+
{{- end -}}
96+
{{- end -}}

‎codefresh/templates/argo-hub/argo-hub-deploy.yaml

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)