Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 118 additions & 0 deletions charts/codefresh/.ci/values/defaults.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
seed-e2e:
enabled: true

global:
appUrl: "" # placeholder
imagePullSecrets:
- codefresh-registry
- dockerhub-creds

cfapi:
rbac:
namespaced: false
hpa:
enabled: true
resources:
requests:
cpu: 300m
memory: 1024Mi
container:
env:
DEFAULT_SYSTEM_TYPE: CLASSIC

ingress:
enabled: true
ingressClassName: nginx
tls:
enabled: false

ingress-nginx:
enabled: false

argo-platform:
enabled: true

analytics-reporter:
hpa:
enabled: true

api-events:
hpa:
enabled: true

api-graphql:
hpa:
enabled: true
resources:
requests:
cpu: 300m
memory: 1024Mi

cron-executor:
hpa:
enabled: true

event-handler:
hpa:
enabled: true
resources:
requests:
cpu: 300m
memory: 1024Mi

ui:
hpa:
enabled: true

audit:
hpa:
enabled: true

abac:
hpa:
enabled: true

promotion-orchestrator:
hpa:
enabled: true

mongodb:
migration:
enabled: false
image:
repository: bitnamilegacy/mongodb
nodeSelector:
kubernetes.io/arch: amd64

consul:
image:
repository: bitnamilegacy/consul

nats:
image:
repository: bitnamilegacy/nats

rabbitmq:
image:
repository: bitnamilegacy/rabbitmq

redis:
image:
repository: bitnamilegacy/redis

cf-platform-analytics-platform:
redis:
image:
repository: bitnamilegacy/redis

hooks:
mongodb:
nodeSelector:
kubernetes.io/arch: amd64
rabbitmq:
nodeSelector:
kubernetes.io/arch: amd64

seed:
nodeSelector:
kubernetes.io/arch: amd64
4 changes: 4 additions & 0 deletions charts/codefresh/.ci/values/mtls-mongodb-redis.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
seed:
mongoSeedJob:
mongodbRootURI: mongodb://root:XT9nmM8dZDZ@cf-mongodb:27017/?authSource=admin
mongodbRootOptions: authSource=admin
mongodbRootPassword: XT9nmM8dZDZ

global:
appUrl: "" # placeholder for ${CF_APP_HOST}
Expand Down Expand Up @@ -106,6 +108,8 @@ mongodb:
caCert: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURGVENDQWYyZ0F3SUJBZ0lRZWVySXdOWkNpdyt1alRPdHZ2TEZLREFOQmdrcWhraUc5dzBCQVFzRkFEQVYKTVJNd0VRWURWUVFERXdwdGVVMXZibWR2TFdOaE1CNFhEVEl5TVRFd01qRTRNRFl6TWxvWERUTXlNVEF6TURFNApNRFl6TWxvd0ZURVRNQkVHQTFVRUF4TUtiWGxOYjI1bmJ5MWpZVENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFECmdnRVBBRENDQVFvQ2dnRUJBTGxpV3dIVDQ5OWE0MzgrUWZjcExTNThVT2FsV3ArVXhkWVYwQjZkVTlFejlQSW4KTncydXZqNWtjN3RtU08xUk5ReEJRVjZpOHNBWHdQcTM1WlZYdTQ2OHhURkdHMXZBTWhrTkQ1OTJWd3JFNElCSgpTMm9XNEV6UWJPR3Fsd2ZBanNMZ1VlRjdBbHRuUEVNMjBSQ3hpMzhPNGY0VHZNZHpQamhIa2NNU2NMaHNhYjRlCjYrbVA0MFJBcEdLc2hwV2YwbnoyMXErWU83Zm4wNjVYd3dvUVBvL1BZa0FLdWNHZk1xRjltYXRCYWdUMlVwT0cKSFlRa2pzRW1zSmxEdkhsV1RBdzU2eFl4UU9UbUVWU2hkYzlKRDNmWEZEVkd6L1NVYkZXQTVualBLL0QvbXdpawppM0RaL0h6SUVEbXBJUElxRERsTGdIL3F6b3Jlb0NKMjB1YnlCb1VDQXdFQUFhTmhNRjh3RGdZRFZSMFBBUUgvCkJBUURBZ0trTUIwR0ExVWRKUVFXTUJRR0NDc0dBUVVGQndNQkJnZ3JCZ0VGQlFjREFqQVBCZ05WSFJNQkFmOEUKQlRBREFRSC9NQjBHQTFVZERnUVdCQlFXTWg5RDRiVkljRWQ2dVBOZ1RqWGpMWUpoSmpBTkJna3Foa2lHOXcwQgpBUXNGQUFPQ0FRRUFSUTBaV3F0dUlLWHNHTTJ4TW1Za0VJTHprckJySktiWXhIOFlCUEJFTjZZT09la0o2Q1FhCjQzZitmaHJlQ2o4NFdwSzdwckNEcjJYTmlHNHJlYjBrU2dYdmpyZUVBTzU0Q1FzelJwR0xUVjROMTBjTDdHUVoKaXd6OElGMXppTld4WXVXK29aSFRBQ2NMRkJkUnFFZWNSWUJXTU0vaDhZcldoWTRIaXlIMHp4UkRsOGNpU2ZOMApoa2lURzZQd0V0S29ZRWUwZ21OWXhkWFNzZ2FMZFlUMjNiMGJsMlB3OUdZdkJlWmFpZlZTbllDYmhmTDNPVkQxCjV6YnBXNHhmMEJyM0VGbStrUHh0SGxVR2FsUXdFb3NSVy9kWEpFWFVQTHNGb2xPRDRiR0xvblE4Z2VHcFVYVzQKR3prV0g5QTFXUlE4bWIxd0ZDTkZNVjgvUWxKams3MEJFUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="
caKey: "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBdVdKYkFkUGozMXJqZno1Qjl5a3RMbnhRNXFWYW41VEYxaFhRSHAxVDBUUDA4aWMzCkRhNitQbVJ6dTJaSTdWRTFERUZCWHFMeXdCZkErcmZsbFZlN2pyekZNVVliVzhBeUdRMFBuM1pYQ3NUZ2dFbEwKYWhiZ1ROQnM0YXFYQjhDT3d1QlI0WHNDVzJjOFF6YlJFTEdMZnc3aC9oTzh4M00rT0VlUnd4Snd1R3hwdmg3cgo2WS9qUkVDa1lxeUdsWi9TZlBiV3I1Zzd0K2ZUcmxmRENoQStqODlpUUFxNXdaOHlvWDJacTBGcUJQWlNrNFlkCmhDU093U2F3bVVPOGVWWk1ERG5yRmpGQTVPWVJWS0YxejBrUGQ5Y1VOVWJQOUpSc1ZZRG1lTThyOFArYkNLU0wKY05uOGZNZ1FPYWtnOGlvTU9VdUFmK3JPaXQ2Z0luYlM1dklHaFFJREFRQUJBb0lCQUNIQ3JxNHJoMkVpclRGOApCZ2xiMzFXSzREVFF3aXN6cmIrcUkwZWdBU2FsSHFPR3pyallMTjh4N2YyZnlBSW4rdEFyaGhzVTg3NVYxUmdUCnEyVENJRzhESTZvd2lVVHhRRzVkZVkzaHdFSSt6bCt1ZVdSdG5CV0JFNE1aVFAzbGJGcEMvY1poWDNHRDRHNmgKS2Z1dlNhY3U3NnNVcnhsbmZGcEZkbDhmR1pZTUlOOUNZWHArWWVJZzRuYW5ZSFJsbk1LM05QSjIzZUVHdkpjeQpLdUZWNndIUzFlWmg1M0J0aWRlY3czcmFzZFhJWmMzdFJidlFid3lDbjZ5dVlING0vUXJzMVFUckp2dzdyWU1sCkxyZGxlZm5uWk9XNFNVc3dINkVCWmF3RC9FTFc4eFNORVhudUkzUFp0di9oRVVZd3RKOVdMbk0rRitzc21ldm8KaHVGMUI5VUNnWUVBMFBHSmc2U3N6dHlKNkhyM0tTaEhyN3h5eVVPOVJTK0N3LzBSV2cranJ3SGFlRGRIalpvKwpaYXhxWVdoRUR0aUZieWpJdWR2MFF1aUZhMHVObDUvMGl3YXR2Tm81RitNZWV3WGt1T0YraWE3RFdFODk0a2ZECkVqYXJYWUk3ZkpnTkdxVmthWUw1cGdGcmxpUDhkZDFkK0VlTWV4dmJadTdwYUZzaXBaZWs1NE1DZ1lFQTR5S0cKdzAyMHJTTGRwdlYyQmE2WG4zbFRXUW0wMFlOaVFuY0YrVjJXNm95RjREK2liRUppTUdUZzRESzZLVllNVElpNQpmaVV4WHlib0Fkd1hvTlpqMmhPWmhmMVZSa3g1WGIrOVorbDV3ZFlBMGR4RmV1ajBDakpmd3p1UTNuOUxZOWxlCnJSSi91SklkbHhKWkx2Z0RLZzdRZ2NuNkJCN2Y1Ujlwa1JKaTgxY0NnWUJYZ2xITnlOSjNjUFp4WDg3VWRnSlEKSCtVVFZrT1hEbWIrSHFkOXlMOE5OUUdEQitQMzhubmZxMjZDaldDenR3dHJtdkUycG1DUEJVT2J4SER3NkJWTApoT2lQQi9hUmdwWHBnSFppMkU1ZTY4cjAyWHRab2lTWkpEeHhWWElFcE1vWU50enZNK1BMR3gwc0xMWTN4eGJzClBVc2c1SEhua25nL05LdzJIbVQ2Y1FLQmdEaW9lQzFueU5ZWGlHc0pkL05hNWYrbDZDQ2h4elVzTE9xZmZpSUMKTW84M2xuMmw0Z0pYWE43dGl4cmlESVliTE40NmpPcm1wRFkwSWxPMGIwQnp1bHkvM3VBSm5hZjNrNTdMSVpnMgpLV1VzMk8rQW51UldEK29yUHJBWXY3NkF5bkdSMjRnWXdUdHRWMnhENjNOSDhxSWZKK3Y0VWlHTkFoVEpqUy9mCkFrZnBBb0dBQ0pRS0lOU0hZOWN2RGZseWNWNmRCcndGS0hRb3oyZGg5Z0EvSjBGazYyc0VrNDY1SUtINm96VDQKQTlSZi8yMHBLZG40dmRnTktJQ3R1cUNKN1JIMC82bVRZWXUwSEJTWHo1elZIdWczTHpFbGxOdVB4MnRhc0x0MgpjdElsVkVrdk96L1hCa3BMVUE2TDlaR01Ha2tyeUJoNEdXd2FCajBHeldUQ2JMUGZ3N3c9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0t"
mode: allowTLS
image:
repository: bitnamilegacy/nginx

redis:
tls:
Expand Down
8 changes: 4 additions & 4 deletions charts/codefresh/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: Helm Chart for Codefresh On-Prem
name: codefresh
version: 2.6.14
version: 2.6.15
keywords:
- codefresh
home: https://codefresh.io/
Expand All @@ -17,9 +17,9 @@ annotations:
artifacthub.io/alternativeName: "codefresh-onprem"
artifacthub.io/containsSecurityUpdates: "false"
# supported kinds are added, changed, deprecated, removed, fixed and security.
# artifacthub.io/changes: |
# - kind: fixed
# description: "Fixed an issue with incorrect Github Enterprise branch list endpoint."
artifacthub.io/changes: |
- kind: fixed
description: "Fixed an issue with incorrect Github Enterprise branch list endpoint."
dependencies:
- name: cf-common
repository: oci://quay.io/codefresh/charts
Expand Down
47 changes: 33 additions & 14 deletions charts/codefresh/files/mongoSeedJobScript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ COMMENT
# set -eou pipefail

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

MONGODB_DATABASES=(
"archive"
Expand All @@ -37,7 +38,7 @@ disableMongoTelemetry() {

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

echo -e "MongoDB status:\n$status"
if $(echo $status | grep 'ok: 1' -q); then
Expand All @@ -54,12 +55,22 @@ parseMongoURI() {
local parameters="$(echo $1 | grep '?' | cut -d '?' -f2)"; if [[ -n $parameters ]]; then parameters="?${parameters}"; fi
local url="$(echo ${1/$proto/})"
local userpass="$(echo $url | grep @ | cut -d@ -f1)"
local hostport="$(echo $url | sed s/$userpass// | sed "s/\/\?$parameters//" | sed -re "s/\/\?|@//g" | sed 's/\/$//')"
if [[ -z $userpass ]]; then
local hostport="$(echo $url | sed "s/\/\?$parameters//" | sed -re "s/\/\?|@//g" | sed 's/\/$//')"
MONGO_URI="$proto$hostport/${MONGODB_DATABASE}$parameters"
else
local hostport="$(echo $url | sed s/$userpass// | sed "s/\/\?$parameters//" | sed -re "s/\/\?|@//g" | sed 's/\/$//')"
MONGODB_PASSWORD="$(echo $userpass | grep : | cut -d: -f2)"
MONGODB_USER="$(echo $userpass | grep : | cut -d: -f1)"
MONGO_URI="$proto$userpass@$hostport/${MONGODB_DATABASE}$parameters"
fi

if [[ -z $MONGODB_ROOT_OPTIONS ]]; then
MONGODB_ROOT_URI="$proto${MONGODB_ROOT_USER}:${MONGODB_ROOT_PASSWORD}@$hostport/admin$parameters"
else
MONGODB_ROOT_URI="$proto${MONGODB_ROOT_USER}:${MONGODB_ROOT_PASSWORD}@$hostport/admin?${MONGODB_ROOT_OPTIONS}"
fi

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

getMongoVersion() {
Expand All @@ -68,6 +79,14 @@ getMongoVersion() {

parseMongoURI $MONGO_URI

if [[ -s ${MTLS_CERT_PATH} ]]; then
MONGO_URI_EXTRA_PARAMS="--tls --tlsCertificateKeyFile ${MTLS_CERT_PATH} --tlsAllowInvalidHostnames --tlsAllowInvalidCertificates"
MONGOIMPORT_EXTRA_PARAMS="--ssl --sslPEMKeyFile ${MTLS_CERT_PATH} --sslAllowInvalidHostnames --sslAllowInvalidCertificates"
else
MONGO_URI_EXTRA_PARAMS=""
MONGOIMPORT_EXTRA_PARAMS=""
fi

disableMongoTelemetry

waitForMongoDB
Expand All @@ -76,15 +95,15 @@ getMongoVersion

for MONGODB_DATABASE in ${MONGODB_DATABASES[@]}; do
waitForMongoDB
mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"${MONGODB_DATABASE}\").createUser({user: \"${MONGODB_USER}\", pwd: \"${MONGODB_PASSWORD}\", roles: [\"readWrite\"]})" 2>&1 || true
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
waitForMongoDB
mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"${MONGODB_DATABASE}\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true
mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\"${MONGODB_DATABASE}\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true
done

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

mongoimport --uri ${MONGO_URI} --collection idps --type json --legacy --file ${ASSETS_PATH}idps.json
mongoimport --uri ${MONGO_URI} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts.json
mongoimport --uri ${MONGO_URI} --collection users --type json --legacy --file ${ASSETS_PATH}users.json
mongoimport --uri ${MONGO_URI} ${MONGOIMPORT_EXTRA_PARAMS} --collection idps --type json --legacy --file ${ASSETS_PATH}idps.json
mongoimport --uri ${MONGO_URI} ${MONGOIMPORT_EXTRA_PARAMS} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts.json
mongoimport --uri ${MONGO_URI} ${MONGOIMPORT_EXTRA_PARAMS} --collection users --type json --legacy --file ${ASSETS_PATH}users.json
4 changes: 3 additions & 1 deletion charts/codefresh/templates/_env_var_secret_ref.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ MONGO_SEED_URI env var value
{{- /*
Check for legacy global.mongoURI
*/}}
{{- if .Values.global.mongoURI }}
{{- if .Values.seed.mongoSeedJob.mongodbRootURI }}
value: "$(MONGO_ROOT_URI)"
{{- else if .Values.global.mongoURI }}
value: "$(MONGO_URI)"
{{- /*
New secret implementation
Expand Down
2 changes: 1 addition & 1 deletion charts/codefresh/templates/secrets/regsecret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ metadata:
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: {{ include "codefresh.imagePullSecret" . }}
{{- end }}
{{- end }}
3 changes: 2 additions & 1 deletion charts/codefresh/templates/secrets/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ data:
# legacy MONGODB_* secrets
MONGODB_ROOT_USER: {{ coalesce .Values.global.mongodbRootUser .Values.seed.mongoSeedJob.mongodbRootUser | b64enc }}
MONGODB_ROOT_PASSWORD: {{ urlquery (coalesce .Values.global.mongodbRootPassword .Values.seed.mongoSeedJob.mongodbRootPassword) | b64enc }}
MONGO_URI: {{ .Values.global.mongoURI | default "empty" | b64enc}}
MONGO_URI: {{ .Values.global.mongoURI | default "empty" | b64enc }}
MONGO_ROOT_URI: {{ coalesce .Values.seed.mongoSeedJob.mongodbRootURI | default "empty" | b64enc }}
MONGO_URI_RE_MANAGER: {{ include (printf "%s.classic.calculateMongoUri" $libTemplateName) (dict "dbName" "runtime-environment-manager" "mongoURI" .Values.global.mongoURI) | default "empty" | b64enc }}
MONGODB_RE_DATABASE: {{ printf "%s" "runtime-environment-manager" | b64enc }}

Expand Down
31 changes: 24 additions & 7 deletions charts/codefresh/templates/seed/mongo-seed-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
{{ $context := deepCopy .Values.seed }}
---
{{- if and .Values.seed.enabled (or .Values.global.seedJobs .Values.seed.mongoSeedJob.enabled) }}
{{- $tolerations := .Values.seed.tolerations | default list }}
{{- $globalTolerations := .Values.global.tolerations | default list }}
{{- $allToleration := concat $globalTolerations $tolerations }}
{{- $affinity := .Values.seed.affinity | default dict }}
{{- $globalAffinity := .Values.global.affinity | default dict }}
{{- $allAffinity := mergeOverwrite $globalAffinity $affinity }}
{{- $nodeSelector := .Values.seed.nodeSelector | default dict }}
{{- $globalNodeSelector := .Values.global.nodeSelector | default dict }}
{{- $allNodeSelector := mergeOverwrite $globalNodeSelector $nodeSelector }}
apiVersion: batch/v1
kind: Job
metadata:
Expand All @@ -21,10 +30,7 @@ spec:
labels:
{{ include "codefresh.labels" . | nindent 8 }}
spec:
{{- if .Values.global.imageRegistry }}
imagePullSecrets:
- name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}-registry"
{{- end }}
{{- include (printf "%s.image.pullSecrets" $libTemplateName ) . | nindent 6 }}
securityContext:
{{- toYaml .Values.seed.podSecurityContext | nindent 8 }}
containers:
Expand All @@ -46,6 +52,17 @@ spec:
{{- include "codefresh.mongodb-root-user-env-var-value" . | indent 12 }}
- name: MONGODB_ROOT_PASSWORD
{{- include "codefresh.mongodb-root-password-env-var-value" . | indent 12 }}
- name: MONGODB_ROOT_OPTIONS
value: {{ .Values.seed.mongoSeedJob.mongodbRootOptions | quote }}
{{- range $env, $val := .Values.seed.mongoSeedJob.env }}
- name: {{ $env }}
value: {{ $val | quote }}
{{ end }}
{{- range $env, $val := .Values.global.env }}
- name: {{ $env }}
value: {{ $val | quote }}
{{ end }}

command:
- "/bin/bash"
- "-exc"
Expand All @@ -64,15 +81,15 @@ spec:
mountPath: "/usr/share/extras/idps.json"
subPath: "idps.json"
{{- include (printf "%s.volumeMounts" $libTemplateName) ( dict "Values" .Values.seed.volumeMounts "context" $ ) | nindent 8 }}
{{- with .Values.seed.nodeSelector }}
{{- with $allNodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.seed.affinity }}
{{- with $allAffinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.seed.tolerations }}
{{- with $allToleration }}
tolerations:
{{- toYaml . | nindent 6 }}
{{- end }}
Expand Down
6 changes: 5 additions & 1 deletion charts/codefresh/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,8 @@ cf-platform-analytics-platform:
redis:
enabled: true
nameOverride: redis-platform-analytics
image:
repository: bitnamilegacy/redis
resources:
requests:
cpu: 100m
Expand Down Expand Up @@ -1149,6 +1151,8 @@ redis:
requests:
cpu: 200m
memory: 256Mi
image:
repository: bitnamilegacy/redis

# -- redis-ha
## Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml
Expand Down Expand Up @@ -1305,7 +1309,7 @@ argo-hub-platform:
container:
image:
registry: us-docker.pkg.dev/codefresh-enterprise/gcr.io
repository: codefresh-io/argo-hub-platform
repository: codefresh/argo-hub-platform
imagePullSecrets:
- '{{ .Release.Name }}-registry'
resources:
Expand Down