From 91cdaa07fee2ef6b26cc4537bc2c509f7a830af2 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 24 Sep 2025 11:00:50 +0300 Subject: [PATCH 1/3] fix: mongoimport codefresh-inc account for dev chart --- charts/codefresh/files/mongoSeedJobScript.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/codefresh/files/mongoSeedJobScript.sh b/charts/codefresh/files/mongoSeedJobScript.sh index 6762bad5c..84e325002 100644 --- a/charts/codefresh/files/mongoSeedJobScript.sh +++ b/charts/codefresh/files/mongoSeedJobScript.sh @@ -125,6 +125,7 @@ mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\" mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\"codefresh\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true if [[ $DEVELOPMENT_CHART == "true" ]]; then + mongoimport --uri ${MONGO_URI} ${MONGOIMPORT_EXTRA_PARAMS} --collection idps --type json --legacy --file ${ASSETS_PATH}accounts-dev.json setSystemAdmin setPacks fi From 7ced641d39f89dc26e576b4f0077fd4562cce86e Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 24 Sep 2025 13:27:19 +0300 Subject: [PATCH 2/3] fix: mongoimport codefresh-inc account for dev chart --- charts/codefresh/files/mongoSeedJobScript.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/codefresh/files/mongoSeedJobScript.sh b/charts/codefresh/files/mongoSeedJobScript.sh index 84e325002..b1a013b94 100644 --- a/charts/codefresh/files/mongoSeedJobScript.sh +++ b/charts/codefresh/files/mongoSeedJobScript.sh @@ -125,7 +125,7 @@ mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\" mongosh ${MONGODB_ROOT_URI} ${MONGO_URI_EXTRA_PARAMS} --eval "db.getSiblingDB(\"codefresh\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true if [[ $DEVELOPMENT_CHART == "true" ]]; then - mongoimport --uri ${MONGO_URI} ${MONGOIMPORT_EXTRA_PARAMS} --collection idps --type json --legacy --file ${ASSETS_PATH}accounts-dev.json + mongoimport --uri ${MONGO_URI} ${MONGOIMPORT_EXTRA_PARAMS} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts-dev.json setSystemAdmin setPacks fi From 8d8a52cdab46120cd2624b9806a51a28e6e9f8b4 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 25 Sep 2025 09:41:03 +0300 Subject: [PATCH 3/3] fix: mongoimport codefresh-inc account for dev chart --- charts/codefresh/Chart.yaml | 4 ++++ .../codefresh/files/assets/accounts-dev.json | 10 +++++----- charts/codefresh/values.yaml | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/charts/codefresh/Chart.yaml b/charts/codefresh/Chart.yaml index e428e3e1f..94ef53f8b 100644 --- a/charts/codefresh/Chart.yaml +++ b/charts/codefresh/Chart.yaml @@ -256,3 +256,7 @@ dependencies: version: "*" repository: oci://quay.io/codefresh/charts condition: salesforce-reporter.enabled + - name: nats + version: 9.0.22 + repository: https://charts.bitnami.com/bitnami + condition: nats.enabled diff --git a/charts/codefresh/files/assets/accounts-dev.json b/charts/codefresh/files/assets/accounts-dev.json index 06ac6be00..090162ed7 100644 --- a/charts/codefresh/files/assets/accounts-dev.json +++ b/charts/codefresh/files/assets/accounts-dev.json @@ -14,12 +14,12 @@ "performedBy" : "System" }, "allowedDomains" : [ - + ], "enabledAllowedDomains" : true, "admins" : [ ObjectId("59009221c102763beda7cf04") - ], + ], "environment" : NumberInt(1), "runtimeEnvironment" : "codefresh", "integrations" : { @@ -48,7 +48,7 @@ "exist" : false }, "registries" : [ - + ] }, "badgeToken" : "eyJhbGciOiJIUzI1NiJ9.NTkwMDkxMTdjMTAyNzYzYmVkYTdjZTcx.B0HOUL6HlpTRNr_e95pVucSRMRzP2cobe5kIoMtrDSc", @@ -165,7 +165,7 @@ "dedicatedInfrastructure" : false, "canUsePrivateRepos" : true, "features" : { - "launchDarklyManagement" : true + "launchDarklyManagement" : false }, "supportPlan" : "PLATINUM", "increasedAttention" : false, @@ -258,5 +258,5 @@ }, "localUserPasswordIDPEnabled" : true, "segment" : "ENTERPRISE", - "__v" : NumberInt(0) + "__v" : NumberInt(0) } diff --git a/charts/codefresh/values.yaml b/charts/codefresh/values.yaml index 367dd7e9b..48a00b035 100644 --- a/charts/codefresh/values.yaml +++ b/charts/codefresh/values.yaml @@ -365,6 +365,10 @@ global: tlsSignService: cfsign # -- Default tls-sign service port. tlsSignPort: 4999 + # -- Default nats service name. + natsService: nats + # -- Default nats service port. + natsPort: 4222 # -- Default Consul service name. consulService: consul-headless # -- Default Consul service port. @@ -1951,3 +1955,17 @@ segment-reporter: salesforce-reporter: enabled: false + +# -- nats +# @default -- See below +# Ref: https://github.com/bitnami/charts/blob/main/bitnami/nats/values.yaml +nats: + enabled: true + image: + repository: bitnamilegacy/nats + replicaCount: 1 + auth: + enabled: false + cluster: + auth: + enabled: false