Skip to content

Commit aafb969

Browse files
mikhail-klimkomikhail-klimko
authored
onprem-2.0.0-alpha.11 (#995)
1 parent 7e2966f commit aafb969

File tree

5 files changed

+74
-65
lines changed

5 files changed

+74
-65
lines changed

‎codefresh/Chart.lock

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ dependencies:
2525
version: 7.8.1
2626
- name: builder
2727
repository: https://chartmuseum.codefresh.io/builder
28-
version: 1.1.0
28+
version: 1.1.3
2929
- name: runner
3030
repository: https://chartmuseum.codefresh.io/runner
31-
version: 1.1.0
31+
version: 1.1.3
3232
- name: ingress-nginx
3333
repository: https://kubernetes.github.io/ingress-nginx
3434
version: 4.6.1
@@ -52,64 +52,64 @@ dependencies:
5252
version: 2.24.2
5353
- name: pipeline-manager
5454
repository: https://chartmuseum.codefresh.io/pipeline-manager
55-
version: 3.126.2
55+
version: 3.126.3
5656
- name: gitops-dashboard-manager
5757
repository: https://chartmuseum.codefresh.io/gitops-dashboard-manager
5858
version: 1.13.4
5959
- name: cfapi
6060
repository: https://chartmuseum.codefresh.io/cfapi
61-
version: 21.222.16
61+
version: 21.222.17
6262
- name: cfapi
6363
repository: https://chartmuseum.codefresh.io/cfapi
64-
version: 21.222.16
64+
version: 21.222.17
6565
- name: cfapi
6666
repository: https://chartmuseum.codefresh.io/cfapi
67-
version: 21.222.16
67+
version: 21.222.17
6868
- name: cfapi
6969
repository: https://chartmuseum.codefresh.io/cfapi
70-
version: 21.222.16
70+
version: 21.222.17
7171
- name: cfapi
7272
repository: https://chartmuseum.codefresh.io/cfapi
73-
version: 21.222.16
73+
version: 21.222.17
7474
- name: cfapi
7575
repository: https://chartmuseum.codefresh.io/cfapi
76-
version: 21.222.16
76+
version: 21.222.17
7777
- name: cfapi
7878
repository: https://chartmuseum.codefresh.io/cfapi
79-
version: 21.222.16
79+
version: 21.222.17
8080
- name: cfapi
8181
repository: https://chartmuseum.codefresh.io/cfapi
82-
version: 21.222.16
82+
version: 21.222.17
8383
- name: cfapi
8484
repository: https://chartmuseum.codefresh.io/cfapi
85-
version: 21.222.16
85+
version: 21.222.17
8686
- name: cfapi
8787
repository: https://chartmuseum.codefresh.io/cfapi
88-
version: 21.222.16
88+
version: 21.222.17
8989
- name: cfapi
9090
repository: https://chartmuseum.codefresh.io/cfapi
91-
version: 21.222.16
91+
version: 21.222.17
9292
- name: cfapi
9393
repository: https://chartmuseum.codefresh.io/cfapi
94-
version: 21.222.16
94+
version: 21.222.17
9595
- name: cfapi
9696
repository: https://chartmuseum.codefresh.io/cfapi
97-
version: 21.222.16
97+
version: 21.222.17
9898
- name: cfapi
9999
repository: https://chartmuseum.codefresh.io/cfapi
100-
version: 21.222.16
100+
version: 21.222.17
101101
- name: cfapi
102102
repository: https://chartmuseum.codefresh.io/cfapi
103-
version: 21.222.16
103+
version: 21.222.17
104104
- name: cfapi
105105
repository: https://chartmuseum.codefresh.io/cfapi
106-
version: 21.222.16
106+
version: 21.222.17
107107
- name: cfapi
108108
repository: https://chartmuseum.codefresh.io/cfapi
109-
version: 21.222.16
109+
version: 21.222.17
110110
- name: cfui
111111
repository: https://chartmuseum.codefresh.io/cfui
112-
version: 14.88.44
112+
version: 14.88.45
113113
- name: k8s-monitor
114114
repository: https://chartmuseum.codefresh.io/k8s-monitor
115115
version: 4.10.1
@@ -124,7 +124,7 @@ dependencies:
124124
version: 0.10.3
125125
- name: hermes
126126
repository: https://chartmuseum.codefresh.io/hermes
127-
version: 0.19.2
127+
version: 0.20.0
128128
- name: nomios
129129
repository: https://chartmuseum.codefresh.io/nomios
130130
version: 0.10.2
@@ -133,10 +133,10 @@ dependencies:
133133
version: 0.7.2
134134
- name: cf-platform-analytics
135135
repository: https://chartmuseum.codefresh.io/cf-platform-analytics
136-
version: 0.45.7
136+
version: 0.45.8
137137
- name: cf-platform-analytics
138138
repository: https://chartmuseum.codefresh.io/cf-platform-analytics
139-
version: 0.45.7
139+
version: 0.45.8
140140
- name: argo-platform
141141
repository: https://chartmuseum.codefresh.io/argo-platform
142142
version: 1.2257.0
@@ -146,5 +146,5 @@ dependencies:
146146
- name: codefresh-tunnel-server
147147
repository: https://chartmuseum.codefresh.io/codefresh-tunnel-server
148148
version: 0.1.12
149-
digest: sha256:47caaebecd98c97f35dd6d296e35eeff38da981f2542b87f6691d6e589935d05
150-
generated: "2023-05-18T16:23:11.724098618+03:00"
149+
digest: sha256:bca923f93e37198c404f70ee1d86a128bd4c2fee86e429ad7310be4cb0f46061
150+
generated: "2023-05-19T00:05:18.655905368+03:00"

‎codefresh/Chart.yaml

Lines changed: 8 additions & 6 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.10
4+
version: 2.0.0-alpha.11
55
keywords:
66
- codefresh
77
home: https://codefresh.io/
@@ -16,10 +16,12 @@ annotations:
1616
artifacthub.io/alternativeName: "codefresh-onprem"
1717
artifacthub.io/prerelease: "true"
1818
artifacthub.io/changes: |
19-
- kind: security
20-
description: Update kubectl, curl, docker-cleaner images
2119
- kind: changed
22-
description: Bump cf-api, cf-ui, argo-platform, cf-common libs, etc
20+
description: Bump cf-api, pipeline-manager, builder, etc
21+
- kind: changed
22+
description: Bump runtime images: container-logger
23+
- fixed:
24+
description: Fixed mongo-seed job template
2325
dependencies:
2426
- name: cf-common
2527
repository: https://chartmuseum.codefresh.io/cf-common
@@ -55,11 +57,11 @@ dependencies:
5557
- name: builder
5658
repository: https://chartmuseum.codefresh.io/builder
5759
condition: builder.enabled
58-
version: 1.1.0
60+
version: 1.1.3
5961
- name: runner
6062
repository: https://chartmuseum.codefresh.io/runner
6163
condition: runner.enabled
62-
version: 1.1.0
64+
version: 1.1.3
6365
- name: ingress-nginx
6466
version: 4.6.1
6567
repository: https://kubernetes.github.io/ingress-nginx

‎codefresh/README.md

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

3-
![Version: 2.0.0-alpha.10](https://img.shields.io/badge/Version-2.0.0--alpha.10-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.11](https://img.shields.io/badge/Version-2.0.0--alpha.11-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

@@ -969,7 +969,7 @@ The bare minimal workload footprint for the new services (without HPA or PDB) is
969969
| argo-platform.secrets | object | See below | Secrets anchors |
970970
| argo-platform.ui | object | See below | ui |
971971
| argo-platform.useExternalSecret | bool | `false` | Use regular k8s secret object. Keep `false`! |
972-
| builder | object | `{"cleaner":{"image":{"registry":"quay.io","repository":"codefresh/docker-cleaner","tag":24}},"container":{"image":{"registry":"docker.io","repository":"docker","tag":"23.0-dind"}},"enabled":true,"initContainers":{"register":{"image":{"registry":"quay.io","repository":"codefresh/curl","tag":"8.1.0"}}}}` | builder |
972+
| builder | object | `{"enabled":true}` | builder |
973973
| cf-broadcaster | object | See below | broadcaster |
974974
| cf-platform-analytics-etlstarter | object | See below | etl-starter |
975975
| cf-platform-analytics-etlstarter.redis.enabled | bool | `false` | Disable redis subchart |
@@ -1038,8 +1038,8 @@ The bare minimal workload footprint for the new services (without HPA or PDB) is
10381038
| global.kubeIntegrationService | string | `"kube-integration"` | Default kube-integration service name. |
10391039
| global.mongoURI | string | `"mongodb://cfuser:mTiXcU2wafr9@cf-mongodb:27017"` | Default Internal MongoDB URI (from bitnami/mongodb subchart).. Change if you use external MongoDB. See "External MongoDB" example below. Will be used by ALL services to communicate with MongoDB. Ref: https://www.mongodb.com/docs/manual/reference/connection-string/ Note! `defaultauthdb` is omitted here on purpose (i.e. mongodb://.../[defaultauthdb]). Mongo seed job will create and add `cfuser` (useraname and password are taken from `.Values.global.mongoURI`) with "ReadWrite" permissions to all of the required databases |
10401040
| global.mongodbDatabase | string | `"codefresh"` | Default MongoDB database name. Don't change! |
1041-
| global.mongodbRootPassword | string | `"XT9nmM8dZD"` | Root password (required ONLY for seed job!). |
1042-
| global.mongodbRootUser | string | `"root"` | Root user (required ONLY for seed job!) |
1041+
| global.mongodbRootPassword | string | `""` | DEPRECATED - Use `.Values.seed.mongoSeedJob` instead. |
1042+
| global.mongodbRootUser | string | `""` | DEPRECATED - Use `.Values.seed.mongoSeedJob` instead. |
10431043
| global.natsPort | int | `4222` | Default nats service port. |
10441044
| global.natsService | string | `"nats"` | Default nats service name. |
10451045
| global.newrelicLicenseKey | string | `""` | New Relic Key |
@@ -1115,6 +1115,10 @@ The bare minimal workload footprint for the new services (without HPA or PDB) is
11151115
| seed | object | See below | Seed jobs |
11161116
| seed.enabled | bool | `true` | Enable all seed jobs |
11171117
| seed.mongoSeedJob | object | See below | Mongo Seed Job. Required at first install. Seeds the required data (default idp/user/account), creates cfuser and required databases. |
1118+
| seed.mongoSeedJob.mongodbRootPassword | string | `"XT9nmM8dZD"` | Root password (required ONLY for seed job!). |
1119+
| seed.mongoSeedJob.mongodbRootUser | string | `"root"` | Root user (required ONLY for seed job!) |
11181120
| seed.postgresSeedJob | object | See below | Postgres Seed Job. Required at first install. Creates required user and databases. |
1121+
| seed.postgresSeedJob.postgresPassword | optional | `""` | Password for "postgres" admin user (required ONLY for seed job!) |
1122+
| seed.postgresSeedJob.postgresUser | optional | `""` | "postgres" admin user (required ONLY for seed job!) Must be a privileged user allowed to create databases and grant roles. If omitted, username and password from `.Values.global.postgresUser/postgresPassword` will be taken. |
11191123
| tasker-kubernetes | object | `{"affinity":{},"container":{"image":{"registry":"gcr.io/codefresh-enterprise"}},"enabled":true,"hpa":{"enabled":false},"nodeSelector":{},"pdb":{"enabled":false},"podSecurityContext":{},"resources":{"limits":{},"requests":{"cpu":"100m","memory":"128Mi"}},"tolerations":[]}` | tasker-kubernetes |
11201124
| webTLS | object | `{"cert":"","enabled":false,"key":"","secretName":"star.codefresh.io"}` | DEPRECATED - Use `.Values.ingress.tls` instead TLS secret for Ingress |

‎codefresh/templates/seed/mongo-seed-secret.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ metadata:
88
labels:
99
{{ include "codefresh.labels" . | nindent 4 }}
1010
stringData:
11-
MONGODB_ROOT_USER: {{ (coalesce .Values.global.mongodbRootUser .Values.seed.mongoSeedJob.mongodbRootUser) }}
12-
MONGODB_ROOT_PASSWORD: {{ urlquery (coalesce .Values.global.mongodbRootPassword .Values.seed.mongoSeedJob.mongodbRootPassword) }}
11+
MONGODB_ROOT_USER: {{ coalesce .Values.seed.mongoSeedJob.mongodbRootUser .Values.global.mongodbRootUser }}
12+
MONGODB_ROOT_PASSWORD: {{ urlquery (coalesce .Values.seed.mongoSeedJob.mongodbRootPassword .Values.global.mongodbRootPassword ) }}
1313
MONGODB_URI: {{ .Values.global.mongoURI }}
1414
MONGODB_DATABASE: {{ .Values.global.mongodbDatabase }}
1515
{{- end }}

‎codefresh/values.yaml

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ seed:
5050
registry: quay.io
5151
repository: codefresh/mongosh
5252
tag: 1.8.2
53+
# -- Root user (required ONLY for seed job!)
54+
mongodbRootUser: root
55+
# -- Root password (required ONLY for seed job!).
56+
mongodbRootPassword: XT9nmM8dZD
5357
# -- Postgres Seed Job. Required at first install. Creates required user and databases.
5458
# @default -- See below
5559
postgresSeedJob:
@@ -58,6 +62,12 @@ seed:
5862
registry: quay.io
5963
repository: codefresh/postgresql
6064
tag: 13
65+
# -- (optional) "postgres" admin user (required ONLY for seed job!)
66+
# Must be a privileged user allowed to create databases and grant roles.
67+
# If omitted, username and password from `.Values.global.postgresUser/postgresPassword` will be taken.
68+
postgresUser: ""
69+
# -- (optional) Password for "postgres" admin user (required ONLY for seed job!)
70+
postgresPassword: ""
6171
ttlSecondsAfterFinished: 300
6272
backoffLimit: 10
6373
affinity: {}
@@ -258,24 +268,28 @@ global:
258268
mongoURI: "mongodb://cfuser:mTiXcU2wafr9@cf-mongodb:27017"
259269
# -- Default MongoDB database name. Don't change!
260270
mongodbDatabase: codefresh
261-
# -- Root user (required ONLY for seed job!)
262-
mongodbRootUser: root
263-
# -- Root password (required ONLY for seed job!).
264-
mongodbRootPassword: XT9nmM8dZD
271+
# -- DEPRECATED - Use `.Values.seed.mongoSeedJob` instead.
272+
mongodbRootUser: ""
273+
# -- DEPRECATED - Use `.Values.seed.mongoSeedJob` instead.
274+
mongodbRootPassword: ""
265275

266276
# Mongo parameters for OfflineLogging. Should match the parameters above.
267277
# -- Default Internal MongoDB URI
268278
runtimeMongoURI: mongodb://cfuser:mTiXcU2wafr9@cf-mongodb:27017
269279
# -- Default Internal MongoDB database name
270280
runtimeMongoDb: codefresh
271281

272-
# External MongoDB example
282+
# # External MongoDB example
283+
# seed:
284+
# mongoSeedJob:
285+
# enabled: true
286+
# mongodbRootUser: root
287+
# mongodbRootPassword: password
288+
#
273289
# global:
274-
# mongodbRootUser: root
275-
# mongodbRootPassword: password
276290
# mongoURI: mongodb://cfuser:password@my-mongodb.prod.svc.cluster.local/?authSource=admin
277291
# runtimeMongoURI: mongodb://cfuser:password@my-mongodb.prod.svc.cluster.local/?authSource=admin
278-
292+
#
279293
# mongodb:
280294
# enabled: false # disable default mongodb subchart installation
281295

@@ -299,6 +313,12 @@ global:
299313
postgresSeedJob: {}
300314

301315
# # External Postgresql example
316+
# seed:
317+
# postgresSeedJob:
318+
# enabled: true
319+
# postgresUser: postgres
320+
# postgresPassword: password
321+
#
302322
# global:
303323
# postgresHostname: my-postgres.ccjog7pqzunf.us-west-2.rds.amazonaws.com
304324
# postgresUser: cf_user
@@ -374,7 +394,7 @@ global:
374394
# @default -- See below
375395
runtimeImages:
376396
COMPOSE_IMAGE: quay.io/codefresh/compose:1.3.0
377-
CONTAINER_LOGGER_IMAGE: quay.io/codefresh/cf-container-logger:1.10.0
397+
CONTAINER_LOGGER_IMAGE: quay.io/codefresh/cf-container-logger:1.10.1
378398
DIND_IMAGE: quay.io/codefresh/dind:20.10.18-1.25.6
379399
DOCKER_BUILDER_IMAGE: quay.io/codefresh/cf-docker-builder:1.3.1
380400
DOCKER_PULLER_IMAGE: quay.io/codefresh/cf-docker-puller:8.0.9
@@ -391,24 +411,8 @@ runtimeImages:
391411
# Codefresh subcharts
392412
#--------------------
393413
# -- builder
394-
builder: &builder
414+
builder:
395415
enabled: true
396-
container:
397-
image:
398-
registry: docker.io
399-
repository: docker
400-
tag: 23.0-dind
401-
initContainers:
402-
register:
403-
image:
404-
registry: quay.io
405-
repository: codefresh/curl
406-
tag: 8.1.0
407-
cleaner:
408-
image:
409-
registry: quay.io
410-
repository: codefresh/docker-cleaner
411-
tag: 24.0
412416

413417
# -- cf-api
414418
cfapi: &cf-api
@@ -957,7 +961,6 @@ rabbitmq:
957961
# -- runner
958962
# @default -- See below
959963
runner:
960-
!!merge <<: *builder
961964
enabled: true
962965

963966
# -- pipeline-manager

0 commit comments

Comments
 (0)