Release 2021.8.1

Badalshiva · Sep 14, 2021 · 42982a3 · 42982a3
1 parent ca366e7
commit 42982a3
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 40 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.8.0 archive:
+## Location of Black Duck 2021.8.1 archive:
 
-https://github.com/blackducksoftware/hub/archive/v2021.8.0.tar.gz
+https://github.com/blackducksoftware/hub/archive/v2021.8.1.tar.gz
 
 NOTE:
 

diff --git 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:-2021.8.0}"
+readonly HUB_VERSION="${HUB_VERSION:-2021.8.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}"
@@ -175,6 +175,8 @@ readonly NETWORK_TESTS_SKIPPED="*** Network Tests Skipped at command line ***"
 readonly HUB_RESERVED_HOSTNAMES="postgres authentication webapp webui scan jobrunner cfssl logstash \
 registration webserver documentation uploadcache redis bomengine rabbitmq matchengine"
 
+readonly CONTAINERS_WITHOUT_CURL="nginx|postgres|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_BDBA_IMAGES="bdba-worker"
@@ -3142,7 +3144,7 @@ echo_docker_access_url() {
     fi
 
     # Ignore bad URLs as long as the host is reachable.
-    local -r msg="$(docker exec "$container" curl "${curlopts[@]}" -fsSo /dev/null "$url" 2>&1 | grep -aEv '(404 Not Found)')"
+    local -r msg="$(docker exec "$container" curl "${curlopts[@]}" -fsSo /dev/null "$url" 2>&1 | grep -aEv '(404 Not Found|error: 404)')"
     # shellcheck disable=SC2030,SC2031 # False positives; see https://github.com/koalaman/shellcheck/issues/1409
     echo "access $url from ${name}: $(echo_passfail "$([[ -z "$msg" ]]; echo "$?")")" "$msg"
 }
@@ -3185,7 +3187,7 @@ get_container_web_report() {
 
         echo "Checking web access from running Black Duck docker containers to ${url} ... "
         # shellcheck disable=SC2155 # We don't care about the subcommand exit code
-        local container_ids="$(docker container ls | grep -aE "blackducksoftware|sigsynopsys" | grep -aEv "nginx|postgres|alert-database" | cut -d' ' -f1)"
+        local container_ids="$(docker container ls | grep -aE "blackducksoftware|sigsynopsys" | grep -aEv "$CONTAINERS_WITHOUT_CURL" | cut -d' ' -f1)"
         # shellcheck disable=SC2155 # We don't care about the subcommand exit code
         local container_report=$(
             for cur_id in ${container_ids}; do

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.8.0
+HUB_VERSION=2021.8.1
 
 # Specify any property-specific overrides here
 #

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.8.0
+    image: blackducksoftware/blackduck-authentication:2021.8.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.8.0
+    image: blackducksoftware/blackduck-webapp:2021.8.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.8.0
+    image: blackducksoftware/blackduck-scan:2021.8.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.8.0
+    image: blackducksoftware/blackduck-jobrunner:2021.8.1
     env_file: [blackduck-config.env , hub-postgres.env]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -136,7 +136,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2021.8.0
+    image: blackducksoftware/blackduck-registration:2021.8.1
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -179,7 +179,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   webui:
-    image: blackducksoftware/blackduck-webui:2021.8.0
+    image: blackducksoftware/blackduck-webui:2021.8.1
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
         /opt/blackduck/hub/hub-ui/security/root.crt]
@@ -197,7 +197,7 @@ services:
         reservations: {cpus: '0.5', memory: 640M}
 
   documentation:
-    image: blackducksoftware/blackduck-documentation:2021.8.0
+    image: blackducksoftware/blackduck-documentation:2021.8.1
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -238,7 +238,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2021.8.0
+    image: blackducksoftware/blackduck-redis:2021.8.1
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -260,7 +260,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2021.8.0
+    image: blackducksoftware/blackduck-bomengine:2021.8.1
     env_file: [blackduck-config.env , hub-postgres.env]
     environment:
       HUB_MAX_MEMORY: 4096m
@@ -282,7 +282,7 @@ services:
           limits: {memory: 4608M}
           reservations: {memory: 1536M}
   matchengine:
-    image: blackducksoftware/blackduck-matchengine:2021.8.0
+    image: blackducksoftware/blackduck-matchengine:2021.8.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.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.8.0
+    image: blackducksoftware/blackduck-redis:2021.8.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.8.0
+    image: blackducksoftware/blackduck-redis:2021.8.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.8.0
+    image: blackducksoftware/blackduck-redis:2021.8.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.8.0
+    image: blackducksoftware/blackduck-redis:2021.8.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.8.0
+    image: blackducksoftware/blackduck-authentication:2021.8.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.8.0
+    image: blackducksoftware/blackduck-webapp:2021.8.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.8.0
+    image: blackducksoftware/blackduck-scan:2021.8.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.8.0
+    image: blackducksoftware/blackduck-jobrunner:2021.8.1
     env_file: [blackduck-config.env ]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -154,7 +154,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2021.8.0
+    image: blackducksoftware/blackduck-registration:2021.8.1
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -197,7 +197,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   webui:
-    image: blackducksoftware/blackduck-webui:2021.8.0
+    image: blackducksoftware/blackduck-webui:2021.8.1
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
         /opt/blackduck/hub/hub-ui/security/root.crt]
@@ -215,7 +215,7 @@ services:
         reservations: {cpus: '0.5', memory: 640M}
 
   documentation:
-    image: blackducksoftware/blackduck-documentation:2021.8.0
+    image: blackducksoftware/blackduck-documentation:2021.8.1
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -256,7 +256,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2021.8.0
+    image: blackducksoftware/blackduck-redis:2021.8.1
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -278,7 +278,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2021.8.0
+    image: blackducksoftware/blackduck-bomengine:2021.8.1
     env_file: [blackduck-config.env ]
     environment:
       HUB_MAX_MEMORY: 4096m
@@ -300,7 +300,7 @@ services:
           limits: {memory: 4608M}
           reservations: {memory: 1536M}
   matchengine:
-    image: blackducksoftware/blackduck-matchengine:2021.8.0
+    image: blackducksoftware/blackduck-matchengine:2021.8.1
     user: matchengine:root
     healthcheck:
       test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',

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.8.0
+appVersion: 2021.8.1
 name: blackduck
 description: Black Duck Helm Chart
-version: 2021.8.0
+version: 2021.8.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.8.0` |
+| `imageTag` | Version of Black Duck | `2021.8.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/_helpers.tpl b/kubernetes/blackduck/templates/_helpers.tpl
@@ -50,7 +50,7 @@ HUB_PRODUCT_NAME: BLACK_DUCK
 HUB_VERSION: {{ .Values.imageTag }}
 HUB_WEBAPP_HOST: {{ .Release.Name }}-blackduck-webapp
 HUB_WEBSERVER_HOST: {{ .Release.Name }}-blackduck-webserver
-HUB_WEBUI_HOST: {{ .Release.Name }}-blackduck-webui
+HUB_WEBUI_HOST: {{ .Release.Name }}-blackduck-ui
 RABBIT_MQ_HOST: {{ .Release.Name }}-blackduck-rabbitmq
 BLACKDUCK_REDIS_HOST: {{ .Release.Name }}-blackduck-redis
 {{- if eq .Values.isKubernetes true }}

diff --git a/kubernetes/blackduck/templates/webui.yaml b/kubernetes/blackduck/templates/webui.yaml
@@ -1,12 +1,12 @@
-{{- $_ :=  set . "serviceName" "blackduck-webui" }}
+{{- $_ :=  set . "serviceName" "blackduck-ui" }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   labels:
     {{- include "bd.labelsWithoutVersion" . | nindent 4 }}
     component: webui
-  name: {{ .Release.Name }}-blackduck-webui
+  name: {{ .Release.Name }}-blackduck-ui
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
@@ -25,7 +25,7 @@ metadata:
   labels:
     {{- include "bd.labels" . | nindent 4 }}
     component: webui
-  name: {{ .Release.Name }}-blackduck-webui
+  name: {{ .Release.Name }}-blackduck-ui
   namespace: {{ .Release.Namespace }}
 spec:
   {{- if eq .Values.status "Running" }}
@@ -46,7 +46,7 @@ spec:
         component: webui
       annotations:
         checksum/blackduck-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-      name: {{ .Release.Name }}-blackduck-webui
+      name: {{ .Release.Name }}-blackduck-ui
     spec:
       {{- if .Values.enableInitContainer }}
       initContainers:

diff --git a/kubernetes/blackduck/values.yaml b/kubernetes/blackduck/values.yaml
@@ -8,7 +8,7 @@ fullnameOverride:
 isKubernetes: true
 isAzure: false
 
-imageTag: "2021.8.0"
+imageTag: "2021.8.1"
 
 # Docker registry to pull Black Duck images
 registry: docker.io/blackducksoftware
@@ -402,7 +402,7 @@ webserver:
 webui:
   # override the docker registry at container level
   registry:
-  imageTag: 2021.8.0
+  imageTag: 2021.8.1
   nodeSelector: {}
   tolerations: []
   affinity: {}