Release 2021.2.1

blackducksoftware · Mar 30, 2021 · d235fcf · d235fcf
1 parent 58bfdad
commit d235fcf
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 38 deletions.
diff --git 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 2021.2.0 archive:
+## Location of Black Duck 2021.2.1 archive:
 
-https://github.com/blackducksoftware/hub/archive/v2021.2.0.tar.gz
+https://github.com/blackducksoftware/hub/archive/v2021.2.1.tar.gz
 
 NOTE:
 

diff --git a/docker-swarm/bin/system_check.sh b/docker-swarm/bin/system_check.sh
@@ -34,7 +34,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:-2021.2.0}"
+readonly HUB_VERSION="${HUB_VERSION:-2021.2.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}"
@@ -58,7 +58,7 @@ readonly REQ_RAM_GB_REDIS_SENTINEL=3    # Additional memory required for redis s
 readonly REQ_MEM_ALERT=2560
 readonly REQ_MEM_ALERT_DATABASE=2560
 readonly REQ_MEM_AUTHENTICATION=1024
-readonly REQ_MEM_BOMENGINE=4680
+readonly REQ_MEM_BOMENGINE=4608
 readonly REQ_MEM_BINARYSCANNER_CS=2048  # docker-compose, docker-swarm
 #readonly REQ_MEM_BINARYSCANNER_K=4608   # kubernetes
 readonly REQ_MEM_CFSSL_C=512            # docker-compose
@@ -91,17 +91,17 @@ readonly REQ_MEM_WEBSERVER_SK=512       # docker-swarm, kubernetes
 declare -A MEM_SIZES=(
     # [SERVICE] = "small medium large" # in MB
     #[hub_authentication]="1024 1024 1024"
-    [hub_bomengine]="4608 7168 13824"
+    [hub_bomengine]="4096 7168 13824"
     #[hub_cfssl]="640 640 640"
     #[hub_documentation]="512 512 512"
-    [hub_jobrunner]="4608 7168 13824"
+    [hub_jobrunner]="4096 7168 13824"
     #? [hub_kb]="768 2048 4096" # kubernetes small is 1024, but reduced to match default yaml
     #[hub_rabbitmq]="1024 1024 1024"
     #[hub_redis]="1024 1024 1024"
     #[hub_registration]="1024 1024 1024"
-    [hub_scan]="2560 5120 9728"
+    [hub_scan]="2048 5120 9728"
     #[hub_uploadcache]="512 512 512"
-    [hub_webapp]="2560 6144 10752" # recommended small is 3584, but reduced to match default yaml
+    [hub_webapp]="2048 6144 10752"
     [hub_webserver]="512 2048 2048"
 )
 declare -A REPLICA_SIZES=(

diff --git a/docker-swarm/blackduck-config.env b/docker-swarm/blackduck-config.env
@@ -22,7 +22,7 @@ BLACKDUCK_CORS_EXPOSED_HEADERS_PROP_NAME=
 
 # Do not change
 HUB_PRODUCT_NAME=BLACK_DUCK
-HUB_VERSION=2021.2.0
+HUB_VERSION=2021.2.1
 
 # Specify any property-specific overrides here
 #
@@ -108,5 +108,5 @@ BLACKDUCK_REDIS_SENTINEL_PARALLEL_SYNCS=1
 
 # RabbitMQ Configuration
 RABBITMQ_CTL_ERL_ARGS=-proto_dist inet_tls
-# This cookie value needs to be constant across multiple RabbitMQ nodes, do not change. 
+# This cookie value needs to be constant across multiple RabbitMQ nodes, do not change.
 RABBITMQ_ERLANG_COOKIE=lBbdbhTTv63bsM0hXDEzaMhpfKlw4D4t
diff --git a/docker-swarm/docker-compose.externaldb.yml b/docker-swarm/docker-compose.externaldb.yml
@@ -6,7 +6,7 @@ version: '3.6'
 services:
   authentication:
     user: authentication:root
-    image: blackducksoftware/blackduck-authentication:2021.2.0
+    image: blackducksoftware/blackduck-authentication:2021.2.1
     volumes:
     - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
     - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
@@ -30,7 +30,7 @@ services:
         reservations: {memory: 1024M}
   webapp:
     user: webapp:root
-    image: blackducksoftware/blackduck-webapp:2021.2.0
+    image: blackducksoftware/blackduck-webapp:2021.2.1
     volumes:
     - log-volume:/opt/blackduck/hub/logs
     - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
@@ -54,7 +54,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   scan:
     user: scan:root
-    image: blackducksoftware/blackduck-scan:2021.2.0
+    image: blackducksoftware/blackduck-scan:2021.2.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',
@@ -77,7 +77,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   jobrunner:
     user: jobrunner:root
-    image: blackducksoftware/blackduck-jobrunner:2021.2.0
+    image: blackducksoftware/blackduck-jobrunner:2021.2.1
     env_file: [blackduck-config.env , hub-postgres.env]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -132,7 +132,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2021.2.0
+    image: blackducksoftware/blackduck-registration:2021.2.1
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -175,7 +175,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   documentation:
-    image: blackducksoftware/blackduck-documentation:2021.2.0
+    image: blackducksoftware/blackduck-documentation:2021.2.1
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -216,7 +216,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2021.2.0
+    image: blackducksoftware/blackduck-redis:2021.2.1
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -238,9 +238,10 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2021.2.0
+    image: blackducksoftware/blackduck-bomengine:2021.2.1
     env_file: [blackduck-config.env , hub-postgres.env]
     environment:
+      HUB_MAX_MEMORY: 4096m
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
@@ -256,7 +257,7 @@ services:
         mode: replicated
         restart_policy: {condition: on-failure, delay: 5s, window: 60s}
         resources:
-          limits: {memory: 4680M}
+          limits: {memory: 4608M}
           reservations: {memory: 1536M}
   rabbitmq:
     image: blackducksoftware/rabbitmq:1.2.2

diff --git 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:2021.2.0
+    image: blackducksoftware/blackduck-redis:2021.2.1
     env_file: [blackduck-config.env]
     user: redis:root
     stop_grace_period: 60s
@@ -25,7 +25,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   redissentinel1:
-    image: blackducksoftware/blackduck-redis:2021.2.0
+    image: blackducksoftware/blackduck-redis:2021.2.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:2021.2.0
+    image: blackducksoftware/blackduck-redis:2021.2.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:2021.2.0
+    image: blackducksoftware/blackduck-redis:2021.2.1
     env_file: [blackduck-config.env]
     hostname: redissentinel3
     user: redis:root

diff --git a/docker-swarm/docker-compose.yml b/docker-swarm/docker-compose.yml
@@ -24,7 +24,7 @@ services:
     stop_grace_period: 60s
   authentication:
     user: authentication:root
-    image: blackducksoftware/blackduck-authentication:2021.2.0
+    image: blackducksoftware/blackduck-authentication:2021.2.1
     volumes:
     - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
     - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
@@ -48,7 +48,7 @@ services:
         reservations: {memory: 1024M}
   webapp:
     user: webapp:root
-    image: blackducksoftware/blackduck-webapp:2021.2.0
+    image: blackducksoftware/blackduck-webapp:2021.2.1
     volumes:
     - log-volume:/opt/blackduck/hub/logs
     - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
@@ -72,7 +72,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   scan:
     user: scan:root
-    image: blackducksoftware/blackduck-scan:2021.2.0
+    image: blackducksoftware/blackduck-scan:2021.2.1
     env_file: [blackduck-config.env ]
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
@@ -95,7 +95,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   jobrunner:
     user: jobrunner:root
-    image: blackducksoftware/blackduck-jobrunner:2021.2.0
+    image: blackducksoftware/blackduck-jobrunner:2021.2.1
     env_file: [blackduck-config.env ]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -150,7 +150,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2021.2.0
+    image: blackducksoftware/blackduck-registration:2021.2.1
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -193,7 +193,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   documentation:
-    image: blackducksoftware/blackduck-documentation:2021.2.0
+    image: blackducksoftware/blackduck-documentation:2021.2.1
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -234,7 +234,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2021.2.0
+    image: blackducksoftware/blackduck-redis:2021.2.1
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -256,9 +256,10 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2021.2.0
+    image: blackducksoftware/blackduck-bomengine:2021.2.1
     env_file: [blackduck-config.env ]
     environment:
+      HUB_MAX_MEMORY: 4096m
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
@@ -274,7 +275,7 @@ services:
         mode: replicated
         restart_policy: {condition: on-failure, delay: 5s, window: 60s}
         resources:
-          limits: {memory: 4680M}
+          limits: {memory: 4608M}
           reservations: {memory: 1536M}
   rabbitmq:
     image: blackducksoftware/rabbitmq:1.2.2

diff --git a/docs/en_US/getting_started.pdf b/docs/en_US/getting_started.pdf
diff --git a/docs/en_US/install_kubernetes.pdf b/docs/en_US/install_kubernetes.pdf
diff --git a/docs/en_US/install_openshift.pdf b/docs/en_US/install_openshift.pdf
diff --git a/docs/en_US/install_swarm.pdf b/docs/en_US/install_swarm.pdf
diff --git a/docs/en_US/release_notes.pdf b/docs/en_US/release_notes.pdf
diff --git a/kubernetes/blackduck/Chart.yaml b/kubernetes/blackduck/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 2021.2.0
+appVersion: 2021.2.1
 name: blackduck
 description: Black Duck Helm Chart
-version: 2021.2.0
+version: 2021.2.1
diff --git a/kubernetes/blackduck/README.md b/kubernetes/blackduck/README.md
@@ -210,7 +210,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 | `2021.2.0` |
+| `imageTag` | Version of Black Duck | `2021.2.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/templates/bomengine.yaml b/kubernetes/blackduck/templates/bomengine.yaml
@@ -29,7 +29,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   {{- if eq .Values.status "Running" }}
-  replicas: 1
+  replicas: {{ .Values.bomengine.replicas }}
   {{- else }}
   replicas: 0
   {{- end }}

diff --git a/kubernetes/blackduck/templates/rabbitmq.yaml b/kubernetes/blackduck/templates/rabbitmq.yaml
@@ -134,8 +134,12 @@ spec:
         - containerPort: 5671
           protocol: TCP
         env:
+        {{- if not .Values.isAzure }}
         - name: RABBITMQ_ERLANG_COOKIE
           value: {{ .Values.rabbitmq.erlangCookie | default (randAlphaNum 32) | quote }}
+        {{- end }}
+        - name: RABBITMQ_NODENAME
+          value: rabbitmq@localhost
         resources:
           {{- toYaml .Values.rabbitmq.resources | nindent 12 }}
         {{- with .Values.rabbitmq.securityContext }}
@@ -145,6 +149,8 @@ spec:
         volumeMounts:
         - mountPath: /opt/blackduck/rabbitmq/security
           name: dir-rabbitmq-security
+        - mountPath: /var/lib/rabbitmq
+          name: dir-rabbitmq
       dnsPolicy: ClusterFirst
       {{- include "bd.imagePullSecrets" . | nindent 6 }}
       {{- with .Values.rabbitmq.nodeSelector }}
@@ -172,3 +178,15 @@ spec:
       volumes:
       - emptyDir: {}
         name: dir-rabbitmq-security
+      {{- include "rabbitmqPersistentStorage" . | nindent 6 }}
+
+{{- define "rabbitmqPersistentStorage" -}}
+{{- if .Values.enablePersistentStorage -}}
+- name: dir-rabbitmq
+  persistentVolumeClaim:
+    claimName: {{if .Values.rabbitmq.persistentVolumeClaimName}} {{.Values.rabbitmq.persistentVolumeClaimName}} {{else}} {{ .Release.Name }}-blackduck-rabbitmq {{end}}
+{{- else -}}
+- emptyDir: {}
+  name: dir-rabbitmq
+{{- end -}}
+{{- end -}}
diff --git a/kubernetes/blackduck/values.yaml b/kubernetes/blackduck/values.yaml
@@ -6,8 +6,9 @@ nameOverride:
 fullnameOverride:
 
 isKubernetes: true
+isAzure: false
 
-imageTag: "2021.2.0"
+imageTag: "2021.2.1"
 
 # Docker registry to pull Black Duck images
 registry: docker.io/blackducksoftware
@@ -192,6 +193,7 @@ bomengine:
   podSecurityContext: {}
   securityContext: {}
   tolerations: []
+  replicas: 1
   resources: {}
 
 cfssl:
@@ -250,7 +252,7 @@ rabbitmq:
   registry:
   # override the global imageTag
   imageTag: 1.2.2
-  # pvc related parameters for rabbitmq container. set if you want to create your own PVC (used for migration)
+  # pvc related parameters for rabbitmq container
   persistentVolumeClaimName:
     # PVC claim size
   claimSize: "2Gi"