Merge branch 'development' into 'master'

Development See merge request !58

Merge branch 'development' into 'master'
Development See merge request !58
73b3594c · Andy Maksymowicz · 8b4760fe · b97ecf1d · 73b3594c · 73b3594c
Commit 73b3594c authored Jun 03, 2021 by Andy Maksymowicz
10 changed files
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,8 +42,8 @@ HEALTHCHECK --interval=5m --timeout=3s \
  CMD curl -fsL ${JENKINS_URL}/login || exit 1
 # L-A-B-E-L securitytxt="https://www.cloudbees.com/.well-known/security.txt"
-# L-A-B-E-L release=0ca4417c776c03f0409198deca72eccf45eda162
+# L-A-B-E-L release=11ffc7effdc3514efdf1e667e56d5e1d8b42e281
-# L-A-B-E-L version=2.277.4.4-ra
+# L-A-B-E-L version=2.289.1.2-ra
 COPY files.tar /tmp
 RUN cd / && tar xvf /tmp/files.tar && rm /tmp/files.tar

--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ CloudBees CI (formerly known as _CloudBees Core_) consists of three Docker image
 For each image, all files other than UBI and native packages
 are included in a `files.tar` marked with a SHA-256 checksum.
-A version of CloudBees CI is given in the format `2.277.4.4-ra`
+A version of CloudBees CI is given in the format `2.289.1.2-ra`
 where the first three components are aligned with a Jenkins LTS.
 The Helm chart is coversioned with `core-oc`.
 The `core-mm` image typically shares the same version,
@@ -25,13 +25,13 @@ plus whatever other customizations are desired:
 ```yaml
 OperationsCenter:
  Image:
-    dockerImage: your-registry/core-oc:2.277.4.4-ra
+    dockerImage: your-registry/core-oc:2.289.1.2-ra
 Master:
  Image:
-    dockerImage: your-registry/core-mm:2.277.4.4-ra
+    dockerImage: your-registry/core-mm:2.289.1.2-ra
 Agents:
  Image:
-    dockerImage: your-registry/agent:2.277.4.4-ra
+    dockerImage: your-registry/agent:2.289.1.2-ra
 ```
 and [install via Helm 3](https://docs.cloudbees.com/docs/cloudbees-core/latest/kubernetes-install-guide/installing-kubernetes-using-helm) using the local copy of the chart:

--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
 apiVersion: v1
 name: "cloudbees/core/core-oc"
 tags:
- "2.277.4.4-ra"
+- "2.289.1.2-ra"
 - latest
 labels:
  org.opencontainers.image.title: "core-oc"
@@ -9,7 +9,7 @@ labels:
  org.opencontainers.image.licenses: proprietary
  org.opencontainers.image.url: https://docs.cloudbees.com/docs/cloudbees-ci/
  org.opencontainers.image.vendor: CloudBees
-  org.opencontainers.image.version: "2.277.4.4-ra"
+  org.opencontainers.image.version: "2.289.1.2-ra"
  mil.dso.ironbank.image.keywords: cicd
  mil.dso.ironbank.image.type: commercial
  mil.dso.ironbank.product.name: CloudBees CI
@@ -18,10 +18,10 @@ args:
  BASE_TAG: "1.8.0"
 resources:
 - filename: files.tar
-  url: https://downloads.cloudbees.com/dsop-files/core-oc-files-2398dbecef5aababcad506612dd34501aa40bf988f00bd2ee96c0f4828234f50.tar
+  url: https://downloads.cloudbees.com/dsop-files/core-oc-files-48f811b2596bd78374ffcce9fcd75469824bbf466e948c00f92fe133dcb6608a.tar
  validation:
    type: sha256
-    value: "2398dbecef5aababcad506612dd34501aa40bf988f00bd2ee96c0f4828234f50"
+    value: "48f811b2596bd78374ffcce9fcd75469824bbf466e948c00f92fe133dcb6608a"
 maintainers:
 - email: productivity-team@cloudbees.com
  name: CloudBees

--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
 apiVersion: v2
 name: cloudbees-core
-version: 3.31.5
+version: 3.32.1
 description: Enterprise Continuous Integration with Jenkins
 keywords:
  - cloudbees
@@ -20,7 +20,7 @@ dependencies:
    repository: https://charts.cloudbees.com/public/cloudbees
    condition: sidecarinjector.Enabled
 icon: https://images.ctfassets.net/vtn4rfaw6n2j/7xprMMXARXDBuVxW4y8XfV/349fff91035050e3f2a8ff37bc0615b5/cloudbees-core-logo_header.svg
-appVersion: 2.277.4.3
+appVersion: 2.289.1.2
 annotations:
  artifacthub.io/links: |
    - name: Product overview

--- a/helm/README-template.md
+++ b/helm/README-template.md
 # cloudbees-core
-![Version: 3.31.5](https://img.shields.io/badge/Version-3.31.5-informational?style=flat-square) ![AppVersion: 2.277.4.3](https://img.shields.io/badge/AppVersion-2.277.4.3-informational?style=flat-square)
+![Version: 3.32.1](https://img.shields.io/badge/Version-3.32.1-informational?style=flat-square) ![AppVersion: 2.289.1.2](https://img.shields.io/badge/AppVersion-2.289.1.2-informational?style=flat-square)
 [CloudBees CI](https://www.cloudbees.com/products/continuous-integration) is the continuous integration platform architected for the enterprise. It provides:

--- a/helm/README.md
+++ b/helm/README.md
 # cloudbees-core
-![Version: 3.31.5](https://img.shields.io/badge/Version-3.31.5-informational?style=flat-square) ![AppVersion: 2.277.4.3](https://img.shields.io/badge/AppVersion-2.277.4.3-informational?style=flat-square)
+![Version: 3.32.1](https://img.shields.io/badge/Version-3.32.1-informational?style=flat-square) ![AppVersion: 2.289.1.2](https://img.shields.io/badge/AppVersion-2.289.1.2-informational?style=flat-square)
 [CloudBees CI](https://www.cloudbees.com/products/continuous-integration) is the continuous integration platform architected for the enterprise. It provides:

--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -491,7 +491,7 @@ jmx
 {{- end -}}
 {{- define "persistence.storageclass" -}}
-{{- if and (.Values.Persistence.StorageClass) (ne "-" (toString .Values.Persistence.StorageClass)) -}}
+{{- if .Values.Persistence.StorageClass -}}
 {{ .Values.Persistence.StorageClass}}
 {{- else if (include "gke.storageclass.name" .) -}}
 {{ include "gke.storageclass.name" . }}

--- a/helm/templates/cjoc-statefulset.yaml
+++ b/helm/templates/cjoc-statefulset.yaml
@@ -117,9 +117,10 @@ spec:
            {{- end }}
            -Dcom.cloudbees.jenkins.plugins.kube.ServiceAccountFilter.defaultServiceAccount={{ .Values.rbac.agentsServiceAccountName }}
            -Dcom.cloudbees.networking.useSubdomain={{ default "false" (include "cloudbees-core.use-subdomain" .) }}
-            -Dcom.cloudbees.networking.protocol={{ include "oc.protocol" . }}
+            -Dcom.cloudbees.networking.protocol={{ include "oc.protocol" . | quote }}
-            -Dcom.cloudbees.networking.hostname={{ .Values.OperationsCenter.HostName }}
+            -Dcom.cloudbees.networking.hostname={{ .Values.OperationsCenter.HostName | quote }}
            -Dcom.cloudbees.networking.port={{ include "oc.port" . }}
+            -Dcom.cloudbees.networking.operationsCenterName={{ include "oc.name" . | quote }}
            {{- if .Values.Master.JavaOpts }}
            {{ .Values.Master.JavaOpts }}
            {{- end }}
@@ -142,9 +143,10 @@ spec:
            -Dcom.cloudbees.opscenter.analytics.reporter.metrics.AperiodicMetricSubmitter.PERIOD=120
            -Dcom.cloudbees.opscenter.analytics.FeederConfiguration.PERIOD=120
            -Dcom.cloudbees.networking.useSubdomain={{ default "false" (include "cloudbees-core.use-subdomain" .) }}
-            -Dcom.cloudbees.networking.protocol={{ include "oc.protocol" . }}
+            -Dcom.cloudbees.networking.protocol={{ include "oc.protocol" . | quote }}
-            -Dcom.cloudbees.networking.hostname={{ .Values.OperationsCenter.HostName }}
+            -Dcom.cloudbees.networking.hostname={{ .Values.OperationsCenter.HostName | quote }}
            -Dcom.cloudbees.networking.port={{ include "oc.port" . }}
+            -Dcom.cloudbees.networking.operationsCenterName={{ include "oc.name" . | quote }}
            -Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesMasterProvisioning.fsGroup={{ include "oc.fsGroup" . }}
            -Dcom.cloudbees.jce.masterprovisioning.DockerImageDefinitionConfiguration.disableAutoConfiguration=true
            -Dcom.cloudbees.jce.masterprovisioning.DockerImageDefinitionConfiguration.masterImageName={{ include "mm.longname" . | quote}}
@@ -153,7 +155,7 @@ spec:
            {{- if .Values.Agents.SeparateNamespace.Enabled }}
            -Dcom.cloudbees.jenkins.plugins.kube.NamespaceFilter.defaultNamespace={{ template "agents.namespace" . }}
            {{- end }}
-            {{- if (include "persistence.storageclass" .) }}
+            {{- if and (include "persistence.storageclass" . ) (ne "-" (include "persistence.storageclass" . )) }}
            -Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesMasterProvisioning.storageClassName={{ include "persistence.storageclass" . | quote }}
            {{- end }}
            {{- if .Values.OperationsCenter.Ingress.Class }}

--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -57,7 +57,7 @@ OperationsCenter:
  # Operations Center docker image
  Image:
    # OperationsCenter.Image.dockerImage -- Container image to use for Operations Center
-    dockerImage: dcar/core-oc:2.277.4.4-ra
+    dockerImage: dcar/core-oc:2.289.1.2-ra
    # OperationsCenter.Image.dockerPullPolicy -- https://kubernetes.io/docs/concepts/containers/images/#updating-images
    dockerPullPolicy: null
@@ -262,7 +262,7 @@ Master:
  # Docker image inserted in Operations Center automatically
  Image:
    # Master.Image.dockerImage -- Used to override the default docker image
-    dockerImage: dcar/core-mm:2.277.4.4-ra
+    dockerImage: dcar/core-mm:2.289.1.2-ra
  # Master.JavaOpts -- Additional Java options to pass to managed masters. For example, setting up a JMX port
  JavaOpts: null
@@ -279,7 +279,7 @@ Agents:
    Create: false
  Image:
    # Agents.Image.dockerImage -- Used to override the default docker image used for agents
-    dockerImage: dcar/agent:2.277.4.4-ra
+    dockerImage: dcar/agent:2.289.1.2-ra
  # Image pull secrets
  # Enable this option when using a private registry.
  # https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-secret-by-providing-credentials-on-the-command-line

--- a/scripts/usr/local/bin/jenkins.sh
+++ b/scripts/usr/local/bin/jenkins.sh
@@ -52,7 +52,7 @@ find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \;
 # if `docker run` first argument start with `--` the user is passing jenkins launcher arguments
 if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
-  eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=0ca4417c776c03f0409198deca72eccf45eda162 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\""
+  eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=11ffc7effdc3514efdf1e667e56d5e1d8b42e281 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\""
 fi
 # As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image