feat: update release lifecycle (#96)

Author: mikhail-klimko

README.md

@@ -0,0 +1,44 @@
+# Release Process
+
+## Releasing a new version
+
+For a **MAJOR** or **MINOR** release:
+
+- Checkout from `main` branch
+```shell
+git checkout -b onprem-X.Y main
+```
+- Merge latest `release-X.Y` into the new branch
+```shell
+git merge --no-ff release-X.Y
+```
+- Resolve any merge conflicts.
+- In `Chart.yaml`:
+    - Update `.version` and `.appVersion`
+    - For Codefresh dependencies (i.e. with `repository: oci://quay.io/codefresh/charts`) update version to use latest (i.e. `version: *`)
+    - Update `artifacthub.io/changes` annotation
+- Update `values.yaml`, `templates/**`, etc with required changes
+- Run `helm dep update` to update dependencies
+- Run `./charts/codefresh/.ci/runtime-images.sh`
+- Run `./scripts/helm-docs.sh`
+- Commit changes and open the PR against the `main` branch
+- Comment `/test` to trigger CI pipeline
+- Merge the PR after successful CI build
+- After merging the PR the corresponding `release-X.Y` branch will be created. For the next patches, `release-X.Y` branch must be used as BASE branch!
+
+For a **PATCH** release:
+
+- Checkout from the corresponding `release-<MAJOR>.<MINOR>` branch
+```shell
+git checkout -b onprem-X.Y.Z release-X.Y
+```
+- Update `.version` in Chart.yaml
+- Update `artifacthub.io/changes` annotation in Chart.yaml
+- *optional* Update `dependencies` in Chart.yaml
+- *optional* Update `values.yaml`, `templates/**`, etc with required changes
+- Run `helm dep update` to update dependencies
+- *optional* Run `./charts/codefresh/.ci/runtime-images.sh`
+- Run `./scripts/helm-docs.sh`
+- Commit changes and open the PR against the corresponding `release-<MAJOR>.<MINOR>` branch
+- Comment `/test` to trigger CI pipeline
+- Merge the PR after successful CI build

charts/codefresh/README.md.gotmpl renamed to README.md.gotmpl

@@ -16,6 +16,11 @@ waitForMongoDB() {
     done
 }
 
+getMongoDBVersion() {
+    local version=$(mongosh ${MONGODB_ROOT_URI} --eval "db.version()" 2>&1)
+    echo $version
+}
+
 parseMongoURI() {
     local proto="$(echo $1 | grep :// | sed -e's,^\(.*://\).*,\1,g')"
     local parameters="$(echo $1 | grep '?' | cut -d '?' -f2)"; if [[ -n $parameters ]]; then parameters="?${parameters}"; fi
@@ -33,4 +38,10 @@ parseMongoURI $MONGO_URI
 
 waitForMongoDB
 
-mongosh ${MONGODB_ROOT_URI} --eval "db.adminCommand( { setFeatureCompatibilityVersion: \"$MONGODB_COMPAT_VERSION\" } )"
+MONGO_VERSION=$(getMongoDBVersion)
+
+if [[ $MONGO_VERSION == 7* ]]; then
+    mongosh ${MONGODB_ROOT_URI} --eval "db.adminCommand( { setFeatureCompatibilityVersion: \"$MONGODB_COMPAT_VERSION\", confirm: true } )"
+else
+    mongosh ${MONGODB_ROOT_URI} --eval "db.adminCommand( { setFeatureCompatibilityVersion: \"$MONGODB_COMPAT_VERSION\" } )"
+fi

RELEASE.md

@@ -1,6 +1,14 @@
 #!/bin/bash
 
-set -xeuo pipefail
+DEBUG="${DEBUG:-false}"
+
+
+set -euo pipefail
+
+if [[ $DEBUG == "true" ]]; then
+    set -xeuo pipefail
+    echo "Running in debug mode"
+fi
 
 POSTGRES_DATABASES=(
     "codefresh"
@@ -20,7 +28,9 @@ POSTGRES_SEED_USER="${POSTGRES_SEED_USER:-$POSTGRES_USER}"
 POSTGRES_SEED_PASSWORD="${POSTGRES_SEED_PASSWORD:-$POSTGRES_PASSWORD}"
 
 function createDB() {
-    psql -tc "SELECT 1 FROM pg_database WHERE datname = '${1}'" | grep -q 1 || psql -c "CREATE DATABASE ${1}"
+    local db=$1
+    echo "Creating ${db} database"
+    psql -c "CREATE DATABASE ${db}" 2>&1 || true
 }
 
 function createUser() {
@@ -29,7 +39,9 @@ function createUser() {
 }
 
 function grantPrivileges() {
-    psql -c "GRANT ALL ON DATABASE ${1} TO ${POSTGRES_USER}"
+    local db=$1
+    echo "Granting privileges on $db to ${POSTGRES_USER}"
+    psql -c "GRANT ALL ON DATABASE ${db} TO ${POSTGRES_USER}"
 }
 
 function runSeed() {
@@ -38,6 +50,7 @@ function runSeed() {
     export PGPASSWORD=${POSTGRES_SEED_PASSWORD}
     export PGHOST=${POSTGRES_HOSTNAME}
     export PGPORT=${POSTGRES_PORT}
+    export PGDATABASE=postgres # Use the default postgres database
 
     if [[ "${POSTGRES_SEED_USER}" != "${POSTGRES_USER}" ]]; then
         createUser
@@ -51,4 +64,4 @@ function runSeed() {
     done
 }
 
-runSeed
+runSeed

charts/codefresh-gitops/README.md

@@ -1,7 +1,7 @@
 #!/bin/bash
 ## Reference: https://github.com/norwoodj/helm-docs
 set -eux
-REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 echo "$REPO_ROOT"
 
 echo "Running Helm-Docs"
@@ -10,9 +10,9 @@ docker run \
     -u $(id -u) \
     --rm \
     --entrypoint /bin/sh \
-    jnorwood/helm-docs:v1.11.0 \
+    jnorwood/helm-docs:v1.14.2 \
     -c \
     helm-docs \
-    --chart-search-root=codefresh \
-    --template-files=./_templates.gotmpl \
-    --template-files=README.md.gotmpl \
+    --chart-search-root=charts/codefresh \
+    --template-files=README.md.gotmpl \
+    --output-file=README.md

charts/codefresh-gitops/files/hooks/mongoSetCompatibilityVersion.sh

@@ -22,7 +22,7 @@ cfapi:
 
 ingress:
   enabled: true
-  ingressClassName: nginx-internal
+  ingressClassName: nginx
   tls:
     enabled: false
 
@@ -75,3 +75,28 @@ argo-platform:
   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
+
+hooks:
+  mongodb:
+    nodeSelector:
+      kubernetes.io/arch: amd64

charts/codefresh-gitops/files/seed/postgresSeedJobScript.sh

@@ -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}
@@ -49,7 +51,7 @@ global:
 
 ingress:
   enabled: true
-  ingressClassName: nginx-internal
+  ingressClassName: nginx
   tls:
     enabled: false
 
@@ -86,9 +88,9 @@ mongodb:
         mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB('${MONGODB_DATABASE}').createCollection('test')"
       done
 
-      mongoimport --uri ${MONGODB_ROOT_URI} --db codefresh --collection idps --type json --legacy --file /usr/share/extras/idps.json
-      mongoimport --uri ${MONGODB_ROOT_URI} --db codefresh --collection accounts --type json --legacy --file /usr/share/extras/accounts.json
-      mongoimport --uri ${MONGODB_ROOT_URI} --db codefresh --collection users --type json --legacy --file /usr/share/extras/users.json
+# mongoimport --uri ${MONGODB_ROOT_URI} --db codefresh --collection idps --type json --legacy --file /usr/share/extras/idps.json
+# mongoimport --uri ${MONGODB_ROOT_URI} --db codefresh --collection accounts --type json --legacy --file /usr/share/extras/accounts.json
+# mongoimport --uri ${MONGODB_ROOT_URI} --db codefresh --collection users --type json --legacy --file /usr/share/extras/users.json
 
   extraVolumeMounts:
     - name: extras
@@ -106,6 +108,8 @@ mongodb:
     caCert: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURGVENDQWYyZ0F3SUJBZ0lRZWVySXdOWkNpdyt1alRPdHZ2TEZLREFOQmdrcWhraUc5dzBCQVFzRkFEQVYKTVJNd0VRWURWUVFERXdwdGVVMXZibWR2TFdOaE1CNFhEVEl5TVRFd01qRTRNRFl6TWxvWERUTXlNVEF6TURFNApNRFl6TWxvd0ZURVRNQkVHQTFVRUF4TUtiWGxOYjI1bmJ5MWpZVENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFECmdnRVBBRENDQVFvQ2dnRUJBTGxpV3dIVDQ5OWE0MzgrUWZjcExTNThVT2FsV3ArVXhkWVYwQjZkVTlFejlQSW4KTncydXZqNWtjN3RtU08xUk5ReEJRVjZpOHNBWHdQcTM1WlZYdTQ2OHhURkdHMXZBTWhrTkQ1OTJWd3JFNElCSgpTMm9XNEV6UWJPR3Fsd2ZBanNMZ1VlRjdBbHRuUEVNMjBSQ3hpMzhPNGY0VHZNZHpQamhIa2NNU2NMaHNhYjRlCjYrbVA0MFJBcEdLc2hwV2YwbnoyMXErWU83Zm4wNjVYd3dvUVBvL1BZa0FLdWNHZk1xRjltYXRCYWdUMlVwT0cKSFlRa2pzRW1zSmxEdkhsV1RBdzU2eFl4UU9UbUVWU2hkYzlKRDNmWEZEVkd6L1NVYkZXQTVualBLL0QvbXdpawppM0RaL0h6SUVEbXBJUElxRERsTGdIL3F6b3Jlb0NKMjB1YnlCb1VDQXdFQUFhTmhNRjh3RGdZRFZSMFBBUUgvCkJBUURBZ0trTUIwR0ExVWRKUVFXTUJRR0NDc0dBUVVGQndNQkJnZ3JCZ0VGQlFjREFqQVBCZ05WSFJNQkFmOEUKQlRBREFRSC9NQjBHQTFVZERnUVdCQlFXTWg5RDRiVkljRWQ2dVBOZ1RqWGpMWUpoSmpBTkJna3Foa2lHOXcwQgpBUXNGQUFPQ0FRRUFSUTBaV3F0dUlLWHNHTTJ4TW1Za0VJTHprckJySktiWXhIOFlCUEJFTjZZT09la0o2Q1FhCjQzZitmaHJlQ2o4NFdwSzdwckNEcjJYTmlHNHJlYjBrU2dYdmpyZUVBTzU0Q1FzelJwR0xUVjROMTBjTDdHUVoKaXd6OElGMXppTld4WXVXK29aSFRBQ2NMRkJkUnFFZWNSWUJXTU0vaDhZcldoWTRIaXlIMHp4UkRsOGNpU2ZOMApoa2lURzZQd0V0S29ZRWUwZ21OWXhkWFNzZ2FMZFlUMjNiMGJsMlB3OUdZdkJlWmFpZlZTbllDYmhmTDNPVkQxCjV6YnBXNHhmMEJyM0VGbStrUHh0SGxVR2FsUXdFb3NSVy9kWEpFWFVQTHNGb2xPRDRiR0xvblE4Z2VHcFVYVzQKR3prV0g5QTFXUlE4bWIxd0ZDTkZNVjgvUWxKams3MEJFUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="
     caKey: "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBdVdKYkFkUGozMXJqZno1Qjl5a3RMbnhRNXFWYW41VEYxaFhRSHAxVDBUUDA4aWMzCkRhNitQbVJ6dTJaSTdWRTFERUZCWHFMeXdCZkErcmZsbFZlN2pyekZNVVliVzhBeUdRMFBuM1pYQ3NUZ2dFbEwKYWhiZ1ROQnM0YXFYQjhDT3d1QlI0WHNDVzJjOFF6YlJFTEdMZnc3aC9oTzh4M00rT0VlUnd4Snd1R3hwdmg3cgo2WS9qUkVDa1lxeUdsWi9TZlBiV3I1Zzd0K2ZUcmxmRENoQStqODlpUUFxNXdaOHlvWDJacTBGcUJQWlNrNFlkCmhDU093U2F3bVVPOGVWWk1ERG5yRmpGQTVPWVJWS0YxejBrUGQ5Y1VOVWJQOUpSc1ZZRG1lTThyOFArYkNLU0wKY05uOGZNZ1FPYWtnOGlvTU9VdUFmK3JPaXQ2Z0luYlM1dklHaFFJREFRQUJBb0lCQUNIQ3JxNHJoMkVpclRGOApCZ2xiMzFXSzREVFF3aXN6cmIrcUkwZWdBU2FsSHFPR3pyallMTjh4N2YyZnlBSW4rdEFyaGhzVTg3NVYxUmdUCnEyVENJRzhESTZvd2lVVHhRRzVkZVkzaHdFSSt6bCt1ZVdSdG5CV0JFNE1aVFAzbGJGcEMvY1poWDNHRDRHNmgKS2Z1dlNhY3U3NnNVcnhsbmZGcEZkbDhmR1pZTUlOOUNZWHArWWVJZzRuYW5ZSFJsbk1LM05QSjIzZUVHdkpjeQpLdUZWNndIUzFlWmg1M0J0aWRlY3czcmFzZFhJWmMzdFJidlFid3lDbjZ5dVlING0vUXJzMVFUckp2dzdyWU1sCkxyZGxlZm5uWk9XNFNVc3dINkVCWmF3RC9FTFc4eFNORVhudUkzUFp0di9oRVVZd3RKOVdMbk0rRitzc21ldm8KaHVGMUI5VUNnWUVBMFBHSmc2U3N6dHlKNkhyM0tTaEhyN3h5eVVPOVJTK0N3LzBSV2cranJ3SGFlRGRIalpvKwpaYXhxWVdoRUR0aUZieWpJdWR2MFF1aUZhMHVObDUvMGl3YXR2Tm81RitNZWV3WGt1T0YraWE3RFdFODk0a2ZECkVqYXJYWUk3ZkpnTkdxVmthWUw1cGdGcmxpUDhkZDFkK0VlTWV4dmJadTdwYUZzaXBaZWs1NE1DZ1lFQTR5S0cKdzAyMHJTTGRwdlYyQmE2WG4zbFRXUW0wMFlOaVFuY0YrVjJXNm95RjREK2liRUppTUdUZzRESzZLVllNVElpNQpmaVV4WHlib0Fkd1hvTlpqMmhPWmhmMVZSa3g1WGIrOVorbDV3ZFlBMGR4RmV1ajBDakpmd3p1UTNuOUxZOWxlCnJSSi91SklkbHhKWkx2Z0RLZzdRZ2NuNkJCN2Y1Ujlwa1JKaTgxY0NnWUJYZ2xITnlOSjNjUFp4WDg3VWRnSlEKSCtVVFZrT1hEbWIrSHFkOXlMOE5OUUdEQitQMzhubmZxMjZDaldDenR3dHJtdkUycG1DUEJVT2J4SER3NkJWTApoT2lQQi9hUmdwWHBnSFppMkU1ZTY4cjAyWHRab2lTWkpEeHhWWElFcE1vWU50enZNK1BMR3gwc0xMWTN4eGJzClBVc2c1SEhua25nL05LdzJIbVQ2Y1FLQmdEaW9lQzFueU5ZWGlHc0pkL05hNWYrbDZDQ2h4elVzTE9xZmZpSUMKTW84M2xuMmw0Z0pYWE43dGl4cmlESVliTE40NmpPcm1wRFkwSWxPMGIwQnp1bHkvM3VBSm5hZjNrNTdMSVpnMgpLV1VzMk8rQW51UldEK29yUHJBWXY3NkF5bkdSMjRnWXdUdHRWMnhENjNOSDhxSWZKK3Y0VWlHTkFoVEpqUy9mCkFrZnBBb0dBQ0pRS0lOU0hZOWN2RGZseWNWNmRCcndGS0hRb3oyZGg5Z0EvSjBGazYyc0VrNDY1SUtINm96VDQKQTlSZi8yMHBLZG40dmRnTktJQ3R1cUNKN1JIMC82bVRZWXUwSEJTWHo1elZIdWczTHpFbGxOdVB4MnRhc0x0MgpjdElsVkVrdk96L1hCa3BMVUE2TDlaR01Ha2tyeUJoNEdXd2FCajBHeldUQ2JMUGZ3N3c9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0t"
     mode: allowTLS
+    image:
+      repository: bitnamilegacy/nginx
 
 redis:
   tls: