diff --git a/Dockerfile b/Dockerfile index ebf92c7a50ef192716b5f76949abcc0cfa3a39dc..38c858c940acf46c03fb456cbc487785f89b770e 100644 --- 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 version=2.277.4.4-ra +# L-A-B-E-L release=11ffc7effdc3514efdf1e667e56d5e1d8b42e281 +# 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 diff --git a/README.md b/README.md index 44dd8164b0989db34794b874f604e44f769bff8e..6c6eaa6e0e4e0fb8bfabb984226257b17072ac96 100644 --- 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: diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index c2f47a86570ae4c565e42a996b5353e662f3a91a..2cbc61bdb006af725a406fff94768afbe7921538 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,7 +1,7 @@ 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 diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 0b7b261ff66cae11b4f897a0fe36c6b99798cf18..11c4a5a718138aec5aad0e779d75a64acb1fe041 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,6 +1,6 @@ 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 diff --git a/helm/README-template.md b/helm/README-template.md index 1a3e1956dc3cdee871a86436cdc2cc21b3859627..5fa8c9fd10dfa493ade8028fe8973e5d964fd715 100644 --- a/helm/README-template.md +++ b/helm/README-template.md @@ -1,6 +1,6 @@ # 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: diff --git a/helm/README.md b/helm/README.md index 3b11a8b42a640d6a8ab0274d61e24e64127b89ed..286feba775b1067e08378a58cde03e066f49a54b 100644 --- a/helm/README.md +++ b/helm/README.md @@ -1,6 +1,6 @@ # 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: diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl index d9321b1eedacdf4f869e02df534acbf3a02ab395..6131c48853a34c535735cc14aa111db9d4a1f5ef 100644 --- 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" . }} diff --git a/helm/templates/cjoc-statefulset.yaml b/helm/templates/cjoc-statefulset.yaml index 9923a51129a4830f779e93f04874fede0b222c53..84b1e20b9a0d22aa591dd78a8b2ee26a23f58c9a 100644 --- 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.hostname={{ .Values.OperationsCenter.HostName }} + -Dcom.cloudbees.networking.protocol={{ include "oc.protocol" . | quote }} + -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.hostname={{ .Values.OperationsCenter.HostName }} + -Dcom.cloudbees.networking.protocol={{ include "oc.protocol" . | quote }} + -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 }} diff --git a/helm/values.yaml b/helm/values.yaml index 4d042b193e2dd16cec5e9d567c921b83f4bc6c0a..3c62a0f2bf1d950bbfdb0b7ba24e29b06f69d9ff 100644 --- 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 diff --git a/scripts/usr/local/bin/jenkins.sh b/scripts/usr/local/bin/jenkins.sh index ed0859d23652cea55ee0f5082b53946008125e7b..fef38964e0ddc35cbced143550bbc92c8e8cfc76 100644 --- 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