Skip to content

Commit c3b8c76

Browse files
security(onprem): fix vuln (#986)
* fix table of content * bump builder image * change postgresql seed job image * bump platfrom-analytics
1 parent ce34321 commit c3b8c76

File tree

5 files changed

+37
-28
lines changed

5 files changed

+37
-28
lines changed

codefresh/Chart.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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.4
136+
version: 0.45.5
137137
- name: cf-platform-analytics
138138
repository: https://chartmuseum.codefresh.io/cf-platform-analytics
139-
version: 0.45.4
139+
version: 0.45.5
140140
- name: argo-platform
141141
repository: https://chartmuseum.codefresh.io/argo-platform
142142
version: 1.2247.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:f8527a725ebdcea8b1958a348c0f1760f20ef75cb26b8ae1d898484b18012348
150-
generated: "2023-05-14T12:53:52.052873117+03:00"
149+
digest: sha256:fcb78c1b7fab5c7b2c66eab2cbd2153d504c74f2abbd37d0f499da56b39902ae
150+
generated: "2023-05-14T17:38:07.67238674+03:00"

codefresh/Chart.yaml

Lines changed: 3 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.6
4+
version: 2.0.0-alpha.7
55
keywords:
66
- codefresh
77
home: https://codefresh.io/
@@ -16,11 +16,8 @@ annotations:
1616
artifacthub.io/alternativeName: "codefresh-onprem"
1717
artifacthub.io/prerelease: "true"
1818
artifacthub.io/changes: |
19-
- Docs update
20-
- Bump cf-api
21-
- Bump argo-platform
22-
- Bump helm-repo-manager
23-
- Bump Bitnami charts
19+
- Bump platform-analytics
20+
- Update image for builder
2421
dependencies:
2522
- name: cf-common
2623
repository: https://chartmuseum.codefresh.io/cf-common

codefresh/README.md

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

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

77
- [Prerequisites](#prerequisites)
88
- [Get Repo Info and Pull Chart](#get-repo-info-and-pull-chart)
99
- [Install Chart](#install-chart)
1010
- [Helm Chart Configuration](#helm-chart-configuration)
11-
- [Configuring external services for databases/message brokers/data stores](#configuring-external-services-for-databasesmessage-brokersdata-stores)
11+
- [Configuring external services](#configuring-external-services)
1212
- [External MongoDB](#external-mongodb)
1313
- [External MongoDB with MTLS](#external-mongodb-with-mtls)
1414
- [External PostgresSQL](#external-postgressql)
@@ -21,7 +21,8 @@
2121
- [Configuration with Private Registry](#configuration-with-private-registry)
2222
- [Configuration with multi-role CF-API](#configuration-with-multi-role-cf-api)
2323
- [High Availability](#high-availability)
24-
- [Migrating from 1.4.x onprem to 2.0.0](#migrating-from-14x-onprem-to-200)
24+
- [Upgrading](#upgrading)
25+
- [To 2.0.0](#to-200)
2526
- [Values](#values)
2627

2728
## Prerequisites
@@ -114,7 +115,7 @@ See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_h
114115
helm show values codefresh/codefresh
115116
```
116117

117-
### Configuring external services for databases/message brokers/data stores
118+
### Configuring external services
118119

119120
The chart contains required dependencies for the corresponding services
120121
- [bitnami/mongodb](https://github.com/bitnami/charts/tree/main/bitnami/mongodb)
@@ -665,13 +666,15 @@ tasker-kubernetes:
665666
666667
```
667668

668-
## Migrating from 1.4.x onprem to 2.0.0
669+
## Upgrading
670+
671+
### To 2.0.0
669672

670673
This major chart version change (v1.4.X -> v2.0.0) contains some **incompatible breaking change needing manual actions**.
671674

672675
**Before applying the upgrade, read through this section!**
673676

674-
### ⚠️ [Kcfi](https://github.com/codefresh-io/kcfi) Deprecation Notice
677+
#### ⚠️ [Kcfi](https://github.com/codefresh-io/kcfi) Deprecation Notice
675678

676679
This major release deprecates [kcfi](https://github.com/codefresh-io/kcfi) installer. The recommended way to install Codefresh On-Prem is **Helm**.
677680
Due to that, Kcfi `config.yaml` will not be compatible for Helm-based installation.
@@ -825,7 +828,7 @@ seed:
825828
enabled: true
826829
```
827830

828-
### ⚠️ Migration to [Library Charts](https://helm.sh/docs/topics/library_charts/) Notice
831+
#### ⚠️ Migration to [Library Charts](https://helm.sh/docs/topics/library_charts/) Notice
829832

830833
All Codefresh subcharts templates (i.e. `cfapi`, `cfui`, `pipeline-manager`, `context-manager`, etc) has been migrated to use helm [library charts](https://helm.sh/docs/topics/library_charts/).
831834
That allows to unify values structure across all Codefresh owned charts. However, there are some **immutable** fields in the old charts which cannot be upgraded during a regular `helm upgrade`, thus additional manual actions are required.
@@ -854,7 +857,7 @@ nomios:
854857
...
855858
```
856859

857-
### ⚠️ New Services Notice
860+
#### ⚠️ New Services Notice
858861

859862
Codefesh 2.0.0 chart includes additional dependent microservices(charts):
860863
- `argo-platform`: Main Codefresh GitOps module.
@@ -905,7 +908,7 @@ The bare minimal workload footprint for the new services (without HPA or PDB) is
905908
| argo-platform.secrets | object | See below | Secrets anchors |
906909
| argo-platform.ui | object | See below | ui |
907910
| argo-platform.useExternalSecret | bool | `false` | Use regular k8s secret object. Keep `false`! |
908-
| builder | object | `{"enabled":true}` | builder |
911+
| builder | object | `{"container":{"image":{"tag":"20.10.24-dind"}},"enabled":true}` | builder |
909912
| cf-broadcaster | object | See below | broadcaster |
910913
| cf-platform-analytics-etlstarter | object | See below | etl-starter |
911914
| cf-platform-analytics-etlstarter.redis.enabled | bool | `false` | Disable redis subchart |

codefresh/README.md.gotmpl

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- [Get Repo Info and Pull Chart](#get-repo-info-and-pull-chart)
99
- [Install Chart](#install-chart)
1010
- [Helm Chart Configuration](#helm-chart-configuration)
11-
- [Configuring external services for databases/message brokers/data stores](#configuring-external-services-for-databasesmessage-brokersdata-stores)
11+
- [Configuring external services](#configuring-external-services)
1212
- [External MongoDB](#external-mongodb)
1313
- [External MongoDB with MTLS](#external-mongodb-with-mtls)
1414
- [External PostgresSQL](#external-postgressql)
@@ -21,7 +21,8 @@
2121
- [Configuration with Private Registry](#configuration-with-private-registry)
2222
- [Configuration with multi-role CF-API](#configuration-with-multi-role-cf-api)
2323
- [High Availability](#high-availability)
24-
- [Migrating from 1.4.x onprem to 2.0.0](#migrating-from-14x-onprem-to-200)
24+
- [Upgrading](#upgrading)
25+
- [To 2.0.0](#to-200)
2526
- [Values](#values)
2627

2728
## Prerequisites
@@ -114,7 +115,7 @@ See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_h
114115
helm show values codefresh/codefresh
115116
```
116117

117-
### Configuring external services for databases/message brokers/data stores
118+
### Configuring external services
118119

119120
The chart contains required dependencies for the corresponding services
120121
- [bitnami/mongodb](https://github.com/bitnami/charts/tree/main/bitnami/mongodb)
@@ -666,13 +667,15 @@ tasker-kubernetes:
666667

667668
```
668669

669-
## Migrating from 1.4.x onprem to 2.0.0
670+
## Upgrading
671+
672+
### To 2.0.0
670673

671674
This major chart version change (v1.4.X -> v2.0.0) contains some **incompatible breaking change needing manual actions**.
672675

673676
**Before applying the upgrade, read through this section!**
674677

675-
### ⚠️ [Kcfi](https://github.com/codefresh-io/kcfi) Deprecation Notice
678+
#### ⚠️ [Kcfi](https://github.com/codefresh-io/kcfi) Deprecation Notice
676679

677680
This major release deprecates [kcfi](https://github.com/codefresh-io/kcfi) installer. The recommended way to install Codefresh On-Prem is **Helm**.
678681
Due to that, Kcfi `config.yaml` will not be compatible for Helm-based installation.
@@ -826,7 +829,7 @@ seed:
826829
enabled: true
827830
```
828831

829-
### ⚠️ Migration to [Library Charts](https://helm.sh/docs/topics/library_charts/) Notice
832+
#### ⚠️ Migration to [Library Charts](https://helm.sh/docs/topics/library_charts/) Notice
830833

831834
All Codefresh subcharts templates (i.e. `cfapi`, `cfui`, `pipeline-manager`, `context-manager`, etc) has been migrated to use helm [library charts](https://helm.sh/docs/topics/library_charts/).
832835
That allows to unify values structure across all Codefresh owned charts. However, there are some **immutable** fields in the old charts which cannot be upgraded during a regular `helm upgrade`, thus additional manual actions are required.
@@ -855,7 +858,7 @@ nomios:
855858
...
856859
```
857860

858-
### ⚠️ New Services Notice
861+
#### ⚠️ New Services Notice
859862

860863
Codefesh 2.0.0 chart includes additional dependent microservices(charts):
861864
- `argo-platform`: Main Codefresh GitOps module.

codefresh/values.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ seed:
5555
postgresSeedJob:
5656
enabled: true
5757
image:
58-
registry: docker.io
59-
repository: bitnami/postgresql
58+
registry: quay.io
59+
repository: codefresh/postgresql
6060
tag: 13
6161
ttlSecondsAfterFinished: 300
6262
backoffLimit: 10
@@ -390,6 +390,9 @@ runtimeImages:
390390
# -- builder
391391
builder:
392392
enabled: true
393+
container:
394+
image:
395+
tag: 20.10.24-dind
393396

394397
# -- cf-api
395398
cfapi: &cf-api
@@ -939,6 +942,9 @@ rabbitmq:
939942
# @default -- See below
940943
runner:
941944
enabled: true
945+
container:
946+
image:
947+
tag: 20.10.24-dind
942948

943949
# -- pipeline-manager
944950
# @default -- See below

0 commit comments

Comments
 (0)