diff --git a/README.md b/README.md index 4ec2f8b..5d7e68f 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ This repository contains orchestration files and documentation for deploying Black Duck Docker containers. -## Location of Black Duck 2023.10.0 archive: +## Location of Black Duck 2023.10.1 archive: -https://github.com/blackducksoftware/hub/archive/v2023.10.0.tar.gz +https://github.com/blackducksoftware/hub/archive/v2023.10.1.tar.gz NOTE: diff --git a/docker-swarm/bin/hub_add_replication_user.sh b/docker-swarm/bin/hub_add_replication_user.sh index 1a398ac..2003853 100755 --- a/docker-swarm/bin/hub_add_replication_user.sh +++ b/docker-swarm/bin/hub_add_replication_user.sh @@ -3,7 +3,7 @@ set -e TIMEOUT=${TIMEOUT:-10} -HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.17} HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres} function fail() { diff --git a/docker-swarm/bin/hub_create_data_dump.sh b/docker-swarm/bin/hub_create_data_dump.sh index 07028d7..72e851d 100755 --- a/docker-swarm/bin/hub_create_data_dump.sh +++ b/docker-swarm/bin/hub_create_data_dump.sh @@ -5,8 +5,8 @@ # 2. The database container has been properly initialized. HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres} -HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16} -HUB_VERSION=${HUB_VERSION:-2023.10.0} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.17} +HUB_VERSION=${HUB_VERSION:-2023.10.1} OPT_FORCE= OPT_LIVE_SYSTEM= OPT_MAX_CPU=${MAX_CPU:-1} diff --git a/docker-swarm/bin/hub_db_migrate.sh b/docker-swarm/bin/hub_db_migrate.sh index 2aa3e99..dc83a70 100755 --- a/docker-swarm/bin/hub_db_migrate.sh +++ b/docker-swarm/bin/hub_db_migrate.sh @@ -14,7 +14,7 @@ set -o errexit HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres} -HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.17} OPT_MAX_CPU=${MAX_CPU:-1} OPT_NO_DATABASE=${NO_DATABASE:-} OPT_NO_STORAGE=${NO_STORAGE:-} diff --git a/docker-swarm/bin/hub_replication_changepassword.sh b/docker-swarm/bin/hub_replication_changepassword.sh index 7dac236..52ded33 100755 --- a/docker-swarm/bin/hub_replication_changepassword.sh +++ b/docker-swarm/bin/hub_replication_changepassword.sh @@ -3,7 +3,7 @@ set -e TIMEOUT=${TIMEOUT:-10} -HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.17} HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres} function fail() { diff --git a/docker-swarm/bin/hub_reportdb_changepassword.sh b/docker-swarm/bin/hub_reportdb_changepassword.sh index 276ffb1..77e721a 100755 --- a/docker-swarm/bin/hub_reportdb_changepassword.sh +++ b/docker-swarm/bin/hub_reportdb_changepassword.sh @@ -3,7 +3,7 @@ set -e TIMEOUT=${TIMEOUT:-10} -HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.17} HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres} function fail() { diff --git a/docker-swarm/bin/system_check.sh b/docker-swarm/bin/system_check.sh index cb1ab56..b5e34dd 100755 --- a/docker-swarm/bin/system_check.sh +++ b/docker-swarm/bin/system_check.sh @@ -41,7 +41,7 @@ set -o noglob readonly NOW="$(date +"%Y%m%dT%H%M%S%z")" readonly NOW_ZULU="$(date -u +"%Y%m%dT%H%M%SZ")" -readonly HUB_VERSION="${HUB_VERSION:-2023.10.0}" +readonly HUB_VERSION="${HUB_VERSION:-2023.10.1}" readonly OUTPUT_FILE="${SYSTEM_CHECK_OUTPUT_FILE:-system_check_${NOW}.txt}" readonly PROPERTIES_FILE="${SYSTEM_CHECK_PROPERTIES_FILE:-${OUTPUT_FILE%.txt}.properties}" readonly SUMMARY_FILE="${SYSTEM_CHECK_SUMMARY_FILE:-${OUTPUT_FILE%.txt}_summary.properties}" @@ -62,9 +62,35 @@ readonly REQ_RAM_GB_PER_BDBA=2 # The first container counts double. readonly REQ_RAM_GB_REDIS_SENTINEL=3 # Additional memory required for redis sentinal mode # Required container minimum memory limits, in MB. -# The _G3 arrays are for scans-per-hour sizing +# The _G3 and _G4 arrays are for scans-per-hour sizing # The _G2 arrays are for enhanced scanning # The _G1 arrays are for legacy scanning +declare -ar REQ_CONTAINER_SIZES_G4=( + # "SERVICE=10sph 120sph 250sph 500sph 1000sph 1500sph 2000sph" + "hub_alert=2560 2560 2560 2560 2560 2560 2560" + "hub_alert_database=2560 2560 2560 2560 2560 2560 2560" + "hub_authentication=1229 2048 2048 2048 2048 2048 3072" + "hub_binaryscanner=4096 4096 4096 4096 4096 4096 4096" + "hub_bomengine=4608 5600 5600 5120 5120 5120 5120" + "hub_cfssl=260 260 260 512 1024 1024 1024" + "hub_documentation=1024 1024 1024 1024 1536 1536 1536" + "hub_jobrunner=4710 8192 8192 8192 8192 8192 8192" + "hub_logstash=1229 2428 3072 3072 4096 4096 4096" + "hub_matchengine=5120 8192 8192 8192 10240 10240 10240" + "hub_postgres=8192 16384 24576 65536 90112 106496 131072" + "hub_postgres-upgrader=4096 4096 4096 4096 4096 4096 4096" + "hub_rabbitmq=512 512 512 1024 2048 3072 3072" + "hub_redis=1024 1024 2048 4096 5120 8192 10240" + "hub_redissentienl=32 32 32 32 32 32 32" + "hub_redisslave=1024 1024 2048 4096 5120 8192 10240" + "hub_registration=1024 1331 1331 2048 3072 3072 3072" + "hub_scan=5120 10240 10240 10240 15360 15360 15360" + "hub_storage=1024 2560 3072 4096 8192 8192 10240" + "hub_uploadcache=512 512 512 1024 1536 2048 2048" + "hub_webapp=3584 4048 5120 6144 20480 20480 20480" + "hub_webserver=512 512 512 1024 2048 2048 2048" + "hub_webui=512 512 512 1024 1536 1536 1536" +) declare -ar REQ_CONTAINER_SIZES_G3=( # "SERVICE=10sph 120sph 250sph 500sph 1000sph 1500sph 2000sph" "hub_alert=2560 2560 2560 2560 2560 2560 2560" @@ -143,6 +169,21 @@ declare -ar REQ_CONTAINER_SIZES_G1=( # The values below are small, medium, and large size HUB_MAX_MEMORY or # BLACKDUCK_REDIS_MAXMEMORY settings (in MB) for each service, or the # container size when there is no application memory limit control. +declare -ar SPH_MEM_SIZES_G4=( + # "SERVICE=10sph 120sph 250sph 500sph 1000sph 1500sph 2000sph" # in MB + "hub_authentication=1106 1843 1843 1843 1844 1844 2765" + "hub_bomengine=4148 5000 5000 4608 4608 4608 4068" + "hub_documentation=922 922 922 922 1383 1383 1383" + "hub_integration=1024 1024 1024 1024 1024 1024 1024" + "hub_jobrunner=4240 7373 7373 7373 7373 7373 7373" + "hub_logstash=1106 2185 2765 2765 3687 3687 3687" + "hub_matchengine=4608 7373 7373 7373 9216 9216 9216" + "hub_redis=900 900 1844 3687 4608 7373 9216" + "hub_registration=922 1200 1200 1844 2765 2765 2765" + "hub_scan=4608 9216 9216 9216 13824 13824 13824" + "hub_storage=512 2304 2765 3687 7373 7373 9100" + "hub_webapp=3226 3608 4608 5530 18432 18432 18432" +) declare -ar SPH_MEM_SIZES_G3=( # "SERVICE=10sph 120sph 250sph 500sph 1000sph 1500sph 2000sph" # in MB "hub_authentication=1106 1475 1475 1475 1844 2765 2765" @@ -188,6 +229,13 @@ declare -ar TS_MEM_SIZES_G1=( "hub_webserver=512 2048 2048" ) +declare -ar SPH_REPLICA_COUNTS_G4=( + # "SERVICE=10sph 120sph 250sph 500sph 1000sph 1500sph 2000sph" + "hub_bomengine=1 1 1 2 7 8 10" + "hub_jobrunner=1 1 2 3 5 6 8" + "hub_matchengine=1 2 3 4 9 12 15" + "hub_scan=1 1 2 4 10 13 16" +) declare -ar SPH_REPLICA_COUNTS_G3=( # "SERVICE=10sph 120sph 250sph 500sph 1000sph 1500sph 2000sph" "hub_bomengine=1 1 1 2 4 6 6" @@ -209,10 +257,15 @@ declare -ar TS_REPLICA_COUNTS_G1=( "hub_scan=1 2 3" ) +declare -ar SPH_PG_SETTINGS_G4=( + # "SERVICE=10sph 120sph 250sph 500sph 1000sph 1500sph 2000sph" + "shared_buffers=2653 5336 8016 21439 29502 34878 42974" + "effective_cache_size=3185 6404 9619 25727 35403 41854 51569" +) declare -ar SPH_PG_SETTINGS_G3=( # "SERVICE=10sph 120sph 250sph 500sph 1000sph 1500sph 2000sph" - "shared_buffers=2654 5338 8018 13377 24129 34880 45600" - "effective_cache_size=3185 6406 9622 16053 28955 41857 54720" + "shared_buffers=2653 5336 8016 21439 29502 34878 42974" + "effective_cache_size=3185 6404 9619 25727 35403 41854 51569" ) declare -ar SPH_SIZE_SCALE=("an UNDERSIZED" "10" "120" "250" "500" "1000" "1500" "2000" "2000+") @@ -280,8 +333,8 @@ readonly DOCKER_LEGACY_EDITION="legacy" readonly SCHEMA_NAME=${HUB_POSTGRES_SCHEMA:-st} -# Controls whether installation sizing estimation. -SCAN_SIZING="gen03" +# Controls installation sizing estimation. +SCAN_SIZING="gen04" # Controls a switch to turn network testing on/off for systems with no internet connectivity USE_NETWORK_TESTS="$TRUE" @@ -294,7 +347,7 @@ registration webserver documentation uploadcache redis bomengine rabbitmq matche readonly CONTAINERS_WITHOUT_CURL="nginx|postgres|postgres-upgrader|postgres-waiter|alert-database|cadvisor" # Versioned (not "1.0.x") blackducksoftware images -readonly VERSIONED_HUB_IMAGES="blackduck-authentication|blackduck-bomengine|blackduck-documentation|blackduck-jobrunner|blackduck-matchengine|blackduck-redis|blackduck-registration|blackduck-scan|blackduck-webapp|blackduck-webui" +readonly VERSIONED_HUB_IMAGES="blackduck-authentication|blackduck-bomengine|blackduck-documentation|blackduck-jobrunner|blackduck-matchengine|blackduck-redis|blackduck-registration|blackduck-scan|blackduck-storage|blackduck-webapp|blackduck-webui" readonly VERSIONED_BDBA_IMAGES="bdba-worker" readonly VERSIONED_ALERT_IMAGES="blackduck-alert" @@ -376,13 +429,21 @@ setup_sizing() { PG_SETTINGS_SCALE=() ;; gen03) - SIZING="scans-per-hour" + SIZING="pre-2023.10.1 scans-per-hour" SIZE_SCALE=("${SPH_SIZE_SCALE[@]}") REQ_CONTAINER_SIZES=("${REQ_CONTAINER_SIZES_G3[@]}") MEM_SIZE_SCALE=("${SPH_MEM_SIZES_G3[@]}") REPLICA_COUNT_SCALE=("${SPH_REPLICA_COUNTS_G3[@]}") PG_SETTINGS_SCALE=("${SPH_PG_SETTINGS_G3[@]}") ;; + gen04) + SIZING="scans-per-hour" + SIZE_SCALE=("${SPH_SIZE_SCALE[@]}") + REQ_CONTAINER_SIZES=("${REQ_CONTAINER_SIZES_G4[@]}") + MEM_SIZE_SCALE=("${SPH_MEM_SIZES_G4[@]}") + REPLICA_COUNT_SCALE=("${SPH_REPLICA_COUNTS_G4[@]}") + PG_SETTINGS_SCALE=("${SPH_PG_SETTINGS_G4[@]}") + ;; *) error_exit "** Internal error: unexpected SCAN_SIZING '$SCAN_SIZING'" ;; @@ -864,7 +925,7 @@ check_kernel_version() { [[ "$expect" =~ \| ]] && grepStyle=E || grepStyle=F if [[ -z "$expect" ]]; then readonly KERNEL_VERSION_STATUS="$WARN: Don't know what kernel version to expect for ${OS_NAME_SHORT}" - elif echo "$kernel_version" | grep -aq$grepStyle "$expect" ; then + elif echo "$kernel_version" | grep -aq"$grepStyle" "$expect" ; then readonly KERNEL_VERSION_STATUS="$PASS: Kernel version ${kernel_version}" else readonly KERNEL_VERSION_STATUS="$WARN: Kernel version ${kernel_version} is unexpected" @@ -2281,7 +2342,7 @@ get_installation_size() { # -- Size based on container memory limit -- local container_mem_steps= - if [[ "$SCAN_SIZING" == "gen03" ]]; then + if [[ "$SCAN_SIZING" == "gen03" ]] || [[ "$SCAN_SIZING" == "gen04" ]]; then # shellcheck disable=SC2155 # We don't care about the array_get exit code container_mem_steps="$(array_get "${REQ_CONTAINER_SIZES[@]}" "$hub_service")" _adjust_size_bracket "$container_memory" "$service container size limit of $container_memory MB" "$container_mem_steps" @@ -2289,7 +2350,7 @@ get_installation_size() { # -- Size based on app memory allocation -- local -i memory - if [[ "$SCAN_SIZING" == "gen03" ]]; then + if [[ "$SCAN_SIZING" == "gen03" ]] || [[ "$SCAN_SIZING" == "gen04" ]]; then memory=$app_memory; else memory=$((app_memory > 0 ? app_memory : container_memory)); @@ -2603,7 +2664,7 @@ check_container_memory() { echo "Checking container/service memory limits..." local -a results - local -i index=$(if [[ "$SCAN_SIZING" == "gen03" ]] || ! is_swarm_enabled; then echo 0; else echo 1; fi) + local -i index=$(if [[ "$SCAN_SIZING" == "gen03" ]] || [[ "$SCAN_SIZING" == "gen04" ]] || ! is_swarm_enabled; then echo 0; else echo 1; fi) while read -r service image memvar app_memory memory replicas ; do local hub_service="${service/#blackduck_/hub_}" if [[ "$hub_service" == unknown-blackduck ]]; then @@ -4855,7 +4916,8 @@ Supported Arguments: scanning is disabled. --sizing gen02 Estimate installation size assuming that enhanced scanning is enabled. - --sizing gen03 Estimate installation size in terms of scans per hour. + --sizing gen03 Estimate installation size in terms of scans per hour (pre-2023.10.1). + --sizing gen04 Estimate installation size in terms of scans per hour. --no-network Do not use network tests, assume host has no connectivity This can be useful as network tests can take a long time on a system with no connectivity. @@ -4882,6 +4944,7 @@ process_args() { gen01) ;; gen02) ;; gen03) ;; + gen04) ;; *) echo "$(basename "$0"): unknown scan sizing value '$SCAN_SIZING'" echo diff --git a/docker-swarm/blackduck-config.env b/docker-swarm/blackduck-config.env index 544c38d..99c2df4 100644 --- a/docker-swarm/blackduck-config.env +++ b/docker-swarm/blackduck-config.env @@ -24,7 +24,7 @@ BLACKDUCK_CORS_ALLOW_CREDENTIALS_PROP_NAME= # Do not change HUB_PRODUCT_NAME=BLACK_DUCK -HUB_VERSION=2023.10.0 +HUB_VERSION=2023.10.1 # Specify any property-specific overrides here # diff --git a/docker-swarm/docker-compose.dbmigrate.yml b/docker-swarm/docker-compose.dbmigrate.yml index 0bb7661..ee4d924 100644 --- a/docker-swarm/docker-compose.dbmigrate.yml +++ b/docker-swarm/docker-compose.dbmigrate.yml @@ -23,7 +23,7 @@ services: user: 'logstash:root' postgres: - image: blackducksoftware/blackduck-postgres:14-1.16 + image: blackducksoftware/blackduck-postgres:14-1.17 volumes: - postgres96-data-volume:/bitnami/postgresql - postgres-conf-volume:/opt/bitnami/postgresql/conf @@ -41,7 +41,7 @@ services: condition: on-failure postgres-upgrader: - image: blackducksoftware/blackduck-postgres-upgrader:14-1.1 + image: blackducksoftware/blackduck-postgres-upgrader:14-1.2 volumes: - postgres96-data-volume:/bitnami/postgresql - postgres-conf-volume:/opt/bitnami/postgresql/conf diff --git a/docker-swarm/docker-compose.externaldb.ubi.yml b/docker-swarm/docker-compose.externaldb.ubi.yml index 463431a..fa5c2c4 100644 --- a/docker-swarm/docker-compose.externaldb.ubi.yml +++ b/docker-swarm/docker-compose.externaldb.ubi.yml @@ -13,7 +13,7 @@ x-long-start-period: &long-start-period services: authentication: user: authentication:root - image: blackducksoftware/blackduck-authentication:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-authentication:2023.10.1_ubi8.8 volumes: - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security} @@ -35,7 +35,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} webapp: user: webapp:root - image: blackducksoftware/blackduck-webapp:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-webapp:2023.10.1_ubi8.8 volumes: - log-volume:/opt/blackduck/hub/logs - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security} @@ -57,7 +57,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} scan: user: scan:root - image: blackducksoftware/blackduck-scan:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-scan:2023.10.1_ubi8.8 env_file: [blackduck-config.env , hub-postgres.env] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -78,7 +78,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} storage: user: storage:root - image: blackducksoftware/blackduck-storage:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-storage:2023.10.1_ubi8.8 env_file: [blackduck-config.env , hub-postgres.env] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -100,7 +100,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} jobrunner: user: jobrunner:root - image: blackducksoftware/blackduck-jobrunner:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-jobrunner:2023.10.1_ubi8.8 env_file: [blackduck-config.env , hub-postgres.env] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', @@ -152,7 +152,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} registration: - image: blackducksoftware/blackduck-registration:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-registration:2023.10.1_ubi8.8 volumes: - config-volume:/opt/blackduck/hub/hub-registration/config - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security} @@ -191,7 +191,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 15s, window: 60s} webui: - image: blackducksoftware/blackduck-webui:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-webui:2023.10.1_ubi8.8 healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', /opt/blackduck/hub/hub-ui/security/root.crt] @@ -206,7 +206,7 @@ services: restart_policy: {condition: on-failure, delay: 15s, window: 60s} documentation: - image: blackducksoftware/blackduck-documentation:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-documentation:2023.10.1_ubi8.8 env_file: [blackduck-config.env] user: documentation:root environment: @@ -241,7 +241,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} redis: - image: blackducksoftware/blackduck-redis:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-redis:2023.10.1_ubi8.8 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -260,7 +260,7 @@ services: deploy: restart_policy: {condition: any} bomengine: - image: blackducksoftware/blackduck-bomengine:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-bomengine:2023.10.1_ubi8.8 env_file: [blackduck-config.env , hub-postgres.env] environment: << : *pg-usage-settings @@ -281,7 +281,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} matchengine: - image: blackducksoftware/blackduck-matchengine:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-matchengine:2023.10.1_ubi8.8 user: matchengine:root healthcheck: test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', diff --git a/docker-swarm/docker-compose.externaldb.yml b/docker-swarm/docker-compose.externaldb.yml index 1796278..d1f8469 100644 --- a/docker-swarm/docker-compose.externaldb.yml +++ b/docker-swarm/docker-compose.externaldb.yml @@ -13,7 +13,7 @@ x-long-start-period: &long-start-period services: authentication: user: authentication:root - image: blackducksoftware/blackduck-authentication:2023.10.0 + image: blackducksoftware/blackduck-authentication:2023.10.1 volumes: - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security} @@ -35,7 +35,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} webapp: user: webapp:root - image: blackducksoftware/blackduck-webapp:2023.10.0 + image: blackducksoftware/blackduck-webapp:2023.10.1 volumes: - log-volume:/opt/blackduck/hub/logs - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security} @@ -57,7 +57,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} scan: user: scan:root - image: blackducksoftware/blackduck-scan:2023.10.0 + image: blackducksoftware/blackduck-scan:2023.10.1 env_file: [blackduck-config.env , hub-postgres.env] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -78,7 +78,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} storage: user: storage:root - image: blackducksoftware/blackduck-storage:2023.10.0 + image: blackducksoftware/blackduck-storage:2023.10.1 env_file: [blackduck-config.env , hub-postgres.env] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -100,7 +100,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} jobrunner: user: jobrunner:root - image: blackducksoftware/blackduck-jobrunner:2023.10.0 + image: blackducksoftware/blackduck-jobrunner:2023.10.1 env_file: [blackduck-config.env , hub-postgres.env] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', @@ -152,7 +152,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} registration: - image: blackducksoftware/blackduck-registration:2023.10.0 + image: blackducksoftware/blackduck-registration:2023.10.1 volumes: - config-volume:/opt/blackduck/hub/hub-registration/config - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security} @@ -191,7 +191,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 15s, window: 60s} webui: - image: blackducksoftware/blackduck-webui:2023.10.0 + image: blackducksoftware/blackduck-webui:2023.10.1 healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', /opt/blackduck/hub/hub-ui/security/root.crt] @@ -206,7 +206,7 @@ services: restart_policy: {condition: on-failure, delay: 15s, window: 60s} documentation: - image: blackducksoftware/blackduck-documentation:2023.10.0 + image: blackducksoftware/blackduck-documentation:2023.10.1 env_file: [blackduck-config.env] user: documentation:root environment: @@ -241,7 +241,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} redis: - image: blackducksoftware/blackduck-redis:2023.10.0 + image: blackducksoftware/blackduck-redis:2023.10.1 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -260,7 +260,7 @@ services: deploy: restart_policy: {condition: any} bomengine: - image: blackducksoftware/blackduck-bomengine:2023.10.0 + image: blackducksoftware/blackduck-bomengine:2023.10.1 env_file: [blackduck-config.env , hub-postgres.env] environment: << : *pg-usage-settings @@ -281,7 +281,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} matchengine: - image: blackducksoftware/blackduck-matchengine:2023.10.0 + image: blackducksoftware/blackduck-matchengine:2023.10.1 user: matchengine:root healthcheck: test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', diff --git a/docker-swarm/docker-compose.integration.externaldb.ubi.yml b/docker-swarm/docker-compose.integration.externaldb.ubi.yml index 1716054..3f53fe7 100644 --- a/docker-swarm/docker-compose.integration.externaldb.ubi.yml +++ b/docker-swarm/docker-compose.integration.externaldb.ubi.yml @@ -5,7 +5,7 @@ version: '3.6' services: integration: - image: blackducksoftware/blackduck-integration:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-integration:2023.10.1_ubi8.8 user: integration:root env_file: [blackduck-config.env , hub-postgres.env] healthcheck: diff --git a/docker-swarm/docker-compose.integration.externaldb.yml b/docker-swarm/docker-compose.integration.externaldb.yml index 61e4d8b..c4ada5e 100644 --- a/docker-swarm/docker-compose.integration.externaldb.yml +++ b/docker-swarm/docker-compose.integration.externaldb.yml @@ -5,7 +5,7 @@ version: '3.6' services: integration: - image: blackducksoftware/blackduck-integration:2023.10.0 + image: blackducksoftware/blackduck-integration:2023.10.1 user: integration:root env_file: [blackduck-config.env , hub-postgres.env] healthcheck: diff --git a/docker-swarm/docker-compose.integration.yml b/docker-swarm/docker-compose.integration.yml index 29e2504..09b38d4 100644 --- a/docker-swarm/docker-compose.integration.yml +++ b/docker-swarm/docker-compose.integration.yml @@ -5,7 +5,7 @@ version: '3.6' services: integration: - image: blackducksoftware/blackduck-integration:2023.10.0 + image: blackducksoftware/blackduck-integration:2023.10.1 user: integration:root env_file: [blackduck-config.env ] healthcheck: diff --git a/docker-swarm/docker-compose.redis.sentinel.yml b/docker-swarm/docker-compose.redis.sentinel.yml index 89082e6..1f5c736 100644 --- a/docker-swarm/docker-compose.redis.sentinel.yml +++ b/docker-swarm/docker-compose.redis.sentinel.yml @@ -1,7 +1,7 @@ version: '3.6' services: redisslave: - image: blackducksoftware/blackduck-redis:2023.10.0 + image: blackducksoftware/blackduck-redis:2023.10.1 env_file: [blackduck-config.env] user: redis:root stop_grace_period: 60s @@ -25,7 +25,7 @@ services: limits: {memory: 2048M} reservations: {memory: 2048M} redissentinel1: - image: blackducksoftware/blackduck-redis:2023.10.0 + image: blackducksoftware/blackduck-redis:2023.10.1 env_file: [blackduck-config.env] hostname: redissentinel1 user: redis:root @@ -47,7 +47,7 @@ services: limits: {memory: 32M} reservations: {memory: 32M} redissentinel2: - image: blackducksoftware/blackduck-redis:2023.10.0 + image: blackducksoftware/blackduck-redis:2023.10.1 env_file: [blackduck-config.env] hostname: redissentinel2 user: redis:root @@ -69,7 +69,7 @@ services: limits: {memory: 32M} reservations: {memory: 32M} redissentinel3: - image: blackducksoftware/blackduck-redis:2023.10.0 + image: blackducksoftware/blackduck-redis:2023.10.1 env_file: [blackduck-config.env] hostname: redissentinel3 user: redis:root diff --git a/docker-swarm/docker-compose.ubi.yml b/docker-swarm/docker-compose.ubi.yml index ca47eb6..d21dd5b 100644 --- a/docker-swarm/docker-compose.ubi.yml +++ b/docker-swarm/docker-compose.ubi.yml @@ -12,7 +12,7 @@ x-long-start-period: &long-start-period services: postgres: - image: blackducksoftware/blackduck-postgres:14-1.16_ubi8.8 + image: blackducksoftware/blackduck-postgres:14-1.17_ubi8.8 ports: ['55436:5432'] volumes: - postgres96-data-volume:/bitnami/postgresql @@ -30,7 +30,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} stop_grace_period: 60s postgres-upgrader: - image: blackducksoftware/blackduck-postgres-upgrader:14-1.1_ubi8.8 + image: blackducksoftware/blackduck-postgres-upgrader:14-1.2_ubi8.8 volumes: - postgres96-data-volume:/bitnami/postgresql - postgres-conf-volume:/opt/bitnami/postgresql/conf @@ -45,7 +45,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} authentication: user: authentication:root - image: blackducksoftware/blackduck-authentication:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-authentication:2023.10.1_ubi8.8 volumes: - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security} @@ -67,7 +67,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} webapp: user: webapp:root - image: blackducksoftware/blackduck-webapp:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-webapp:2023.10.1_ubi8.8 volumes: - log-volume:/opt/blackduck/hub/logs - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security} @@ -89,7 +89,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} scan: user: scan:root - image: blackducksoftware/blackduck-scan:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-scan:2023.10.1_ubi8.8 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -110,7 +110,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} storage: user: storage:root - image: blackducksoftware/blackduck-storage:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-storage:2023.10.1_ubi8.8 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -132,7 +132,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} jobrunner: user: jobrunner:root - image: blackducksoftware/blackduck-jobrunner:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-jobrunner:2023.10.1_ubi8.8 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', @@ -184,7 +184,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} registration: - image: blackducksoftware/blackduck-registration:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-registration:2023.10.1_ubi8.8 volumes: - config-volume:/opt/blackduck/hub/hub-registration/config - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security} @@ -223,7 +223,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 15s, window: 60s} webui: - image: blackducksoftware/blackduck-webui:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-webui:2023.10.1_ubi8.8 healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', /opt/blackduck/hub/hub-ui/security/root.crt] @@ -238,7 +238,7 @@ services: restart_policy: {condition: on-failure, delay: 15s, window: 60s} documentation: - image: blackducksoftware/blackduck-documentation:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-documentation:2023.10.1_ubi8.8 env_file: [blackduck-config.env] user: documentation:root environment: @@ -273,7 +273,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} redis: - image: blackducksoftware/blackduck-redis:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-redis:2023.10.1_ubi8.8 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -292,7 +292,7 @@ services: deploy: restart_policy: {condition: any} bomengine: - image: blackducksoftware/blackduck-bomengine:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-bomengine:2023.10.1_ubi8.8 env_file: [blackduck-config.env ] environment: << : *pg-usage-settings @@ -313,7 +313,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} matchengine: - image: blackducksoftware/blackduck-matchengine:2023.10.0_ubi8.8 + image: blackducksoftware/blackduck-matchengine:2023.10.1_ubi8.8 user: matchengine:root healthcheck: test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', diff --git a/docker-swarm/docker-compose.yml b/docker-swarm/docker-compose.yml index f1c8232..0898aa7 100644 --- a/docker-swarm/docker-compose.yml +++ b/docker-swarm/docker-compose.yml @@ -12,7 +12,7 @@ x-long-start-period: &long-start-period services: postgres: - image: blackducksoftware/blackduck-postgres:14-1.16 + image: blackducksoftware/blackduck-postgres:14-1.17 ports: ['55436:5432'] volumes: - postgres96-data-volume:/bitnami/postgresql @@ -30,7 +30,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} stop_grace_period: 60s postgres-upgrader: - image: blackducksoftware/blackduck-postgres-upgrader:14-1.1 + image: blackducksoftware/blackduck-postgres-upgrader:14-1.2 volumes: - postgres96-data-volume:/bitnami/postgresql - postgres-conf-volume:/opt/bitnami/postgresql/conf @@ -45,7 +45,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} authentication: user: authentication:root - image: blackducksoftware/blackduck-authentication:2023.10.0 + image: blackducksoftware/blackduck-authentication:2023.10.1 volumes: - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security} @@ -67,7 +67,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} webapp: user: webapp:root - image: blackducksoftware/blackduck-webapp:2023.10.0 + image: blackducksoftware/blackduck-webapp:2023.10.1 volumes: - log-volume:/opt/blackduck/hub/logs - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security} @@ -89,7 +89,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} scan: user: scan:root - image: blackducksoftware/blackduck-scan:2023.10.0 + image: blackducksoftware/blackduck-scan:2023.10.1 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -110,7 +110,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} storage: user: storage:root - image: blackducksoftware/blackduck-storage:2023.10.0 + image: blackducksoftware/blackduck-storage:2023.10.1 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -132,7 +132,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} jobrunner: user: jobrunner:root - image: blackducksoftware/blackduck-jobrunner:2023.10.0 + image: blackducksoftware/blackduck-jobrunner:2023.10.1 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', @@ -184,7 +184,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} registration: - image: blackducksoftware/blackduck-registration:2023.10.0 + image: blackducksoftware/blackduck-registration:2023.10.1 volumes: - config-volume:/opt/blackduck/hub/hub-registration/config - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security} @@ -223,7 +223,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 15s, window: 60s} webui: - image: blackducksoftware/blackduck-webui:2023.10.0 + image: blackducksoftware/blackduck-webui:2023.10.1 healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', /opt/blackduck/hub/hub-ui/security/root.crt] @@ -238,7 +238,7 @@ services: restart_policy: {condition: on-failure, delay: 15s, window: 60s} documentation: - image: blackducksoftware/blackduck-documentation:2023.10.0 + image: blackducksoftware/blackduck-documentation:2023.10.1 env_file: [blackduck-config.env] user: documentation:root environment: @@ -273,7 +273,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} redis: - image: blackducksoftware/blackduck-redis:2023.10.0 + image: blackducksoftware/blackduck-redis:2023.10.1 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -292,7 +292,7 @@ services: deploy: restart_policy: {condition: any} bomengine: - image: blackducksoftware/blackduck-bomengine:2023.10.0 + image: blackducksoftware/blackduck-bomengine:2023.10.1 env_file: [blackduck-config.env ] environment: << : *pg-usage-settings @@ -313,7 +313,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} matchengine: - image: blackducksoftware/blackduck-matchengine:2023.10.0 + image: blackducksoftware/blackduck-matchengine:2023.10.1 user: matchengine:root healthcheck: test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', diff --git a/docker-swarm/sizes-gen04/1000sph.yaml b/docker-swarm/sizes-gen04/1000sph.yaml new file mode 100644 index 0000000..bc94d14 --- /dev/null +++ b/docker-swarm/sizes-gen04/1000sph.yaml @@ -0,0 +1,211 @@ +version: '3.6' +services: + authentication: + environment: + HUB_MAX_MEMORY: "1844m" + deploy: + resources: + limits: + cpus: ".700" + memory: "2048M" + reservations: + cpus: ".500" + memory: "2048M" + replicas: 1 + bomengine: + environment: + HUB_MAX_MEMORY: "4608m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "5120M" + reservations: + cpus: "1.000" + memory: "5120M" + replicas: 7 + cfssl: + deploy: + resources: + limits: + cpus: ".500" + memory: "1024M" + reservations: + cpus: ".300" + memory: "1024M" + replicas: 1 + documentation: + environment: + HUB_MAX_MEMORY: "1383m" + deploy: + resources: + limits: + cpus: ".500" + memory: "1536M" + reservations: + cpus: ".300" + memory: "1536M" + replicas: 1 + jobrunner: + environment: + HUB_MAX_MEMORY: "7373m" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/1000sph.yaml" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: "1.000" + memory: "6144M" + replicas: 5 + logstash: + environment: + HUB_MAX_MEMORY: "3687m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "4096M" + reservations: + cpus: ".700" + memory: "4096M" + replicas: 1 + matchengine: + environment: + HUB_MAX_MEMORY: "9216m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "10240M" + reservations: + cpus: ".700" + memory: "10240M" + replicas: 9 + postgres: + environment: + HUB_PG_SHARED_BUFFERS: '29502MB' + HUB_PG_EFFECTIVE_CACHE_SIZE: '35403MB' + HUB_PG_AUTOVACUUM_MAX_WORKERS: 6 + HUB_PG_MAINTENANCE_WORK_MEM: '2048MB' + HUB_PG_MAX_CONNECTIONS: 600 + HUB_PG_WORK_MEM: '48MB' + deploy: + resources: + limits: + cpus: "22.000" + memory: "88G" + reservations: + cpus: "18.000" + memory: "88G" + replicas: 1 + postgres-upgrader: + deploy: + resources: + limits: + cpus: "2.000" + memory: "4G" + reservations: + cpus: "1.000" + memory: "4G" + rabbitmq: + deploy: + resources: + limits: + cpus: "1.000" + memory: "2048M" + reservations: + cpus: ".500" + memory: "1433M" + replicas: 1 + redis: + environment: + BLACKDUCK_REDIS_MAXMEMORY: "4608mb" + deploy: + resources: + limits: + cpus: "1.000" + memory: "5120M" + reservations: + cpus: ".500" + memory: "5120M" + replicas: 1 + registration: + environment: + HUB_MAX_MEMORY: "2765m" + deploy: + resources: + limits: + cpus: ".700" + memory: "3072M" + reservations: + cpus: ".500" + memory: "3072M" + replicas: 1 + scan: + environment: + HUB_MAX_MEMORY: "13824m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "15360M" + reservations: + cpus: ".700" + memory: "15360M" + replicas: 10 + storage: + environment: + HUB_MAX_MEMORY: "7373m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: ".700" + memory: "5144M" + replicas: 1 + uploadcache: + deploy: + resources: + limits: + cpus: ".600" + memory: "1536M" + reservations: + cpus: ".300" + memory: "1024M" + replicas: 1 + webapp: + environment: + HUB_MAX_MEMORY: "18432m" + deploy: + resources: + limits: + cpus: "6.000" + memory: "20480M" + reservations: + cpus: "3.000" + memory: "15360M" + replicas: 1 + webserver: + deploy: + resources: + limits: + cpus: ".600" + memory: "2048M" + reservations: + cpus: ".400" + memory: "1024M" + replicas: 1 + webui: + deploy: + resources: + limits: + cpus: ".600" + memory: "1536M" + reservations: + cpus: ".300" + memory: "1024M" + replicas: 1 diff --git a/docker-swarm/sizes-gen04/10sph.yaml b/docker-swarm/sizes-gen04/10sph.yaml new file mode 100644 index 0000000..4c26cc6 --- /dev/null +++ b/docker-swarm/sizes-gen04/10sph.yaml @@ -0,0 +1,211 @@ +version: '3.6' +services: + authentication: + environment: + HUB_MAX_MEMORY: "1106m" + deploy: + resources: + limits: + cpus: ".500" + memory: "1229M" + reservations: + cpus: ".300" + memory: "819M" + replicas: 1 + bomengine: + environment: + HUB_MAX_MEMORY: "4148m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "4608M" + reservations: + cpus: ".700" + memory: "3174M" + replicas: 1 + cfssl: + deploy: + resources: + limits: + cpus: ".300" + memory: "260M" + reservations: + cpus: ".200" + memory: "260M" + replicas: 1 + documentation: + environment: + HUB_MAX_MEMORY: "922m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "1024M" + reservations: + cpus: ".200" + memory: "768M" + replicas: 1 + jobrunner: + environment: + HUB_MAX_MEMORY: "4240m" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/10sph.yaml" + deploy: + resources: + limits: + cpus: "1.500" + memory: "4710M" + reservations: + cpus: "1.000" + memory: "3200M" + replicas: 1 + logstash: + environment: + HUB_MAX_MEMORY: "1106m" + deploy: + resources: + limits: + cpus: ".500" + memory: "1229M" + reservations: + cpus: ".300" + memory: "922M" + replicas: 1 + matchengine: + environment: + HUB_MAX_MEMORY: "4608m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "5120M" + reservations: + cpus: ".700" + memory: "3584M" + replicas: 1 + postgres: + environment: + HUB_PG_SHARED_BUFFERS: '2653MB' + HUB_PG_EFFECTIVE_CACHE_SIZE: '3185MB' + HUB_PG_AUTOVACUUM_MAX_WORKERS: 4 + HUB_PG_MAINTENANCE_WORK_MEM: '512MB' + HUB_PG_MAX_CONNECTIONS: 400 + HUB_PG_WORK_MEM: '50MB' + deploy: + resources: + limits: + cpus: "2.000" + memory: "8G" + reservations: + cpus: "1.000" + memory: "8G" + replicas: 1 + postgres-upgrader: + deploy: + resources: + limits: + cpus: "2.000" + memory: "4G" + reservations: + cpus: "1.000" + memory: "4G" + rabbitmq: + deploy: + resources: + limits: + cpus: "1.000" + memory: "512M" + reservations: + cpus: ".200" + memory: "307M" + replicas: 1 + redis: + environment: + BLACKDUCK_REDIS_MAXMEMORY: "900mb" + deploy: + resources: + limits: + cpus: ".300" + memory: "1024M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 + registration: + environment: + HUB_MAX_MEMORY: "922m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "1024M" + reservations: + cpus: ".200" + memory: "717M" + replicas: 1 + scan: + environment: + HUB_MAX_MEMORY: "4608m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "5120M" + reservations: + cpus: ".500" + memory: "3584M" + replicas: 1 + storage: + environment: + HUB_MAX_MEMORY: "512m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "1024M" + reservations: + cpus: ".700" + memory: "1024M" + replicas: 1 + uploadcache: + deploy: + resources: + limits: + cpus: ".200" + memory: "512M" + reservations: + cpus: ".100" + memory: "512M" + replicas: 1 + webapp: + environment: + HUB_MAX_MEMORY: "3226m" + deploy: + resources: + limits: + cpus: "2.000" + memory: "3584M" + reservations: + cpus: ".700" + memory: "2400M" + replicas: 1 + webserver: + deploy: + resources: + limits: + cpus: ".300" + memory: "512M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 + webui: + deploy: + resources: + limits: + cpus: ".300" + memory: "512M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 diff --git a/docker-swarm/sizes-gen04/120sph.yaml b/docker-swarm/sizes-gen04/120sph.yaml new file mode 100644 index 0000000..2039029 --- /dev/null +++ b/docker-swarm/sizes-gen04/120sph.yaml @@ -0,0 +1,211 @@ +version: '3.6' +services: + authentication: + environment: + HUB_MAX_MEMORY: "1843m" + deploy: + resources: + limits: + cpus: ".500" + memory: "2048M" + reservations: + cpus: ".300" + memory: "1638M" + replicas: 1 + bomengine: + environment: + HUB_MAX_MEMORY: "5000m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "5600M" + reservations: + cpus: ".700" + memory: "4608M" + replicas: 1 + cfssl: + deploy: + resources: + limits: + cpus: ".300" + memory: "260M" + reservations: + cpus: ".200" + memory: "260M" + replicas: 1 + documentation: + environment: + HUB_MAX_MEMORY: "922m" + deploy: + resources: + limits: + cpus: ".500" + memory: "1024M" + reservations: + cpus: ".200" + memory: "1024M" + replicas: 1 + jobrunner: + environment: + HUB_MAX_MEMORY: "7373m" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/120sph.yaml" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: "1.000" + memory: "6144M" + replicas: 1 + logstash: + environment: + HUB_MAX_MEMORY: "2185m" + deploy: + resources: + limits: + cpus: ".800" + memory: "2428M" + reservations: + cpus: ".500" + memory: "1741M" + replicas: 1 + matchengine: + environment: + HUB_MAX_MEMORY: "7373m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: "1.000" + memory: "6144M" + replicas: 2 + postgres: + environment: + HUB_PG_SHARED_BUFFERS: '5336MB' + HUB_PG_EFFECTIVE_CACHE_SIZE: '6404MB' + HUB_PG_AUTOVACUUM_MAX_WORKERS: 4 + HUB_PG_MAINTENANCE_WORK_MEM: '512MB' + HUB_PG_MAX_CONNECTIONS: 400 + HUB_PG_WORK_MEM: '50MB' + deploy: + resources: + limits: + cpus: "4.000" + memory: "16G" + reservations: + cpus: "2.000" + memory: "16G" + replicas: 1 + postgres-upgrader: + deploy: + resources: + limits: + cpus: "2.000" + memory: "4G" + reservations: + cpus: "1.000" + memory: "4G" + rabbitmq: + deploy: + resources: + limits: + cpus: ".500" + memory: "512M" + reservations: + cpus: ".200" + memory: "307M" + replicas: 1 + redis: + environment: + BLACKDUCK_REDIS_MAXMEMORY: "900mb" + deploy: + resources: + limits: + cpus: ".300" + memory: "1024M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 + registration: + environment: + HUB_MAX_MEMORY: "1200m" + deploy: + resources: + limits: + cpus: ".300" + memory: "1331M" + reservations: + cpus: ".200" + memory: "1331M" + replicas: 1 + scan: + environment: + HUB_MAX_MEMORY: "9216m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "10240M" + reservations: + cpus: ".700" + memory: "10240M" + replicas: 1 + storage: + environment: + HUB_MAX_MEMORY: "2304m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "2560M" + reservations: + cpus: ".700" + memory: "1024M" + replicas: 1 + uploadcache: + deploy: + resources: + limits: + cpus: ".200" + memory: "512M" + reservations: + cpus: ".100" + memory: "512M" + replicas: 1 + webapp: + environment: + HUB_MAX_MEMORY: "3608m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "4048M" + reservations: + cpus: "1.000" + memory: "4048M" + replicas: 1 + webserver: + deploy: + resources: + limits: + cpus: ".300" + memory: "512M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 + webui: + deploy: + resources: + limits: + cpus: ".300" + memory: "512M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 diff --git a/docker-swarm/sizes-gen04/1500sph.yaml b/docker-swarm/sizes-gen04/1500sph.yaml new file mode 100644 index 0000000..ce326ff --- /dev/null +++ b/docker-swarm/sizes-gen04/1500sph.yaml @@ -0,0 +1,211 @@ +version: '3.6' +services: + authentication: + environment: + HUB_MAX_MEMORY: "1844m" + deploy: + resources: + limits: + cpus: ".700" + memory: "2048M" + reservations: + cpus: ".500" + memory: "2048M" + replicas: 1 + bomengine: + environment: + HUB_MAX_MEMORY: "4608m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "5120M" + reservations: + cpus: "1.000" + memory: "5120M" + replicas: 8 + cfssl: + deploy: + resources: + limits: + cpus: ".500" + memory: "1024M" + reservations: + cpus: ".300" + memory: "1024M" + replicas: 1 + documentation: + environment: + HUB_MAX_MEMORY: "1383m" + deploy: + resources: + limits: + cpus: ".500" + memory: "1536M" + reservations: + cpus: ".300" + memory: "1536M" + replicas: 1 + jobrunner: + environment: + HUB_MAX_MEMORY: "7373m" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/1500sph.yaml" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: "1.000" + memory: "6144M" + replicas: 6 + logstash: + environment: + HUB_MAX_MEMORY: "3687m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "4096M" + reservations: + cpus: ".700" + memory: "4096M" + replicas: 1 + matchengine: + environment: + HUB_MAX_MEMORY: "9216m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "10240M" + reservations: + cpus: ".700" + memory: "10240M" + replicas: 12 + postgres: + environment: + HUB_PG_SHARED_BUFFERS: '34878MB' + HUB_PG_EFFECTIVE_CACHE_SIZE: '41854MB' + HUB_PG_AUTOVACUUM_MAX_WORKERS: 8 + HUB_PG_MAINTENANCE_WORK_MEM: '4096MB' + HUB_PG_MAX_CONNECTIONS: 800 + HUB_PG_WORK_MEM: '58MB' + deploy: + resources: + limits: + cpus: "26.000" + memory: "104G" + reservations: + cpus: "2.000" + memory: "104G" + replicas: 1 + postgres-upgrader: + deploy: + resources: + limits: + cpus: "2.000" + memory: "4G" + reservations: + cpus: "1.000" + memory: "4G" + rabbitmq: + deploy: + resources: + limits: + cpus: "1.000" + memory: "3072M" + reservations: + cpus: ".500" + memory: "1433M" + replicas: 1 + redis: + environment: + BLACKDUCK_REDIS_MAXMEMORY: "7373mb" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: ".500" + memory: "5120M" + replicas: 1 + registration: + environment: + HUB_MAX_MEMORY: "2765m" + deploy: + resources: + limits: + cpus: ".700" + memory: "3072M" + reservations: + cpus: ".500" + memory: "3072M" + replicas: 1 + scan: + environment: + HUB_MAX_MEMORY: "13824m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "15360M" + reservations: + cpus: ".700" + memory: "15360M" + replicas: 13 + storage: + environment: + HUB_MAX_MEMORY: "7373m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: ".700" + memory: "3072M" + replicas: 1 + uploadcache: + deploy: + resources: + limits: + cpus: ".600" + memory: "1536M" + reservations: + cpus: ".300" + memory: "1024M" + replicas: 1 + webapp: + environment: + HUB_MAX_MEMORY: "18432m" + deploy: + resources: + limits: + cpus: "6.000" + memory: "20480M" + reservations: + cpus: "3.000" + memory: "15360M" + replicas: 1 + webserver: + deploy: + resources: + limits: + cpus: ".600" + memory: "2048M" + reservations: + cpus: ".400" + memory: "1024M" + replicas: 1 + webui: + deploy: + resources: + limits: + cpus: ".600" + memory: "1536M" + reservations: + cpus: ".300" + memory: "1024M" + replicas: 1 diff --git a/docker-swarm/sizes-gen04/2000sph.yaml b/docker-swarm/sizes-gen04/2000sph.yaml new file mode 100644 index 0000000..317bb53 --- /dev/null +++ b/docker-swarm/sizes-gen04/2000sph.yaml @@ -0,0 +1,211 @@ +version: '3.6' +services: + authentication: + environment: + HUB_MAX_MEMORY: "2765m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "3072M" + reservations: + cpus: ".500" + memory: "2048M" + replicas: 1 + bomengine: + environment: + HUB_MAX_MEMORY: "4608m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "5120M" + reservations: + cpus: "1.000" + memory: "5120M" + replicas: 10 + cfssl: + deploy: + resources: + limits: + cpus: ".500" + memory: "1024M" + reservations: + cpus: ".300" + memory: "1024M" + replicas: 1 + documentation: + environment: + HUB_MAX_MEMORY: "1383m" + deploy: + resources: + limits: + cpus: ".500" + memory: "1536M" + reservations: + cpus: ".300" + memory: "1536M" + replicas: 1 + jobrunner: + environment: + HUB_MAX_MEMORY: "7373m" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/2000sph.yaml" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: "1.000" + memory: "6144M" + replicas: 8 + logstash: + environment: + HUB_MAX_MEMORY: "3687m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "4096M" + reservations: + cpus: ".700" + memory: "4096M" + replicas: 1 + matchengine: + environment: + HUB_MAX_MEMORY: "9216m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "10240M" + reservations: + cpus: ".700" + memory: "10240M" + replicas: 15 + postgres: + environment: + HUB_PG_SHARED_BUFFERS: '42974MB' + HUB_PG_EFFECTIVE_CACHE_SIZE: '51569MB' + HUB_PG_AUTOVACUUM_MAX_WORKERS: 8 + HUB_PG_MAINTENANCE_WORK_MEM: '4096MB' + HUB_PG_MAX_CONNECTIONS: 800 + HUB_PG_WORK_MEM: '58MB' + deploy: + resources: + limits: + cpus: "32.000" + memory: "128G" + reservations: + cpus: "24.000" + memory: "128G" + replicas: 1 + postgres-upgrader: + deploy: + resources: + limits: + cpus: "2.000" + memory: "4G" + reservations: + cpus: "1.000" + memory: "4G" + rabbitmq: + deploy: + resources: + limits: + cpus: "1.000" + memory: "3072M" + reservations: + cpus: ".500" + memory: "1433M" + replicas: 1 + redis: + environment: + BLACKDUCK_REDIS_MAXMEMORY: "9216mb" + deploy: + resources: + limits: + cpus: "1.000" + memory: "10240M" + reservations: + cpus: ".500" + memory: "5120M" + replicas: 1 + registration: + environment: + HUB_MAX_MEMORY: "2765m" + deploy: + resources: + limits: + cpus: ".700" + memory: "3072M" + reservations: + cpus: ".500" + memory: "3072M" + replicas: 1 + scan: + environment: + HUB_MAX_MEMORY: "13824m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "15360M" + reservations: + cpus: ".700" + memory: "15360M" + replicas: 16 + storage: + environment: + HUB_MAX_MEMORY: "9100m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "10240M" + reservations: + cpus: ".700" + memory: "3072M" + replicas: 1 + uploadcache: + deploy: + resources: + limits: + cpus: ".600" + memory: "1536M" + reservations: + cpus: ".300" + memory: "1024M" + replicas: 1 + webapp: + environment: + HUB_MAX_MEMORY: "18432m" + deploy: + resources: + limits: + cpus: "6.000" + memory: "20480M" + reservations: + cpus: "3.000" + memory: "15360M" + replicas: 1 + webserver: + deploy: + resources: + limits: + cpus: ".600" + memory: "2048M" + reservations: + cpus: ".400" + memory: "1024M" + replicas: 1 + webui: + deploy: + resources: + limits: + cpus: ".600" + memory: "1536M" + reservations: + cpus: ".300" + memory: "1024M" + replicas: 1 diff --git a/docker-swarm/sizes-gen04/250sph.yaml b/docker-swarm/sizes-gen04/250sph.yaml new file mode 100644 index 0000000..2fd9283 --- /dev/null +++ b/docker-swarm/sizes-gen04/250sph.yaml @@ -0,0 +1,211 @@ +version: '3.6' +services: + authentication: + environment: + HUB_MAX_MEMORY: "1843m" + deploy: + resources: + limits: + cpus: ".500" + memory: "2048M" + reservations: + cpus: ".300" + memory: "1638M" + replicas: 1 + bomengine: + environment: + HUB_MAX_MEMORY: "5000m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "5600M" + reservations: + cpus: ".700" + memory: "4608M" + replicas: 1 + cfssl: + deploy: + resources: + limits: + cpus: ".300" + memory: "260M" + reservations: + cpus: ".200" + memory: "260M" + replicas: 1 + documentation: + environment: + HUB_MAX_MEMORY: "922m" + deploy: + resources: + limits: + cpus: ".500" + memory: "1024M" + reservations: + cpus: ".200" + memory: "1024M" + replicas: 1 + jobrunner: + environment: + HUB_MAX_MEMORY: "7373m" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/250sph.yaml" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: "1.000" + memory: "6144M" + replicas: 2 + logstash: + environment: + HUB_MAX_MEMORY: "2765m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "3072M" + reservations: + cpus: ".500" + memory: "2048M" + replicas: 1 + matchengine: + environment: + HUB_MAX_MEMORY: "7373m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: "1.000" + memory: "6144M" + replicas: 3 + postgres: + environment: + HUB_PG_SHARED_BUFFERS: '8016MB' + HUB_PG_EFFECTIVE_CACHE_SIZE: '9619MB' + HUB_PG_AUTOVACUUM_MAX_WORKERS: 6 + HUB_PG_MAINTENANCE_WORK_MEM: '1024MB' + HUB_PG_MAX_CONNECTIONS: 500 + HUB_PG_WORK_MEM: '35MB' + deploy: + resources: + limits: + cpus: "6.000" + memory: "24G" + reservations: + cpus: "3.000" + memory: "24G" + replicas: 1 + postgres-upgrader: + deploy: + resources: + limits: + cpus: "2.000" + memory: "4G" + reservations: + cpus: "1.000" + memory: "4G" + rabbitmq: + deploy: + resources: + limits: + cpus: ".500" + memory: "512M" + reservations: + cpus: ".200" + memory: "307M" + replicas: 1 + redis: + environment: + BLACKDUCK_REDIS_MAXMEMORY: "1844mb" + deploy: + resources: + limits: + cpus: ".500" + memory: "2048M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 + registration: + environment: + HUB_MAX_MEMORY: "1200m" + deploy: + resources: + limits: + cpus: ".300" + memory: "1331M" + reservations: + cpus: ".200" + memory: "1331M" + replicas: 1 + scan: + environment: + HUB_MAX_MEMORY: "9216m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "10240M" + reservations: + cpus: ".700" + memory: "10240M" + replicas: 2 + storage: + environment: + HUB_MAX_MEMORY: "2765m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "3072M" + reservations: + cpus: ".700" + memory: "2048M" + replicas: 1 + uploadcache: + deploy: + resources: + limits: + cpus: ".200" + memory: "512M" + reservations: + cpus: ".100" + memory: "512M" + replicas: 1 + webapp: + environment: + HUB_MAX_MEMORY: "4608m" + deploy: + resources: + limits: + cpus: "2.000" + memory: "5120M" + reservations: + cpus: "1.000" + memory: "5120M" + replicas: 1 + webserver: + deploy: + resources: + limits: + cpus: ".300" + memory: "512M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 + webui: + deploy: + resources: + limits: + cpus: ".300" + memory: "512M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 diff --git a/docker-swarm/sizes-gen04/500sph.yaml b/docker-swarm/sizes-gen04/500sph.yaml new file mode 100644 index 0000000..c08cb74 --- /dev/null +++ b/docker-swarm/sizes-gen04/500sph.yaml @@ -0,0 +1,211 @@ +version: '3.6' +services: + authentication: + environment: + HUB_MAX_MEMORY: "1843m" + deploy: + resources: + limits: + cpus: ".500" + memory: "2048M" + reservations: + cpus: ".300" + memory: "1638M" + replicas: 1 + bomengine: + environment: + HUB_MAX_MEMORY: "4608m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "5120M" + reservations: + cpus: "1.000" + memory: "5120M" + replicas: 2 + cfssl: + deploy: + resources: + limits: + cpus: ".300" + memory: "512M" + reservations: + cpus: ".200" + memory: "260M" + replicas: 1 + documentation: + environment: + HUB_MAX_MEMORY: "922m" + deploy: + resources: + limits: + cpus: ".500" + memory: "1024M" + reservations: + cpus: ".200" + memory: "1024M" + replicas: 1 + jobrunner: + environment: + HUB_MAX_MEMORY: "7373m" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/500sph.yaml" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: "1.000" + memory: "6144M" + replicas: 3 + logstash: + environment: + HUB_MAX_MEMORY: "2765m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "3072M" + reservations: + cpus: ".500" + memory: "2048M" + replicas: 1 + matchengine: + environment: + HUB_MAX_MEMORY: "7373m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "8192M" + reservations: + cpus: "1.000" + memory: "6144M" + replicas: 4 + postgres: + environment: + HUB_PG_SHARED_BUFFERS: '21439MB' + HUB_PG_EFFECTIVE_CACHE_SIZE: '25727MB' + HUB_PG_AUTOVACUUM_MAX_WORKERS: 6 + HUB_PG_MAINTENANCE_WORK_MEM: '1024MB' + HUB_PG_MAX_CONNECTIONS: 500 + HUB_PG_WORK_MEM: '35MB' + deploy: + resources: + limits: + cpus: "16.000" + memory: "64G" + reservations: + cpus: "1.000" + memory: "64G" + replicas: 1 + postgres-upgrader: + deploy: + resources: + limits: + cpus: "2.000" + memory: "4G" + reservations: + cpus: "1.000" + memory: "4G" + rabbitmq: + deploy: + resources: + limits: + cpus: ".500" + memory: "1024M" + reservations: + cpus: ".300" + memory: "512M" + replicas: 1 + redis: + environment: + BLACKDUCK_REDIS_MAXMEMORY: "3687mb" + deploy: + resources: + limits: + cpus: "1.000" + memory: "4096M" + reservations: + cpus: ".500" + memory: "4096M" + replicas: 1 + registration: + environment: + HUB_MAX_MEMORY: "1844m" + deploy: + resources: + limits: + cpus: ".500" + memory: "2048M" + reservations: + cpus: ".300" + memory: "2048M" + replicas: 1 + scan: + environment: + HUB_MAX_MEMORY: "9216m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "10240M" + reservations: + cpus: ".700" + memory: "10240M" + replicas: 4 + storage: + environment: + HUB_MAX_MEMORY: "3687m" + deploy: + resources: + limits: + cpus: "1.000" + memory: "4096M" + reservations: + cpus: ".700" + memory: "3072M" + replicas: 1 + uploadcache: + deploy: + resources: + limits: + cpus: ".400" + memory: "1024M" + reservations: + cpus: ".200" + memory: "512M" + replicas: 1 + webapp: + environment: + HUB_MAX_MEMORY: "5530m" + deploy: + resources: + limits: + cpus: "3.000" + memory: "6144M" + reservations: + cpus: "2.000" + memory: "6144M" + replicas: 1 + webserver: + deploy: + resources: + limits: + cpus: ".400" + memory: "1024M" + reservations: + cpus: ".300" + memory: "512M" + replicas: 1 + webui: + deploy: + resources: + limits: + cpus: ".400" + memory: "1024M" + reservations: + cpus: ".300" + memory: "512M" + replicas: 1 diff --git a/docs/en_US/getting_started.pdf b/docs/en_US/getting_started.pdf index 9adf5b4..2fecb8e 100644 Binary files a/docs/en_US/getting_started.pdf and b/docs/en_US/getting_started.pdf differ diff --git a/docs/en_US/install_kubernetes.pdf b/docs/en_US/install_kubernetes.pdf index a25a2ba..600bfaa 100644 Binary files a/docs/en_US/install_kubernetes.pdf and b/docs/en_US/install_kubernetes.pdf differ diff --git a/docs/en_US/install_openshift.pdf b/docs/en_US/install_openshift.pdf index bd4478a..1e15241 100644 Binary files a/docs/en_US/install_openshift.pdf and b/docs/en_US/install_openshift.pdf differ diff --git a/docs/en_US/install_swarm.pdf b/docs/en_US/install_swarm.pdf index 01a04f0..497da98 100644 Binary files a/docs/en_US/install_swarm.pdf and b/docs/en_US/install_swarm.pdf differ diff --git a/docs/en_US/release_notes.pdf b/docs/en_US/release_notes.pdf index f1897bf..4b6006f 100644 Binary files a/docs/en_US/release_notes.pdf and b/docs/en_US/release_notes.pdf differ diff --git a/docs/ja_JA/getting_started.pdf b/docs/ja_JA/getting_started.pdf index f90d2bb..f479199 100644 Binary files a/docs/ja_JA/getting_started.pdf and b/docs/ja_JA/getting_started.pdf differ diff --git a/docs/ja_JA/install_kubernetes.pdf b/docs/ja_JA/install_kubernetes.pdf index ab8a967..69f78c6 100644 Binary files a/docs/ja_JA/install_kubernetes.pdf and b/docs/ja_JA/install_kubernetes.pdf differ diff --git a/docs/ja_JA/install_openshift.pdf b/docs/ja_JA/install_openshift.pdf index 528c7f1..99917e8 100644 Binary files a/docs/ja_JA/install_openshift.pdf and b/docs/ja_JA/install_openshift.pdf differ diff --git a/docs/ja_JA/install_swarm.pdf b/docs/ja_JA/install_swarm.pdf index d3fba90..85516fd 100644 Binary files a/docs/ja_JA/install_swarm.pdf and b/docs/ja_JA/install_swarm.pdf differ diff --git a/docs/ja_JA/release_notes.pdf b/docs/ja_JA/release_notes.pdf index 2e24249..4680644 100644 Binary files a/docs/ja_JA/release_notes.pdf and b/docs/ja_JA/release_notes.pdf differ diff --git a/docs/zh_CN/getting_started.pdf b/docs/zh_CN/getting_started.pdf index bae7555..7588cc9 100644 Binary files a/docs/zh_CN/getting_started.pdf and b/docs/zh_CN/getting_started.pdf differ diff --git a/docs/zh_CN/install_kubernetes.pdf b/docs/zh_CN/install_kubernetes.pdf index 42cfe94..49f7676 100644 Binary files a/docs/zh_CN/install_kubernetes.pdf and b/docs/zh_CN/install_kubernetes.pdf differ diff --git a/docs/zh_CN/install_openshift.pdf b/docs/zh_CN/install_openshift.pdf index df7bd5b..b95e169 100644 Binary files a/docs/zh_CN/install_openshift.pdf and b/docs/zh_CN/install_openshift.pdf differ diff --git a/docs/zh_CN/install_swarm.pdf b/docs/zh_CN/install_swarm.pdf index ec462eb..8cadf69 100644 Binary files a/docs/zh_CN/install_swarm.pdf and b/docs/zh_CN/install_swarm.pdf differ diff --git a/docs/zh_CN/release_notes.pdf b/docs/zh_CN/release_notes.pdf index 1ae5009..f271648 100644 Binary files a/docs/zh_CN/release_notes.pdf and b/docs/zh_CN/release_notes.pdf differ diff --git a/kubernetes/README.md b/kubernetes/README.md index 366a834..b4f99fa 100644 --- a/kubernetes/README.md +++ b/kubernetes/README.md @@ -2,8 +2,13 @@ Welcome to the README for Black Duck on Kubernetes/OpenShift. -Please note that this document applies *only* to Black Duck on Kubernetes/OpenShift. If you wish to deploy or use Black Duck on any other platform (e.g., Docker Swarm), please reference the documentation [here](https://sig-product-docs.synopsys.com/bundle/bd-hub/page/Welcome.html) +Please note that this document applies *only* to Black Duck on Kubernetes/OpenShift. If you wish to deploy or use Black Duck on any other platform (e.g., Docker Swarm), please reference the documentation specific to that platform. # Deploying Black Duck in Kubernetes/OpenShift -Please see "Installing Black Duck using Kubernetes" in the [user guide](https://sig-product-docs.synopsys.com/bundle/bd-hub/page/Install_Kubernetes_Operator.html) or see "Installing Black Duck using OpenShift" in the [user guide](https://sig-product-docs.synopsys.com/bundle/bd-hub/page/Install_OpenShift_Operator.html) +A Helm chart is provided that describes a Kubernetes set of resources required to deploy Black Duck. You can find the charts within the blackduck folder on Kubernetes GitHub page. The Helm charts are also available in the public chart museum which can be pulled from https://sig-repo.synopsys.com/artifactory/sig-cloudnative. Please use the following command to access the repository: +`helm repo add synopsys https://sig-repo.synopsys.com/artifactory/sig-cloudnative` + +# Technical Resources + +For the latest technical information on Black Duck for Kubernetes/OpenShift, see the [wiki](https://github.com/blackducksoftware/hub/wiki) in this repository. diff --git a/kubernetes/blackduck/Chart.yaml b/kubernetes/blackduck/Chart.yaml index 5f12654..0a43283 100644 --- a/kubernetes/blackduck/Chart.yaml +++ b/kubernetes/blackduck/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 2023.10.0 +appVersion: 2023.10.1 name: blackduck description: Black Duck Helm Chart -version: 2023.10.0 +version: 2023.10.1 diff --git a/kubernetes/blackduck/README.md b/kubernetes/blackduck/README.md index 4612c4f..96b0ed3 100644 --- a/kubernetes/blackduck/README.md +++ b/kubernetes/blackduck/README.md @@ -6,7 +6,7 @@ This chart bootstraps **Black Duck** deployment on a **Kubernetes** cluster usin * Kubernetes 1.9+ * storageClass configured that allows persistent volumes. -* Helm2 or Helm3 +* Helm3 * Add the Synopsys repository to Helm repository ```bash $ helm repo add synopsys https://sig-repo.synopsys.com/artifactory/sig-cloudnative @@ -16,7 +16,7 @@ $ helm repo add synopsys https://sig-repo.synopsys.com/artifactory/sig-cloudnati * `name` * `namespace` -- usually the same as `name` -* `size`: one of: `10sph`, `120sph`, `250sph`, `500sph`, `1000sph`, `1500sph`, `2000sph` (from the `sizes-gen03` folder) +* `size`: one of: `10sph`, `120sph`, `250sph`, `500sph`, `1000sph`, `1500sph`, `2000sph` (from the `sizes-gen04` folder) ## Installing the Chart -- Helm 3 @@ -55,7 +55,7 @@ If you're using an external postgres (default configuration) then you will need ### Install the Black Duck Chart ```bash -$ BD_NAME="bd" && BD_SIZE="sizes-gen03/10sph" +$ BD_NAME="bd" && BD_SIZE="sizes-gen04/10sph" $ helm install synopsys/blackduck --name ${BD_NAME} --namespace ${BD_NAME} -f ${BD_SIZE}.yaml --set tlsCertSecretName=${BD_NAME}-blackduck-webserver-certificate ``` @@ -198,6 +198,12 @@ To update the deployment: ```bash $ helm upgrade ${BD_NAME} synopsys/blackduck -f my-values.yaml --reuse-values --namespace ${BD_NAME} ``` + +## Additional documentation + +Please refer to the Synopsysctl document for some common configurations +https://synopsys.atlassian.net/wiki/spaces/BDLM/pages/65700255/Black+Duck+Configuration + ## Configuration The following table lists the configurable parameters of the Black Duck chart and their default values. @@ -232,7 +238,7 @@ The following table lists the configurable parameters of the Black Duck chart an | Parameter | Description | Default | |----------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------| ------- | | `registry` | Image repository | `docker.io/blackducksoftware` | -| `imageTag` | Version of Black Duck | `2023.10.0` | +| `imageTag` | Version of Black Duck | `2023.10.1` | | `imagePullSecrets` | Reference to one or more secrets to be used when pulling images | `[]` | | `sealKey` | Seal key to encrypt the master key when Source code upload is enabled and it should be of length 32 | `abcdefghijklmnopqrstuvwxyz123456` | | `tlsCertSecretName` | Name of Webserver TLS Secret containing Certificates (if not provided Certificates will be generated) | | diff --git a/kubernetes/blackduck/sizes-gen04/1000sph.yaml b/kubernetes/blackduck/sizes-gen04/1000sph.yaml new file mode 100644 index 0000000..77c2844 --- /dev/null +++ b/kubernetes/blackduck/sizes-gen04/1000sph.yaml @@ -0,0 +1,209 @@ +environs: + SCANNER_CONCURRENCY: "1" + BLACKDUCK_REDIS_MAXMEMORY: "4608mb" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/1000sph.yaml" + HUB_PG_SHARED_BUFFERS: "29502MB" + HUB_PG_EFFECTIVE_CACHE_SIZE: "35403MB" + HUB_PG_AUTOVACUUM_MAX_WORKERS: 6 + HUB_PG_MAINTENANCE_WORK_MEM: "2048MB" + HUB_PG_MAX_CONNECTIONS: 600 + HUB_PG_WORK_MEM: "48MB" + +authentication: + replicas: 1 + hubMaxMemory: "1844m" + resources: + limits: + cpu: "700m" + memory: "2048Mi" + requests: + cpu: "500m" + memory: "2048Mi" + +bomengine: + replicas: 7 + hubMaxMemory: "4608m" + resources: + limits: + cpu: "1000m" + memory: "5120Mi" + requests: + cpu: "1000m" + memory: "5120Mi" + +cfssl: + replicas: 1 + resources: + limits: + cpu: "500m" + memory: "1024Mi" + requests: + cpu: "300m" + memory: "1024Mi" + +documentation: + replicas: 1 + hubMaxMemory: "1383m" + resources: + limits: + cpu: "500m" + memory: "1536Mi" + requests: + cpu: "300m" + memory: "1536Mi" + +jobrunner: + replicas: 5 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "1000m" + memory: "6144Mi" + +logstash: + replicas: 1 + hubMaxMemory: "3687m" + resources: + limits: + cpu: "1000m" + memory: "4096Mi" + requests: + cpu: "700m" + memory: "4096Mi" + +matchengine: + replicas: 9 + hubMaxMemory: "9216m" + resources: + limits: + cpu: "1000m" + memory: "10240Mi" + requests: + cpu: "700m" + memory: "10240Mi" + +postgres: + replicas: 1 + resources: + limits: + cpu: "22000m" + memory: "88Gi" + requests: + cpu: "18000m" + memory: "88Gi" + +postgresUpgrader: + resources: + limits: + cpu: "2000m" + memory: "4Gi" + requests: + cpu: "1000m" + memory: "4Gi" + +postgresWaiter: + resources: + limits: + cpu: "250m" + memory: "500Mi" + requests: + cpu: "250m" + memory: "500Mi" + +rabbitmq: + replicas: 1 + resources: + limits: + cpu: "1000m" + memory: "2048Mi" + requests: + cpu: "500m" + memory: "1433Mi" + +redis: + replicas: 1 + resources: + limits: + cpu: "1000m" + memory: "5120Mi" + requests: + cpu: "500m" + memory: "5120Mi" + +registration: + replicas: 1 + hubMaxMemory: "2765m" + resources: + limits: + cpu: "700m" + memory: "3072Mi" + requests: + cpu: "500m" + memory: "3072Mi" + +scan: + replicas: 10 + hubMaxMemory: "13824m" + resources: + limits: + cpu: "1000m" + memory: "15360Mi" + requests: + cpu: "700m" + memory: "15360Mi" + +storage: + replicas: 1 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "700m" + memory: "5144Mi" + +uploadcache: + replicas: 1 + resources: + limits: + cpu: "600m" + memory: "1536Mi" + requests: + cpu: "300m" + memory: "1024Mi" + +webapp: + replicas: 1 + hubMaxMemory: "18432m" + dbPoolMaxActive: 64 + resources: + limits: + cpu: "6000m" + memory: "20480Mi" + requests: + cpu: "3000m" + memory: "15360Mi" + +webserver: + replicas: 1 + resources: + limits: + cpu: "600m" + memory: "2048Mi" + requests: + cpu: "400m" + memory: "1024Mi" + +webui: + replicas: 1 + resources: + limits: + cpu: "600m" + memory: "1536Mi" + requests: + cpu: "300m" + memory: "1024Mi" diff --git a/kubernetes/blackduck/sizes-gen04/10sph.yaml b/kubernetes/blackduck/sizes-gen04/10sph.yaml new file mode 100644 index 0000000..92a64c8 --- /dev/null +++ b/kubernetes/blackduck/sizes-gen04/10sph.yaml @@ -0,0 +1,208 @@ +environs: + SCANNER_CONCURRENCY: "1" + BLACKDUCK_REDIS_MAXMEMORY: "900mb" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/10sph.yaml" + HUB_PG_SHARED_BUFFERS: "2653MB" + HUB_PG_EFFECTIVE_CACHE_SIZE: "3185MB" + HUB_PG_AUTOVACUUM_MAX_WORKERS: 4 + HUB_PG_MAINTENANCE_WORK_MEM: "512MB" + HUB_PG_MAX_CONNECTIONS: 400 + HUB_PG_WORK_MEM: "50MB" + +authentication: + replicas: 1 + hubMaxMemory: "1106m" + resources: + limits: + cpu: "500m" + memory: "1229Mi" + requests: + cpu: "300m" + memory: "1229Mi" + +bomengine: + replicas: 1 + hubMaxMemory: "4148m" + resources: + limits: + cpu: "1000m" + memory: "4608Mi" + requests: + cpu: "700m" + memory: "4608Mi" + +cfssl: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "260Mi" + requests: + cpu: "200m" + memory: "260Mi" + +documentation: + replicas: 1 + hubMaxMemory: "922m" + resources: + limits: + cpu: "500m" + memory: "1024Mi" + requests: + cpu: "200m" + memory: "1024Mi" + +jobrunner: + replicas: 1 + hubMaxMemory: "4240m" + resources: + limits: + cpu: "1500m" + memory: "4710Mi" + requests: + cpu: "1000m" + memory: "4710Mi" + +logstash: + replicas: 1 + hubMaxMemory: "1106m" + resources: + limits: + cpu: "500m" + memory: "1229Mi" + requests: + cpu: "300m" + memory: "1229Mi" + +matchengine: + replicas: 1 + hubMaxMemory: "4608m" + resources: + limits: + cpu: "1000m" + memory: "5120Mi" + requests: + cpu: "700m" + memory: "5120Mi" + +postgres: + replicas: 1 + resources: + limits: + cpu: "2000m" + memory: "8Gi" + requests: + cpu: "1000m" + memory: "8Gi" + +postgresUpgrader: + resources: + limits: + cpu: "2000m" + memory: "4Gi" + requests: + cpu: "1000m" + memory: "4Gi" + +postgresWaiter: + resources: + limits: + cpu: "250m" + memory: "500Mi" + requests: + cpu: "250m" + memory: "500Mi" + +rabbitmq: + replicas: 1 + resources: + limits: + cpu: "500m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "307Mi" + +redis: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "1024Mi" + requests: + cpu: "200m" + memory: "512Mi" + +registration: + replicas: 1 + hubMaxMemory: "922m" + resources: + limits: + cpu: "300m" + memory: "1024Mi" + requests: + cpu: "200m" + memory: "1024Mi" + +scan: + replicas: 1 + hubMaxMemory: "4608m" + resources: + limits: + cpu: "1000m" + memory: "5120Mi" + requests: + cpu: "500m" + memory: "5120Mi" + +storage: + replicas: 1 + hubMaxMemory: "1024m" + resources: + limits: + cpu: "1000m" + memory: "2048Mi" + requests: + cpu: "700m" + memory: "2048Mi" + +uploadcache: + replicas: 1 + resources: + limits: + cpu: "200m" + memory: "512Mi" + requests: + cpu: "100m" + memory: "512Mi" + +webapp: + replicas: 1 + hubMaxMemory: "3226m" + resources: + limits: + cpu: "2000m" + memory: "3584Mi" + requests: + cpu: "700m" + memory: "3584Mi" + +webserver: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "512Mi" + +webui: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "512Mi" diff --git a/kubernetes/blackduck/sizes-gen04/120sph.yaml b/kubernetes/blackduck/sizes-gen04/120sph.yaml new file mode 100644 index 0000000..d08b51b --- /dev/null +++ b/kubernetes/blackduck/sizes-gen04/120sph.yaml @@ -0,0 +1,208 @@ +environs: + SCANNER_CONCURRENCY: "1" + BLACKDUCK_REDIS_MAXMEMORY: "900mb" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/120sph.yaml" + HUB_PG_SHARED_BUFFERS: "5336MB" + HUB_PG_EFFECTIVE_CACHE_SIZE: "6404MB" + HUB_PG_AUTOVACUUM_MAX_WORKERS: 4 + HUB_PG_MAINTENANCE_WORK_MEM: "512MB" + HUB_PG_MAX_CONNECTIONS: 400 + HUB_PG_WORK_MEM: "50MB" + +authentication: + replicas: 1 + hubMaxMemory: "1843m" + resources: + limits: + cpu: "500m" + memory: "2048Mi" + requests: + cpu: "300m" + memory: "1638Mi" + +bomengine: + replicas: 1 + hubMaxMemory: "5000m" + resources: + limits: + cpu: "1000m" + memory: "5600Mi" + requests: + cpu: "700m" + memory: "4608Mi" + +cfssl: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "260Mi" + requests: + cpu: "200m" + memory: "260Mi" + +documentation: + replicas: 1 + hubMaxMemory: "922m" + resources: + limits: + cpu: "500m" + memory: "1024Mi" + requests: + cpu: "200m" + memory: "1024Mi" + +jobrunner: + replicas: 1 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "1000m" + memory: "6144Mi" + +logstash: + replicas: 1 + hubMaxMemory: "2185m" + resources: + limits: + cpu: "800m" + memory: "2428Mi" + requests: + cpu: "500m" + memory: "1741Mi" + +matchengine: + replicas: 2 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "1000m" + memory: "6144Mi" + +postgres: + replicas: 1 + resources: + limits: + cpu: "4000m" + memory: "16Gi" + requests: + cpu: "2000m" + memory: "16Gi" + +postgresUpgrader: + resources: + limits: + cpu: "2000m" + memory: "4Gi" + requests: + cpu: "1000m" + memory: "4Gi" + +postgresWaiter: + resources: + limits: + cpu: "250m" + memory: "500Mi" + requests: + cpu: "250m" + memory: "500Mi" + +rabbitmq: + replicas: 1 + resources: + limits: + cpu: "500m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "307Mi" + +redis: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "1024Mi" + requests: + cpu: "200m" + memory: "512Mi" + +registration: + replicas: 1 + hubMaxMemory: "1200m" + resources: + limits: + cpu: "300m" + memory: "1331Mi" + requests: + cpu: "200m" + memory: "1331Mi" + +scan: + replicas: 1 + hubMaxMemory: "9216m" + resources: + limits: + cpu: "1000m" + memory: "10240Mi" + requests: + cpu: "700m" + memory: "10240Mi" + +storage: + replicas: 1 + hubMaxMemory: "2304m" + resources: + limits: + cpu: "1000m" + memory: "2560Mi" + requests: + cpu: "700m" + memory: "1024Mi" + +uploadcache: + replicas: 1 + resources: + limits: + cpu: "200m" + memory: "512Mi" + requests: + cpu: "100m" + memory: "512Mi" + +webapp: + replicas: 1 + hubMaxMemory: "3608m" + resources: + limits: + cpu: "1000m" + memory: "4048Mi" + requests: + cpu: "1000m" + memory: "4048Mi" + +webserver: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "512Mi" + +webui: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "512Mi" diff --git a/kubernetes/blackduck/sizes-gen04/1500sph.yaml b/kubernetes/blackduck/sizes-gen04/1500sph.yaml new file mode 100644 index 0000000..d4098fe --- /dev/null +++ b/kubernetes/blackduck/sizes-gen04/1500sph.yaml @@ -0,0 +1,209 @@ +environs: + SCANNER_CONCURRENCY: "1" + BLACKDUCK_REDIS_MAXMEMORY: "7373mb" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/1500sph.yaml" + HUB_PG_SHARED_BUFFERS: "34878MB" + HUB_PG_EFFECTIVE_CACHE_SIZE: "41854MB" + HUB_PG_AUTOVACUUM_MAX_WORKERS: 8 + HUB_PG_MAINTENANCE_WORK_MEM: "4096MB" + HUB_PG_MAX_CONNECTIONS: 800 + HUB_PG_WORK_MEM: "58MB" + +authentication: + replicas: 1 + hubMaxMemory: "1844m" + resources: + limits: + cpu: "700m" + memory: "2048Mi" + requests: + cpu: "500m" + memory: "2048Mi" + +bomengine: + replicas: 8 + hubMaxMemory: "4608m" + resources: + limits: + cpu: "1000m" + memory: "5120Mi" + requests: + cpu: "1000m" + memory: "5120Mi" + +cfssl: + replicas: 1 + resources: + limits: + cpu: "500m" + memory: "1024Mi" + requests: + cpu: "300m" + memory: "1024Mi" + +documentation: + replicas: 1 + hubMaxMemory: "1383m" + resources: + limits: + cpu: "500m" + memory: "1536Mi" + requests: + cpu: "300m" + memory: "1536Mi" + +jobrunner: + replicas: 6 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "1000m" + memory: "6144Mi" + +logstash: + replicas: 1 + hubMaxMemory: "3687m" + resources: + limits: + cpu: "1000m" + memory: "4096Mi" + requests: + cpu: "700m" + memory: "4096Mi" + +matchengine: + replicas: 12 + hubMaxMemory: "9216m" + resources: + limits: + cpu: "1000m" + memory: "10240Mi" + requests: + cpu: "700m" + memory: "10240Mi" + +postgres: + replicas: 1 + resources: + limits: + cpu: "26000m" + memory: "104Gi" + requests: + cpu: "20000m" + memory: "104Gi" + +postgresUpgrader: + resources: + limits: + cpu: "2000m" + memory: "4Gi" + requests: + cpu: "1000m" + memory: "4Gi" + +postgresWaiter: + resources: + limits: + cpu: "250m" + memory: "500Mi" + requests: + cpu: "250m" + memory: "500Mi" + +rabbitmq: + replicas: 1 + resources: + limits: + cpu: "1000m" + memory: "3072Mi" + requests: + cpu: "500m" + memory: "1433Mi" + +redis: + replicas: 1 + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "500m" + memory: "5120Mi" + +registration: + replicas: 1 + hubMaxMemory: "2765m" + resources: + limits: + cpu: "700m" + memory: "3072Mi" + requests: + cpu: "500m" + memory: "3072Mi" + +scan: + replicas: 13 + hubMaxMemory: "13824m" + resources: + limits: + cpu: "1000m" + memory: "15360Mi" + requests: + cpu: "700m" + memory: "15360Mi" + +storage: + replicas: 1 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "700m" + memory: "3072Mi" + +uploadcache: + replicas: 1 + resources: + limits: + cpu: "600m" + memory: "1536Mi" + requests: + cpu: "300m" + memory: "1024Mi" + +webapp: + replicas: 1 + hubMaxMemory: "18432m" + dbPoolMaxActive: 64 + resources: + limits: + cpu: "6000m" + memory: "20480Mi" + requests: + cpu: "3000m" + memory: "15360Mi" + +webserver: + replicas: 1 + resources: + limits: + cpu: "600m" + memory: "2048Mi" + requests: + cpu: "400m" + memory: "1024Mi" + +webui: + replicas: 1 + resources: + limits: + cpu: "600m" + memory: "1536Mi" + requests: + cpu: "300m" + memory: "1024Mi" diff --git a/kubernetes/blackduck/sizes-gen04/2000sph.yaml b/kubernetes/blackduck/sizes-gen04/2000sph.yaml new file mode 100644 index 0000000..00d1d88 --- /dev/null +++ b/kubernetes/blackduck/sizes-gen04/2000sph.yaml @@ -0,0 +1,209 @@ +environs: + SCANNER_CONCURRENCY: "1" + BLACKDUCK_REDIS_MAXMEMORY: "9216mb" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/2000sph.yaml" + HUB_PG_SHARED_BUFFERS: "42974MB" + HUB_PG_EFFECTIVE_CACHE_SIZE: "51569MB" + HUB_PG_AUTOVACUUM_MAX_WORKERS: 8 + HUB_PG_MAINTENANCE_WORK_MEM: "4096MB" + HUB_PG_MAX_CONNECTIONS: 800 + HUB_PG_WORK_MEM: "58MB" + +authentication: + replicas: 1 + hubMaxMemory: "2765m" + resources: + limits: + cpu: "1000m" + memory: "3072Mi" + requests: + cpu: "500m" + memory: "2048Mi" + +bomengine: + replicas: 10 + hubMaxMemory: "4608m" + resources: + limits: + cpu: "1000m" + memory: "5120Mi" + requests: + cpu: "1000m" + memory: "5120Mi" + +cfssl: + replicas: 1 + resources: + limits: + cpu: "500m" + memory: "1024Mi" + requests: + cpu: "300m" + memory: "1024Mi" + +documentation: + replicas: 1 + hubMaxMemory: "1383m" + resources: + limits: + cpu: "500m" + memory: "1536Mi" + requests: + cpu: "300m" + memory: "1536Mi" + +jobrunner: + replicas: 8 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "1000m" + memory: "6144Mi" + +logstash: + replicas: 1 + hubMaxMemory: "3687m" + resources: + limits: + cpu: "1000m" + memory: "4096Mi" + requests: + cpu: "700m" + memory: "4096Mi" + +matchengine: + replicas: 15 + hubMaxMemory: "9216m" + resources: + limits: + cpu: "1000m" + memory: "10240Mi" + requests: + cpu: "700m" + memory: "10240Mi" + +postgres: + replicas: 1 + resources: + limits: + cpu: "32000m" + memory: "128Gi" + requests: + cpu: "24000m" + memory: "128Gi" + +postgresUpgrader: + resources: + limits: + cpu: "2000m" + memory: "4Gi" + requests: + cpu: "1000m" + memory: "4Gi" + +postgresWaiter: + resources: + limits: + cpu: "250m" + memory: "500Mi" + requests: + cpu: "250m" + memory: "500Mi" + +rabbitmq: + replicas: 1 + resources: + limits: + cpu: "1000m" + memory: "3072Mi" + requests: + cpu: "500m" + memory: "1433Mi" + +redis: + replicas: 1 + resources: + limits: + cpu: "1000m" + memory: "10240Mi" + requests: + cpu: "500m" + memory: "5120Mi" + +registration: + replicas: 1 + hubMaxMemory: "2765m" + resources: + limits: + cpu: "700m" + memory: "3072Mi" + requests: + cpu: "500m" + memory: "3072Mi" + +scan: + replicas: 16 + hubMaxMemory: "13824m" + resources: + limits: + cpu: "1000m" + memory: "15360Mi" + requests: + cpu: "700m" + memory: "15360Mi" + +storage: + replicas: 1 + hubMaxMemory: "9100m" + resources: + limits: + cpu: "1000m" + memory: "10240Mi" + requests: + cpu: "700m" + memory: "3072Mi" + +uploadcache: + replicas: 1 + resources: + limits: + cpu: "600m" + memory: "1536Mi" + requests: + cpu: "300m" + memory: "1024Mi" + +webapp: + replicas: 1 + hubMaxMemory: "18432m" + dbPoolMaxActive: 64 + resources: + limits: + cpu: "6000m" + memory: "20480Mi" + requests: + cpu: "3000m" + memory: "15360Mi" + +webserver: + replicas: 1 + resources: + limits: + cpu: "600m" + memory: "2048Mi" + requests: + cpu: "400m" + memory: "1024Mi" + +webui: + replicas: 1 + resources: + limits: + cpu: "600m" + memory: "1536Mi" + requests: + cpu: "300m" + memory: "1024Mi" diff --git a/kubernetes/blackduck/sizes-gen04/250sph.yaml b/kubernetes/blackduck/sizes-gen04/250sph.yaml new file mode 100644 index 0000000..cff8d05 --- /dev/null +++ b/kubernetes/blackduck/sizes-gen04/250sph.yaml @@ -0,0 +1,208 @@ +environs: + SCANNER_CONCURRENCY: "1" + BLACKDUCK_REDIS_MAXMEMORY: "1844mb" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/250sph.yaml" + HUB_PG_SHARED_BUFFERS: "8016MB" + HUB_PG_EFFECTIVE_CACHE_SIZE: "9619MB" + HUB_PG_AUTOVACUUM_MAX_WORKERS: 6 + HUB_PG_MAINTENANCE_WORK_MEM: "1024MB" + HUB_PG_MAX_CONNECTIONS: 500 + HUB_PG_WORK_MEM: "35MB" + +authentication: + replicas: 1 + hubMaxMemory: "1843m" + resources: + limits: + cpu: "500m" + memory: "2048Mi" + requests: + cpu: "300m" + memory: "1638Mi" + +bomengine: + replicas: 1 + hubMaxMemory: "5000m" + resources: + limits: + cpu: "1000m" + memory: "5600Mi" + requests: + cpu: "700m" + memory: "4608Mi" + +cfssl: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "260Mi" + requests: + cpu: "200m" + memory: "260Mi" + +documentation: + replicas: 1 + hubMaxMemory: "922m" + resources: + limits: + cpu: "500m" + memory: "1024Mi" + requests: + cpu: "200m" + memory: "1024Mi" + +jobrunner: + replicas: 2 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "1000m" + memory: "6144Mi" + +logstash: + replicas: 1 + hubMaxMemory: "2765m" + resources: + limits: + cpu: "1000m" + memory: "3072Mi" + requests: + cpu: "500m" + memory: "2048Mi" + +matchengine: + replicas: 3 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "1000m" + memory: "6144Mi" + +postgres: + replicas: 1 + resources: + limits: + cpu: "6000m" + memory: "24Gi" + requests: + cpu: "3000m" + memory: "24Gi" + +postgresUpgrader: + resources: + limits: + cpu: "2000m" + memory: "4Gi" + requests: + cpu: "1000m" + memory: "4Gi" + +postgresWaiter: + resources: + limits: + cpu: "250m" + memory: "500Mi" + requests: + cpu: "250m" + memory: "500Mi" + +rabbitmq: + replicas: 1 + resources: + limits: + cpu: "500m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "307Mi" + +redis: + replicas: 1 + resources: + limits: + cpu: "500m" + memory: "2048Mi" + requests: + cpu: "200m" + memory: "512Mi" + +registration: + replicas: 1 + hubMaxMemory: "1200m" + resources: + limits: + cpu: "300m" + memory: "1331Mi" + requests: + cpu: "200m" + memory: "1331Mi" + +scan: + replicas: 2 + hubMaxMemory: "9216m" + resources: + limits: + cpu: "1000m" + memory: "10240Mi" + requests: + cpu: "700m" + memory: "10240Mi" + +storage: + replicas: 1 + hubMaxMemory: "2765m" + resources: + limits: + cpu: "1000m" + memory: "3072Mi" + requests: + cpu: "700m" + memory: "2048Mi" + +uploadcache: + replicas: 1 + resources: + limits: + cpu: "200m" + memory: "512Mi" + requests: + cpu: "100m" + memory: "512Mi" + +webapp: + replicas: 1 + hubMaxMemory: "4608m" + resources: + limits: + cpu: "2000m" + memory: "5120Mi" + requests: + cpu: "1000m" + memory: "5120Mi" + +webserver: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "512Mi" + +webui: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "512Mi" diff --git a/kubernetes/blackduck/sizes-gen04/500sph.yaml b/kubernetes/blackduck/sizes-gen04/500sph.yaml new file mode 100644 index 0000000..1ea5580 --- /dev/null +++ b/kubernetes/blackduck/sizes-gen04/500sph.yaml @@ -0,0 +1,208 @@ +environs: + SCANNER_CONCURRENCY: "1" + BLACKDUCK_REDIS_MAXMEMORY: "3687mb" + BLACKDUCK_DEPLOYMENT_BASE_SIZE: "sizes-gen04/500sph.yaml" + HUB_PG_SHARED_BUFFERS: "21439MB" + HUB_PG_EFFECTIVE_CACHE_SIZE: "25727MB" + HUB_PG_AUTOVACUUM_MAX_WORKERS: 6 + HUB_PG_MAINTENANCE_WORK_MEM: "1024MB" + HUB_PG_MAX_CONNECTIONS: 500 + HUB_PG_WORK_MEM: "35MB" + +authentication: + replicas: 1 + hubMaxMemory: "1843m" + resources: + limits: + cpu: "500m" + memory: "2048Mi" + requests: + cpu: "300m" + memory: "1638Mi" + +bomengine: + replicas: 2 + hubMaxMemory: "4608m" + resources: + limits: + cpu: "1000m" + memory: "5120Mi" + requests: + cpu: "1000m" + memory: "5120Mi" + +cfssl: + replicas: 1 + resources: + limits: + cpu: "300m" + memory: "512Mi" + requests: + cpu: "200m" + memory: "260Mi" + +documentation: + replicas: 1 + hubMaxMemory: "922m" + resources: + limits: + cpu: "500m" + memory: "1024Mi" + requests: + cpu: "200m" + memory: "1024Mi" + +jobrunner: + replicas: 3 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "1000m" + memory: "6144Mi" + +logstash: + replicas: 1 + hubMaxMemory: "2765m" + resources: + limits: + cpu: "1000m" + memory: "3072Mi" + requests: + cpu: "500m" + memory: "2048Mi" + +matchengine: + replicas: 4 + hubMaxMemory: "7373m" + resources: + limits: + cpu: "1000m" + memory: "8192Mi" + requests: + cpu: "1000m" + memory: "6144Mi" + +postgres: + replicas: 1 + resources: + limits: + cpu: "16000m" + memory: "64Gi" + requests: + cpu: "10000m" + memory: "64Gi" + +postgresUpgrader: + resources: + limits: + cpu: "2000m" + memory: "4Gi" + requests: + cpu: "1000m" + memory: "4Gi" + +postgresWaiter: + resources: + limits: + cpu: "250m" + memory: "500Mi" + requests: + cpu: "250m" + memory: "500Mi" + +rabbitmq: + replicas: 1 + resources: + limits: + cpu: "500m" + memory: "1024Mi" + requests: + cpu: "300m" + memory: "512Mi" + +redis: + replicas: 1 + resources: + limits: + cpu: "1000m" + memory: "4096Mi" + requests: + cpu: "500m" + memory: "4096Mi" + +registration: + replicas: 1 + hubMaxMemory: "1844m" + resources: + limits: + cpu: "500m" + memory: "2048Mi" + requests: + cpu: "300m" + memory: "2048Mi" + +scan: + replicas: 4 + hubMaxMemory: "9216m" + resources: + limits: + cpu: "1000m" + memory: "10240Mi" + requests: + cpu: "700m" + memory: "10240Mi" + +storage: + replicas: 1 + hubMaxMemory: "3687m" + resources: + limits: + cpu: "1000m" + memory: "4096Mi" + requests: + cpu: "700m" + memory: "3072Mi" + +uploadcache: + replicas: 1 + resources: + limits: + cpu: "400m" + memory: "1024Mi" + requests: + cpu: "200m" + memory: "512Mi" + +webapp: + replicas: 1 + hubMaxMemory: "5530m" + resources: + limits: + cpu: "3000m" + memory: "6144Mi" + requests: + cpu: "2000m" + memory: "6144Mi" + +webserver: + replicas: 1 + resources: + limits: + cpu: "400m" + memory: "1024Mi" + requests: + cpu: "300m" + memory: "512Mi" + +webui: + replicas: 1 + resources: + limits: + cpu: "400m" + memory: "1024Mi" + requests: + cpu: "300m" + memory: "512Mi" diff --git a/kubernetes/blackduck/values.ubi.yaml b/kubernetes/blackduck/values.ubi.yaml index 591d987..bf96817 100644 --- a/kubernetes/blackduck/values.ubi.yaml +++ b/kubernetes/blackduck/values.ubi.yaml @@ -8,7 +8,7 @@ fullnameOverride: isKubernetes: true isAzure: false -imageTag: "2023.10.0" +imageTag: "2023.10.1" # Docker registry to pull Black Duck images registry: docker.io/blackducksoftware @@ -174,7 +174,7 @@ postgres: podSecurityContext: {} securityContext: {} resources: {} - imageTag: 14-1.16_ubi8.8 + imageTag: 14-1.17_ubi8.8 ### Postgres main data volume # pvc related parameters for postgres container. set if you want to create your own PVC persistentVolumeClaimName: @@ -202,7 +202,7 @@ postgresUpgrader: securityContext: {} podSecurityContext: {} resources: {} - imageTag: 14-1.1_ubi8.8 + imageTag: 14-1.2_ubi8.8 imagePullPolicy: IfNotPresent postgresWaiter: @@ -229,7 +229,7 @@ authentication: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 # pvc related parameters for authentication container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -276,7 +276,7 @@ bomengine: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 dbPoolMaxActive: affinity: {} nodeSelector: {} @@ -316,7 +316,7 @@ documentation: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 nodeSelector: {} tolerations: [] affinity: {} @@ -332,7 +332,7 @@ jobrunner: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -375,7 +375,7 @@ redis: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 tlsEnabled: false maxTotal: 128 maxIdle: 128 @@ -395,7 +395,7 @@ registration: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 # pvc related parameters for registration container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -423,7 +423,7 @@ scan: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -441,7 +441,7 @@ storage: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 # PVC related parameters for storage cache container. # If you want to use already existing persistance volume for blackduck tools & reports storage, use this option to configure the existing pvc name. persistentVolumeClaimName: @@ -492,7 +492,7 @@ webapp: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 # pvc related parameters for webapp container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -554,7 +554,7 @@ webserver: webui: # override the docker registry at container level registry: - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 nodeSelector: {} tolerations: [] affinity: {} @@ -580,7 +580,7 @@ matchengine: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -599,7 +599,7 @@ integration: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0_ubi8.8 + imageTag: 2023.10.1_ubi8.8 dbPoolMaxActive: affinity: {} nodeSelector: {} diff --git a/kubernetes/blackduck/values.yaml b/kubernetes/blackduck/values.yaml index e7eed96..09ff7b0 100644 --- a/kubernetes/blackduck/values.yaml +++ b/kubernetes/blackduck/values.yaml @@ -8,7 +8,7 @@ fullnameOverride: isKubernetes: true isAzure: false -imageTag: "2023.10.0" +imageTag: "2023.10.1" # Docker registry to pull Black Duck images registry: docker.io/blackducksoftware @@ -174,7 +174,7 @@ postgres: podSecurityContext: {} securityContext: {} resources: {} - imageTag: 14-1.16 + imageTag: 14-1.17 ### Postgres main data volume # pvc related parameters for postgres container. set if you want to create your own PVC persistentVolumeClaimName: @@ -202,7 +202,7 @@ postgresUpgrader: securityContext: {} podSecurityContext: {} resources: {} - imageTag: 14-1.1 + imageTag: 14-1.2 imagePullPolicy: IfNotPresent postgresWaiter: @@ -229,7 +229,7 @@ authentication: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 # pvc related parameters for authentication container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -276,7 +276,7 @@ bomengine: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 dbPoolMaxActive: affinity: {} nodeSelector: {} @@ -316,7 +316,7 @@ documentation: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 nodeSelector: {} tolerations: [] affinity: {} @@ -332,7 +332,7 @@ jobrunner: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -375,7 +375,7 @@ redis: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 tlsEnabled: false maxTotal: 128 maxIdle: 128 @@ -395,7 +395,7 @@ registration: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 # pvc related parameters for registration container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -423,7 +423,7 @@ scan: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -441,7 +441,7 @@ storage: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 # PVC related parameters for storage cache container. # If you want to use already existing persistance volume for blackduck tools & reports storage, use this option to configure the existing pvc name. persistentVolumeClaimName: @@ -492,7 +492,7 @@ webapp: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 # pvc related parameters for webapp container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -554,7 +554,7 @@ webserver: webui: # override the docker registry at container level registry: - imageTag: 2023.10.0 + imageTag: 2023.10.1 nodeSelector: {} tolerations: [] affinity: {} @@ -580,7 +580,7 @@ matchengine: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -599,7 +599,7 @@ integration: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.10.0 + imageTag: 2023.10.1 dbPoolMaxActive: affinity: {} nodeSelector: {}