Skip to content

Commit 88a3cdc

Browse files
mikhail-klimkomikhail-klimko
authored
onprem: 2.2.3 release (#1221)
1 parent d820f83 commit 88a3cdc

File tree

5 files changed

+62
-32
lines changed

5 files changed

+62
-32
lines changed

‎codefresh/Chart.lock‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,55 +64,55 @@ dependencies:
6464
version: 1.14.8
6565
- name: cfapi
6666
repository: oci://quay.io/codefresh/charts
67-
version: 21.247.14
67+
version: 21.247.15
6868
- name: cfapi
6969
repository: oci://quay.io/codefresh/charts
70-
version: 21.247.14
70+
version: 21.247.15
7171
- name: cfapi
7272
repository: oci://quay.io/codefresh/charts
73-
version: 21.247.14
73+
version: 21.247.15
7474
- name: cfapi
7575
repository: oci://quay.io/codefresh/charts
76-
version: 21.247.14
76+
version: 21.247.15
7777
- name: cfapi
7878
repository: oci://quay.io/codefresh/charts
79-
version: 21.247.14
79+
version: 21.247.15
8080
- name: cfapi
8181
repository: oci://quay.io/codefresh/charts
82-
version: 21.247.14
82+
version: 21.247.15
8383
- name: cfapi
8484
repository: oci://quay.io/codefresh/charts
85-
version: 21.247.14
85+
version: 21.247.15
8686
- name: cfapi
8787
repository: oci://quay.io/codefresh/charts
88-
version: 21.247.14
88+
version: 21.247.15
8989
- name: cfapi
9090
repository: oci://quay.io/codefresh/charts
91-
version: 21.247.14
91+
version: 21.247.15
9292
- name: cfapi
9393
repository: oci://quay.io/codefresh/charts
94-
version: 21.247.14
94+
version: 21.247.15
9595
- name: cfapi
9696
repository: oci://quay.io/codefresh/charts
97-
version: 21.247.14
97+
version: 21.247.15
9898
- name: cfapi
9999
repository: oci://quay.io/codefresh/charts
100-
version: 21.247.14
100+
version: 21.247.15
101101
- name: cfapi
102102
repository: oci://quay.io/codefresh/charts
103-
version: 21.247.14
103+
version: 21.247.15
104104
- name: cfapi
105105
repository: oci://quay.io/codefresh/charts
106-
version: 21.247.14
106+
version: 21.247.15
107107
- name: cfapi
108108
repository: oci://quay.io/codefresh/charts
109-
version: 21.247.14
109+
version: 21.247.15
110110
- name: cfapi
111111
repository: oci://quay.io/codefresh/charts
112-
version: 21.247.14
112+
version: 21.247.15
113113
- name: cfapi
114114
repository: oci://quay.io/codefresh/charts
115-
version: 21.247.14
115+
version: 21.247.15
116116
- name: cfui
117117
repository: oci://quay.io/codefresh/charts
118118
version: 14.92.159
@@ -148,12 +148,12 @@ dependencies:
148148
version: 1.2577.0
149149
- name: argo-hub-platform
150150
repository: oci://quay.io/codefresh/charts
151-
version: 0.1.8
151+
version: 0.1.10
152152
- name: codefresh-tunnel-server
153153
repository: oci://quay.io/codefresh/charts
154154
version: 0.1.16
155155
- name: cf-oidc-provider
156156
repository: oci://quay.io/codefresh/charts
157-
version: 0.0.12
158-
digest: sha256:e5ef4e61294de762e98e62c3186ea7891b897d61d25ab3c5234ea05085cebf94
159-
generated: "2023-12-25T02:54:10.347741424+03:00"
157+
version: 0.0.14
158+
digest: sha256:246247472759def4626e5dd0e69c67bfc4311c8ad7db9a486b3f2e05dde86bb9
159+
generated: "2024-01-11T17:43:56.573841738+03:00"

‎codefresh/Chart.yaml‎

Lines changed: 5 additions & 3 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.2.2
4+
version: 2.2.3
55
keywords:
66
- codefresh
77
home: https://codefresh.io/
@@ -16,10 +16,12 @@ annotations:
1616
artifacthub.io/alternativeName: "codefresh-onprem"
1717
artifacthub.io/changes: |
1818
- kind: changed
19-
description: Update accountInfoCopyButton feature flag
19+
description: Update useLogsTimestamps feature flag
2020
links:
2121
- name: JIRA Issue
22-
url: https://codefresh-io.atlassian.net/browse/CR-19152
22+
url: https://codefresh-io.atlassian.net/browse/CR-22181
23+
- kind: added
24+
description: Add option to specify cliend id and secert in .Values.global for OIDC provider
2325
dependencies:
2426
- name: cf-common
2527
repository: oci://quay.io/codefresh/charts

‎codefresh/README.md‎

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

3-
![Version: 2.2.2](https://img.shields.io/badge/Version-2.2.2-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
3+
![Version: 2.2.3](https://img.shields.io/badge/Version-2.2.3-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
44

55
Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes.
66

@@ -1255,6 +1255,12 @@ kubectl create secret generic cf-oidc-provider-client-secret \
12551255
global:
12561256
# -- Set OIDC Provider URL
12571257
oidcProviderService: "oidc.mydomain.com"
1258+
# -- Default OIDC Provider service client ID in plain text.
1259+
# Optional! If specified here, no need to specify CLIENT_ID/CLIENT_SECRET env vars in cfapi and cf-oidc-provider below.
1260+
oidcProviderClientId: null
1261+
# -- Default OIDC Provider service client secret in plain text.
1262+
# Optional! If specified here, no need to specify CLIENT_ID/CLIENT_SECRET env vars in cfapi and cf-oidc-provider below.
1263+
oidcProviderClientSecret: null
12581264

12591265
cfapi:
12601266
# -- Set additional variables for cfapi
@@ -1954,8 +1960,8 @@ kubectl -n $NAMESPACE delete secret codefresh-certs-server
19541960
| cf-platform-analytics-etlstarter.redis.enabled | bool | `false` | Disable redis subchart |
19551961
| cf-platform-analytics-etlstarter.system-etl-postgres | object | `{"container":{"env":{"BLUE_GREEN_ENABLED":true}},"controller":{"cronjob":{"ttlSecondsAfterFinished":300}},"enabled":true}` | Only postgres ETL should be running in onprem |
19561962
| cf-platform-analytics-platform | object | See below | platform-analytics |
1957-
| cfapi | object | `{"affinity":{},"container":{"env":{"AUDIT_AUTO_CREATE_DB":true,"GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_CLIENT_ID":"","OIDC_PROVIDER_CLIENT_SECRET":"","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"gcr.io/codefresh-enterprise","repository":"codefresh/cf-api"}},"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 |
1958-
| cfapi.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_CLIENT_ID":"","OIDC_PROVIDER_CLIENT_SECRET":"","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"gcr.io/codefresh-enterprise","repository":"codefresh/cf-api"}}` | Container configuration |
1963+
| cfapi | object | `{"affinity":{},"container":{"env":{"AUDIT_AUTO_CREATE_DB":true,"GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"gcr.io/codefresh-enterprise","repository":"codefresh/cf-api"}},"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"}},"secrets":{"secret":{"enabled":true,"stringData":{"OIDC_PROVIDER_CLIENT_ID":"{{ .Values.global.oidcProviderClientId }}","OIDC_PROVIDER_CLIENT_SECRET":"{{ .Values.global.oidcProviderClientSecret }}"},"type":"Opaque"}},"tolerations":[]}` | cf-api |
1964+
| cfapi.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"gcr.io/codefresh-enterprise","repository":"codefresh/cf-api"}}` | Container configuration |
19591965
| cfapi.container.env | object | See below | Env vars |
19601966
| cfapi.container.image | object | `{"registry":"gcr.io/codefresh-enterprise","repository":"codefresh/cf-api"}` | Image |
19611967
| cfapi.container.image.registry | string | `"gcr.io/codefresh-enterprise"` | Registry prefix |
@@ -2031,6 +2037,8 @@ kubectl -n $NAMESPACE delete secret codefresh-certs-server
20312037
| global.natsPort | int | `4222` | Default nats service port. |
20322038
| global.natsService | string | `"nats"` | Default nats service name. |
20332039
| global.newrelicLicenseKey | string | `""` | New Relic Key |
2040+
| global.oidcProviderClientId | string | `nil` | Default OIDC Provider service client ID in plain text. |
2041+
| global.oidcProviderClientSecret | string | `nil` | Default OIDC Provider service client secret in plain text. |
20342042
| global.oidcProviderPort | int | `443` | Default OIDC Provider service port. |
20352043
| global.oidcProviderProtocol | string | `"https"` | Default OIDC Provider service protocol. |
20362044
| global.oidcProviderService | string | `""` | Default OIDC Provider service name (Provider URL). |

‎codefresh/README.md.gotmpl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,6 +1261,12 @@ kubectl create secret generic cf-oidc-provider-client-secret \
12611261
global:
12621262
# -- Set OIDC Provider URL
12631263
oidcProviderService: "oidc.mydomain.com"
1264+
# -- Default OIDC Provider service client ID in plain text.
1265+
# Optional! If specified here, no need to specify CLIENT_ID/CLIENT_SECRET env vars in cfapi and cf-oidc-provider below.
1266+
oidcProviderClientId: null
1267+
# -- Default OIDC Provider service client secret in plain text.
1268+
# Optional! If specified here, no need to specify CLIENT_ID/CLIENT_SECRET env vars in cfapi and cf-oidc-provider below.
1269+
oidcProviderClientSecret: null
12641270

12651271
cfapi:
12661272
# -- Set additional variables for cfapi

‎codefresh/values.yaml‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@ global:
183183
oidcProviderProtocol: "https"
184184
# -- Default OIDC Provider service token endpoint.
185185
oidcProviderTokenEndpoint: "/token"
186+
# -- Default OIDC Provider service client ID in plain text.
187+
oidcProviderClientId: null
188+
# -- Default OIDC Provider service client secret in plain text.
189+
oidcProviderClientSecret: null
186190

187191
#--------
188192
# MongoDB
@@ -499,8 +503,13 @@ cfapi: &cf-api
499503
OIDC_PROVIDER_PORT: '{{ .Values.global.oidcProviderPort }}'
500504
OIDC_PROVIDER_PROTOCOL: '{{ .Values.global.oidcProviderProtocol }}'
501505
OIDC_PROVIDER_TOKEN_ENDPOINT: '{{ .Values.global.oidcProviderTokenEndpoint }}'
502-
OIDC_PROVIDER_CLIENT_ID: ""
503-
OIDC_PROVIDER_CLIENT_SECRET: ""
506+
secrets:
507+
secret:
508+
enabled: true
509+
type: Opaque
510+
stringData:
511+
OIDC_PROVIDER_CLIENT_ID: '{{ .Values.global.oidcProviderClientId }}'
512+
OIDC_PROVIDER_CLIENT_SECRET: '{{ .Values.global.oidcProviderClientSecret }}'
504513

505514
# -- Resource requests and limits
506515
resources:
@@ -1675,9 +1684,6 @@ cf-oidc-provider:
16751684
OIDC_ISSUER: '{{ printf "https://%s" .Values.global.oidcProviderService }}'
16761685
OIDC_AUDIENCE: '{{ printf "https://%s" .Values.global.appUrl }}'
16771686
OIDC_JWKS_PRIVATE_KEYS_PATH: /secrets/jwks/cf-oidc-provider-jwks.json
1678-
OIDC_CF_PLATFORM_CLIENT_ID: ""
1679-
OIDC_CF_PLATFORM_CLIENT_SECRET: ""
1680-
16811687
resources:
16821688
requests:
16831689
cpu: 100m
@@ -1688,6 +1694,14 @@ cf-oidc-provider:
16881694
path:
16891695
- mountPath: /secrets/jwks
16901696

1697+
secrets:
1698+
secret:
1699+
enabled: true
1700+
type: Opaque
1701+
stringData:
1702+
OIDC_CF_PLATFORM_CLIENT_ID: '{{ .Values.global.oidcProviderClientId }}'
1703+
OIDC_CF_PLATFORM_CLIENT_SECRET: '{{ .Values.global.oidcProviderClientSecret }}'
1704+
16911705
volumes:
16921706
jwks-file:
16931707
enabled: true

0 commit comments

Comments
 (0)