Skip to content

Commit 80a174f

Browse files
feat: update dependencies (#165)
1 parent 02ec07e commit 80a174f

File tree

9 files changed

+194
-29
lines changed

9 files changed

+194
-29
lines changed
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
seed-e2e:
2+
enabled: true
3+
4+
global:
5+
appUrl: "" # placeholder
6+
imagePullSecrets:
7+
- codefresh-registry
8+
- dockerhub-creds
9+
10+
cfapi:
11+
rbac:
12+
namespaced: false
13+
hpa:
14+
enabled: true
15+
resources:
16+
requests:
17+
cpu: 300m
18+
memory: 1024Mi
19+
container:
20+
env:
21+
DEFAULT_SYSTEM_TYPE: CLASSIC
22+
23+
ingress:
24+
enabled: true
25+
ingressClassName: nginx
26+
tls:
27+
enabled: false
28+
29+
ingress-nginx:
30+
enabled: false
31+
32+
argo-platform:
33+
enabled: true
34+
35+
analytics-reporter:
36+
hpa:
37+
enabled: true
38+
39+
api-events:
40+
hpa:
41+
enabled: true
42+
43+
api-graphql:
44+
hpa:
45+
enabled: true
46+
resources:
47+
requests:
48+
cpu: 300m
49+
memory: 1024Mi
50+
51+
cron-executor:
52+
hpa:
53+
enabled: true
54+
55+
event-handler:
56+
hpa:
57+
enabled: true
58+
resources:
59+
requests:
60+
cpu: 300m
61+
memory: 1024Mi
62+
63+
ui:
64+
hpa:
65+
enabled: true
66+
67+
audit:
68+
hpa:
69+
enabled: true
70+
71+
abac:
72+
hpa:
73+
enabled: true
74+
75+
promotion-orchestrator:
76+
hpa:
77+
enabled: true
78+
79+
mongodb:
80+
migration:
81+
enabled: false
82+
image:
83+
repository: bitnamilegacy/mongodb
84+
nodeSelector:
85+
kubernetes.io/arch: amd64
86+
87+
consul:
88+
image:
89+
repository: bitnamilegacy/consul
90+
91+
nats:
92+
image:
93+
repository: bitnamilegacy/nats
94+
95+
rabbitmq:
96+
image:
97+
repository: bitnamilegacy/rabbitmq
98+
99+
redis:
100+
image:
101+
repository: bitnamilegacy/redis
102+
103+
cf-platform-analytics-platform:
104+
redis:
105+
image:
106+
repository: bitnamilegacy/redis
107+
108+
hooks:
109+
mongodb:
110+
nodeSelector:
111+
kubernetes.io/arch: amd64
112+
rabbitmq:
113+
nodeSelector:
114+
kubernetes.io/arch: amd64
115+
116+
seed:
117+
nodeSelector:
118+
kubernetes.io/arch: amd64

charts/codefresh/.ci/values/mtls-mongodb-redis.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
seed:
22
mongoSeedJob:
33
mongodbRootURI: mongodb://root:XT9nmM8dZDZ@cf-mongodb:27017/?authSource=admin
4+
mongodbRootOptions: authSource=admin
5+
mongodbRootPassword: XT9nmM8dZDZ
46

57
global:
68
appUrl: "" # placeholder for ${CF_APP_HOST}
@@ -106,6 +108,8 @@ mongodb:
106108
caCert: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURGVENDQWYyZ0F3SUJBZ0lRZWVySXdOWkNpdyt1alRPdHZ2TEZLREFOQmdrcWhraUc5dzBCQVFzRkFEQVYKTVJNd0VRWURWUVFERXdwdGVVMXZibWR2TFdOaE1CNFhEVEl5TVRFd01qRTRNRFl6TWxvWERUTXlNVEF6TURFNApNRFl6TWxvd0ZURVRNQkVHQTFVRUF4TUtiWGxOYjI1bmJ5MWpZVENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFECmdnRVBBRENDQVFvQ2dnRUJBTGxpV3dIVDQ5OWE0MzgrUWZjcExTNThVT2FsV3ArVXhkWVYwQjZkVTlFejlQSW4KTncydXZqNWtjN3RtU08xUk5ReEJRVjZpOHNBWHdQcTM1WlZYdTQ2OHhURkdHMXZBTWhrTkQ1OTJWd3JFNElCSgpTMm9XNEV6UWJPR3Fsd2ZBanNMZ1VlRjdBbHRuUEVNMjBSQ3hpMzhPNGY0VHZNZHpQamhIa2NNU2NMaHNhYjRlCjYrbVA0MFJBcEdLc2hwV2YwbnoyMXErWU83Zm4wNjVYd3dvUVBvL1BZa0FLdWNHZk1xRjltYXRCYWdUMlVwT0cKSFlRa2pzRW1zSmxEdkhsV1RBdzU2eFl4UU9UbUVWU2hkYzlKRDNmWEZEVkd6L1NVYkZXQTVualBLL0QvbXdpawppM0RaL0h6SUVEbXBJUElxRERsTGdIL3F6b3Jlb0NKMjB1YnlCb1VDQXdFQUFhTmhNRjh3RGdZRFZSMFBBUUgvCkJBUURBZ0trTUIwR0ExVWRKUVFXTUJRR0NDc0dBUVVGQndNQkJnZ3JCZ0VGQlFjREFqQVBCZ05WSFJNQkFmOEUKQlRBREFRSC9NQjBHQTFVZERnUVdCQlFXTWg5RDRiVkljRWQ2dVBOZ1RqWGpMWUpoSmpBTkJna3Foa2lHOXcwQgpBUXNGQUFPQ0FRRUFSUTBaV3F0dUlLWHNHTTJ4TW1Za0VJTHprckJySktiWXhIOFlCUEJFTjZZT09la0o2Q1FhCjQzZitmaHJlQ2o4NFdwSzdwckNEcjJYTmlHNHJlYjBrU2dYdmpyZUVBTzU0Q1FzelJwR0xUVjROMTBjTDdHUVoKaXd6OElGMXppTld4WXVXK29aSFRBQ2NMRkJkUnFFZWNSWUJXTU0vaDhZcldoWTRIaXlIMHp4UkRsOGNpU2ZOMApoa2lURzZQd0V0S29ZRWUwZ21OWXhkWFNzZ2FMZFlUMjNiMGJsMlB3OUdZdkJlWmFpZlZTbllDYmhmTDNPVkQxCjV6YnBXNHhmMEJyM0VGbStrUHh0SGxVR2FsUXdFb3NSVy9kWEpFWFVQTHNGb2xPRDRiR0xvblE4Z2VHcFVYVzQKR3prV0g5QTFXUlE4bWIxd0ZDTkZNVjgvUWxKams3MEJFUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="
107109
caKey: "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBdVdKYkFkUGozMXJqZno1Qjl5a3RMbnhRNXFWYW41VEYxaFhRSHAxVDBUUDA4aWMzCkRhNitQbVJ6dTJaSTdWRTFERUZCWHFMeXdCZkErcmZsbFZlN2pyekZNVVliVzhBeUdRMFBuM1pYQ3NUZ2dFbEwKYWhiZ1ROQnM0YXFYQjhDT3d1QlI0WHNDVzJjOFF6YlJFTEdMZnc3aC9oTzh4M00rT0VlUnd4Snd1R3hwdmg3cgo2WS9qUkVDa1lxeUdsWi9TZlBiV3I1Zzd0K2ZUcmxmRENoQStqODlpUUFxNXdaOHlvWDJacTBGcUJQWlNrNFlkCmhDU093U2F3bVVPOGVWWk1ERG5yRmpGQTVPWVJWS0YxejBrUGQ5Y1VOVWJQOUpSc1ZZRG1lTThyOFArYkNLU0wKY05uOGZNZ1FPYWtnOGlvTU9VdUFmK3JPaXQ2Z0luYlM1dklHaFFJREFRQUJBb0lCQUNIQ3JxNHJoMkVpclRGOApCZ2xiMzFXSzREVFF3aXN6cmIrcUkwZWdBU2FsSHFPR3pyallMTjh4N2YyZnlBSW4rdEFyaGhzVTg3NVYxUmdUCnEyVENJRzhESTZvd2lVVHhRRzVkZVkzaHdFSSt6bCt1ZVdSdG5CV0JFNE1aVFAzbGJGcEMvY1poWDNHRDRHNmgKS2Z1dlNhY3U3NnNVcnhsbmZGcEZkbDhmR1pZTUlOOUNZWHArWWVJZzRuYW5ZSFJsbk1LM05QSjIzZUVHdkpjeQpLdUZWNndIUzFlWmg1M0J0aWRlY3czcmFzZFhJWmMzdFJidlFid3lDbjZ5dVlING0vUXJzMVFUckp2dzdyWU1sCkxyZGxlZm5uWk9XNFNVc3dINkVCWmF3RC9FTFc4eFNORVhudUkzUFp0di9oRVVZd3RKOVdMbk0rRitzc21ldm8KaHVGMUI5VUNnWUVBMFBHSmc2U3N6dHlKNkhyM0tTaEhyN3h5eVVPOVJTK0N3LzBSV2cranJ3SGFlRGRIalpvKwpaYXhxWVdoRUR0aUZieWpJdWR2MFF1aUZhMHVObDUvMGl3YXR2Tm81RitNZWV3WGt1T0YraWE3RFdFODk0a2ZECkVqYXJYWUk3ZkpnTkdxVmthWUw1cGdGcmxpUDhkZDFkK0VlTWV4dmJadTdwYUZzaXBaZWs1NE1DZ1lFQTR5S0cKdzAyMHJTTGRwdlYyQmE2WG4zbFRXUW0wMFlOaVFuY0YrVjJXNm95RjREK2liRUppTUdUZzRESzZLVllNVElpNQpmaVV4WHlib0Fkd1hvTlpqMmhPWmhmMVZSa3g1WGIrOVorbDV3ZFlBMGR4RmV1ajBDakpmd3p1UTNuOUxZOWxlCnJSSi91SklkbHhKWkx2Z0RLZzdRZ2NuNkJCN2Y1Ujlwa1JKaTgxY0NnWUJYZ2xITnlOSjNjUFp4WDg3VWRnSlEKSCtVVFZrT1hEbWIrSHFkOXlMOE5OUUdEQitQMzhubmZxMjZDaldDenR3dHJtdkUycG1DUEJVT2J4SER3NkJWTApoT2lQQi9hUmdwWHBnSFppMkU1ZTY4cjAyWHRab2lTWkpEeHhWWElFcE1vWU50enZNK1BMR3gwc0xMWTN4eGJzClBVc2c1SEhua25nL05LdzJIbVQ2Y1FLQmdEaW9lQzFueU5ZWGlHc0pkL05hNWYrbDZDQ2h4elVzTE9xZmZpSUMKTW84M2xuMmw0Z0pYWE43dGl4cmlESVliTE40NmpPcm1wRFkwSWxPMGIwQnp1bHkvM3VBSm5hZjNrNTdMSVpnMgpLV1VzMk8rQW51UldEK29yUHJBWXY3NkF5bkdSMjRnWXdUdHRWMnhENjNOSDhxSWZKK3Y0VWlHTkFoVEpqUy9mCkFrZnBBb0dBQ0pRS0lOU0hZOWN2RGZseWNWNmRCcndGS0hRb3oyZGg5Z0EvSjBGazYyc0VrNDY1SUtINm96VDQKQTlSZi8yMHBLZG40dmRnTktJQ3R1cUNKN1JIMC82bVRZWXUwSEJTWHo1elZIdWczTHpFbGxOdVB4MnRhc0x0MgpjdElsVkVrdk96L1hCa3BMVUE2TDlaR01Ha2tyeUJoNEdXd2FCajBHeldUQ2JMUGZ3N3c9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0t"
108110
mode: allowTLS
111+
image:
112+
repository: bitnamilegacy/nginx
109113

110114
redis:
111115
tls:

charts/codefresh/Chart.yaml

Lines changed: 4 additions & 4 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.6.14
4+
version: 2.6.15
55
keywords:
66
- codefresh
77
home: https://codefresh.io/
@@ -17,9 +17,9 @@ annotations:
1717
artifacthub.io/alternativeName: "codefresh-onprem"
1818
artifacthub.io/containsSecurityUpdates: "false"
1919
# supported kinds are added, changed, deprecated, removed, fixed and security.
20-
# artifacthub.io/changes: |
21-
# - kind: fixed
22-
# description: "Fixed an issue with incorrect Github Enterprise branch list endpoint."
20+
artifacthub.io/changes: |
21+
- kind: fixed
22+
description: "Fixed an issue with incorrect Github Enterprise branch list endpoint."
2323
dependencies:
2424
- name: cf-common
2525
repository: oci://quay.io/codefresh/charts

charts/codefresh/files/mongoSeedJobScript.sh

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ COMMENT
1515
# set -eou pipefail
1616

1717
ASSETS_PATH=${ASSETS_PATH:-/usr/share/extras/}
18+
MTLS_CERT_PATH=${MTLS_CERT_PATH:-/etc/ssl/mongodb/ca.pem}
1819

1920
MONGODB_DATABASES=(
2021
"archive"
@@ -37,7 +38,7 @@ disableMongoTelemetry() {
3738

3839
waitForMongoDB() {
3940
while true; do
40-
status=$(mongosh ${MONGODB_ROOT_URI} --eval "db.adminCommand('ping')" 2>&1)
41+
status=$(mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.adminCommand('ping')" 2>&1)
4142

4243
echo -e "MongoDB status:\n$status"
4344
if $(echo $status | grep 'ok: 1' -q); then
@@ -54,12 +55,22 @@ parseMongoURI() {
5455
local parameters="$(echo $1 | grep '?' | cut -d '?' -f2)"; if [[ -n $parameters ]]; then parameters="?${parameters}"; fi
5556
local url="$(echo ${1/$proto/})"
5657
local userpass="$(echo $url | grep @ | cut -d@ -f1)"
57-
local hostport="$(echo $url | sed s/$userpass// | sed "s/\/\?$parameters//" | sed -re "s/\/\?|@//g" | sed 's/\/$//')"
58+
if [[ -z $userpass ]]; then
59+
local hostport="$(echo $url | sed "s/\/\?$parameters//" | sed -re "s/\/\?|@//g" | sed 's/\/$//')"
60+
MONGO_URI="$proto$hostport/${MONGODB_DATABASE}$parameters"
61+
else
62+
local hostport="$(echo $url | sed s/$userpass// | sed "s/\/\?$parameters//" | sed -re "s/\/\?|@//g" | sed 's/\/$//')"
63+
MONGODB_PASSWORD="$(echo $userpass | grep : | cut -d: -f2)"
64+
MONGODB_USER="$(echo $userpass | grep : | cut -d: -f1)"
65+
MONGO_URI="$proto$userpass@$hostport/${MONGODB_DATABASE}$parameters"
66+
fi
67+
68+
if [[ -z $MONGODB_ROOT_OPTIONS ]]; then
69+
MONGODB_ROOT_URI="$proto${MONGODB_ROOT_USER}:${MONGODB_ROOT_PASSWORD}@$hostport/admin$parameters"
70+
else
71+
MONGODB_ROOT_URI="$proto${MONGODB_ROOT_USER}:${MONGODB_ROOT_PASSWORD}@$hostport/admin?${MONGODB_ROOT_OPTIONS}"
72+
fi
5873

59-
MONGODB_PASSWORD="$(echo $userpass | grep : | cut -d: -f2)"
60-
MONGODB_USER="$(echo $userpass | grep : | cut -d: -f1)"
61-
MONGO_URI="$proto$userpass@$hostport/${MONGODB_DATABASE}$parameters"
62-
MONGODB_ROOT_URI="$proto${MONGODB_ROOT_USER}:${MONGODB_ROOT_PASSWORD}@$hostport/admin$parameters"
6374
}
6475

6576
getMongoVersion() {
@@ -68,6 +79,14 @@ getMongoVersion() {
6879

6980
parseMongoURI $MONGO_URI
7081

82+
if [[ -s ${MTLS_CERT_PATH} ]]; then
83+
MONGO_URI_EXTRA_PARAMS="--tls --tlsCertificateKeyFile ${MTLS_CERT_PATH} --tlsAllowInvalidHostnames --tlsAllowInvalidCertificates"
84+
MONGOIMPORT_EXTRA_PARAMS="--ssl --sslPEMKeyFile ${MTLS_CERT_PATH} --sslAllowInvalidHostnames --sslAllowInvalidCertificates"
85+
else
86+
MONGO_URI_EXTRA_PARAMS=""
87+
MONGOIMPORT_EXTRA_PARAMS=""
88+
fi
89+
7190
disableMongoTelemetry
7291

7392
waitForMongoDB
@@ -76,15 +95,15 @@ getMongoVersion
7695

7796
for MONGODB_DATABASE in ${MONGODB_DATABASES[@]}; do
7897
waitForMongoDB
79-
mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"${MONGODB_DATABASE}\").createUser({user: \"${MONGODB_USER}\", pwd: \"${MONGODB_PASSWORD}\", roles: [\"readWrite\"]})" 2>&1 || true
98+
mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\"${MONGODB_DATABASE}\").createUser({user: \"${MONGODB_USER}\", pwd: \"${MONGODB_PASSWORD}\", roles: [\"readWrite\"]})" 2>&1 || true
8099
waitForMongoDB
81-
mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"${MONGODB_DATABASE}\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true
100+
mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\"${MONGODB_DATABASE}\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true
82101
done
83102

84-
mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").grantRolesToUser( \"${MONGODB_USER}\", [ { role: \"readWrite\", db: \"pipeline-manager\" } ] )" 2>&1 || true
85-
mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").grantRolesToUser( \"${MONGODB_USER}\", [ { role: \"readWrite\", db: \"platform-analytics-postgres\" } ] )" 2>&1 || true
86-
mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true
103+
mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\"codefresh\").grantRolesToUser( \"${MONGODB_USER}\", [ { role: \"readWrite\", db: \"pipeline-manager\" } ] )" 2>&1 || true
104+
mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\"codefresh\").grantRolesToUser( \"${MONGODB_USER}\", [ { role: \"readWrite\", db: \"platform-analytics-postgres\" } ] )" 2>&1 || true
105+
mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\"codefresh\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true
87106

88-
mongoimport --uri ${MONGO_URI} --collection idps --type json --legacy --file ${ASSETS_PATH}idps.json
89-
mongoimport --uri ${MONGO_URI} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts.json
90-
mongoimport --uri ${MONGO_URI} --collection users --type json --legacy --file ${ASSETS_PATH}users.json
107+
mongoimport --uri ${MONGO_URI} ${MONGOIMPORT_EXTRA_PARAMS} --collection idps --type json --legacy --file ${ASSETS_PATH}idps.json
108+
mongoimport --uri ${MONGO_URI} ${MONGOIMPORT_EXTRA_PARAMS} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts.json
109+
mongoimport --uri ${MONGO_URI} ${MONGOIMPORT_EXTRA_PARAMS} --collection users --type json --legacy --file ${ASSETS_PATH}users.json

charts/codefresh/templates/_env_var_secret_ref.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ MONGO_SEED_URI env var value
7373
{{- /*
7474
Check for legacy global.mongoURI
7575
*/}}
76-
{{- if .Values.global.mongoURI }}
76+
{{- if .Values.seed.mongoSeedJob.mongodbRootURI }}
77+
value: "$(MONGO_ROOT_URI)"
78+
{{- else if .Values.global.mongoURI }}
7779
value: "$(MONGO_URI)"
7880
{{- /*
7981
New secret implementation

charts/codefresh/templates/secrets/regsecret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ metadata:
2020
type: kubernetes.io/dockerconfigjson
2121
data:
2222
.dockerconfigjson: {{ include "codefresh.imagePullSecret" . }}
23-
{{- end }}
23+
{{- end }}

charts/codefresh/templates/secrets/secret.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ data:
1919
# legacy MONGODB_* secrets
2020
MONGODB_ROOT_USER: {{ coalesce .Values.global.mongodbRootUser .Values.seed.mongoSeedJob.mongodbRootUser | b64enc }}
2121
MONGODB_ROOT_PASSWORD: {{ urlquery (coalesce .Values.global.mongodbRootPassword .Values.seed.mongoSeedJob.mongodbRootPassword) | b64enc }}
22-
MONGO_URI: {{ .Values.global.mongoURI | default "empty" | b64enc}}
22+
MONGO_URI: {{ .Values.global.mongoURI | default "empty" | b64enc }}
23+
MONGO_ROOT_URI: {{ coalesce .Values.seed.mongoSeedJob.mongodbRootURI | default "empty" | b64enc }}
2324
MONGO_URI_RE_MANAGER: {{ include (printf "%s.classic.calculateMongoUri" $libTemplateName) (dict "dbName" "runtime-environment-manager" "mongoURI" .Values.global.mongoURI) | default "empty" | b64enc }}
2425
MONGODB_RE_DATABASE: {{ printf "%s" "runtime-environment-manager" | b64enc }}
2526

charts/codefresh/templates/seed/mongo-seed-job.yaml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
{{ $context := deepCopy .Values.seed }}
33
---
44
{{- if and .Values.seed.enabled (or .Values.global.seedJobs .Values.seed.mongoSeedJob.enabled) }}
5+
{{- $tolerations := .Values.seed.tolerations | default list }}
6+
{{- $globalTolerations := .Values.global.tolerations | default list }}
7+
{{- $allToleration := concat $globalTolerations $tolerations }}
8+
{{- $affinity := .Values.seed.affinity | default dict }}
9+
{{- $globalAffinity := .Values.global.affinity | default dict }}
10+
{{- $allAffinity := mergeOverwrite $globalAffinity $affinity }}
11+
{{- $nodeSelector := .Values.seed.nodeSelector | default dict }}
12+
{{- $globalNodeSelector := .Values.global.nodeSelector | default dict }}
13+
{{- $allNodeSelector := mergeOverwrite $globalNodeSelector $nodeSelector }}
514
apiVersion: batch/v1
615
kind: Job
716
metadata:
@@ -21,10 +30,7 @@ spec:
2130
labels:
2231
{{ include "codefresh.labels" . | nindent 8 }}
2332
spec:
24-
{{- if .Values.global.imageRegistry }}
25-
imagePullSecrets:
26-
- name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}-registry"
27-
{{- end }}
33+
{{- include (printf "%s.image.pullSecrets" $libTemplateName ) . | nindent 6 }}
2834
securityContext:
2935
{{- toYaml .Values.seed.podSecurityContext | nindent 8 }}
3036
containers:
@@ -46,6 +52,17 @@ spec:
4652
{{- include "codefresh.mongodb-root-user-env-var-value" . | indent 12 }}
4753
- name: MONGODB_ROOT_PASSWORD
4854
{{- include "codefresh.mongodb-root-password-env-var-value" . | indent 12 }}
55+
- name: MONGODB_ROOT_OPTIONS
56+
value: {{ .Values.seed.mongoSeedJob.mongodbRootOptions | quote }}
57+
{{- range $env, $val := .Values.seed.mongoSeedJob.env }}
58+
- name: {{ $env }}
59+
value: {{ $val | quote }}
60+
{{ end }}
61+
{{- range $env, $val := .Values.global.env }}
62+
- name: {{ $env }}
63+
value: {{ $val | quote }}
64+
{{ end }}
65+
4966
command:
5067
- "/bin/bash"
5168
- "-exc"
@@ -64,15 +81,15 @@ spec:
6481
mountPath: "/usr/share/extras/idps.json"
6582
subPath: "idps.json"
6683
{{- include (printf "%s.volumeMounts" $libTemplateName) ( dict "Values" .Values.seed.volumeMounts "context" $ ) | nindent 8 }}
67-
{{- with .Values.seed.nodeSelector }}
84+
{{- with $allNodeSelector }}
6885
nodeSelector:
6986
{{- toYaml . | nindent 8 }}
7087
{{- end }}
71-
{{- with .Values.seed.affinity }}
88+
{{- with $allAffinity }}
7289
affinity:
7390
{{- toYaml . | nindent 8 }}
7491
{{- end }}
75-
{{- with .Values.seed.tolerations }}
92+
{{- with $allToleration }}
7693
tolerations:
7794
{{- toYaml . | nindent 6 }}
7895
{{- end }}

charts/codefresh/values.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,8 @@ cf-platform-analytics-platform:
717717
redis:
718718
enabled: true
719719
nameOverride: redis-platform-analytics
720+
image:
721+
repository: bitnamilegacy/redis
720722
resources:
721723
requests:
722724
cpu: 100m
@@ -1149,6 +1151,8 @@ redis:
11491151
requests:
11501152
cpu: 200m
11511153
memory: 256Mi
1154+
image:
1155+
repository: bitnamilegacy/redis
11521156

11531157
# -- redis-ha
11541158
## Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml
@@ -1305,7 +1309,7 @@ argo-hub-platform:
13051309
container:
13061310
image:
13071311
registry: us-docker.pkg.dev/codefresh-enterprise/gcr.io
1308-
repository: codefresh-io/argo-hub-platform
1312+
repository: codefresh/argo-hub-platform
13091313
imagePullSecrets:
13101314
- '{{ .Release.Name }}-registry'
13111315
resources:

0 commit comments

Comments
 (0)