From de132e9cb7d85a94564be5da9e01bbcd745c9936 Mon Sep 17 00:00:00 2001 From: imontero Date: Thu, 19 Nov 2020 13:54:13 +0000 Subject: [PATCH] 2.249.3.3 --- Dockerfile | 2 +- Jenkinsfile | 2 +- README.md | 8 ++++---- download.json | 4 ++-- helm/Chart.yaml | 5 +++-- helm/README.md | 10 ++++++---- helm/requirements.lock | 2 +- helm/values.yaml | 6 +++--- 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index bfc8b47..3ac26fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,7 +43,7 @@ HEALTHCHECK --interval=5m --timeout=3s \ LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt" LABEL release=35bd8640427b6d61f14c96f9f6e8aecbe4f3822e -LABEL version=2.249.3.2 +LABEL version=2.249.3.3 ARG TARBALL=files.tar COPY ${TARBALL} /tmp diff --git a/Jenkinsfile b/Jenkinsfile index 018aa91..03ae711 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: '2.249.3.2') +dccscrPipeline(version: '2.249.3.3') diff --git a/README.md b/README.md index 95e319d..e3ab221 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,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.249.3.2` +A version of CloudBees CI is given in the format `2.249.3.3` 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, @@ -22,13 +22,13 @@ plus whatever other customizations are desired: ```yaml OperationsCenter: Image: - dockerImage: your-registry/core-oc:2.249.3.2 + dockerImage: your-registry/core-oc:2.249.3.3 Master: Image: - dockerImage: your-registry/core-mm:2.249.3.2 + dockerImage: your-registry/core-mm:2.249.3.3 Agents: Image: - dockerImage: your-registry/agent:2.249.3.2 + dockerImage: your-registry/agent:2.249.3.3 ``` 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/download.json b/download.json index 6f54fcc..027550c 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "resources": [ { - "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-45df0b174ea42936f67a06b7afec951c191e1efc68aa08cc14ba6e532b3372c4.tar", + "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-d57097205d4acc2ebd4db03f9a93d3bf83a7b8468174fa81837741064fbfb7c3.tar", "filename": "files.tar", "validation": { "type": "sha256", - "value": "45df0b174ea42936f67a06b7afec951c191e1efc68aa08cc14ba6e532b3372c4" + "value": "d57097205d4acc2ebd4db03f9a93d3bf83a7b8468174fa81837741064fbfb7c3" } } ] diff --git a/helm/Chart.yaml b/helm/Chart.yaml index a58565d..8c2835b 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 2.249.3.1 +appVersion: 2.249.3.3 description: Enterprise Continuous Integration with Jenkins engine: gotpl home: https://www.cloudbees.com/products/continuous-integration @@ -7,5 +7,6 @@ icon: https://images.ctfassets.net/vtn4rfaw6n2j/7xprMMXARXDBuVxW4y8XfV/349fff910 keywords: - cloudbees - jenkins +kubeVersion: ^1.14.0-0 name: cloudbees-core -version: 3.23.0-DEVELOPMENT +version: 3.23.4-DEVELOPMENT diff --git a/helm/README.md b/helm/README.md index 5beb633..abe4b03 100644 --- a/helm/README.md +++ b/helm/README.md @@ -1,6 +1,6 @@ # cloudbees-core -![Version: 3.23.0](https://img.shields.io/badge/Version-3.23.0-informational?style=flat-square) ![AppVersion: 2.249.3.1](https://img.shields.io/badge/AppVersion-2.249.3.1-informational?style=flat-square) +![Version: 3.23.4](https://img.shields.io/badge/Version-3.23.4-informational?style=flat-square) ![AppVersion: 2.249.3.3](https://img.shields.io/badge/AppVersion-2.249.3.3-informational?style=flat-square) [CloudBees CI](https://www.cloudbees.com/products/continuous-integration) is the continuous integration platform architected for the enterprise. It provides: @@ -26,6 +26,8 @@ This chart bootstraps a CloudBees CI deployment on a [Kubernetes](http://kuberne ## Requirements +Kubernetes: `^1.14.0-0` + | Repository | Name | Version | |------------|------|---------| | https://charts.cloudbees.com/public/cloudbees | cloudbees-sidecar-injector | 2.1.0 | @@ -108,7 +110,7 @@ CloudBees provides complete and more detailed installation and operation documen | Key | Type | Default | Description | |-----|------|---------|-------------| | Agents.Enabled | bool | `true` | Enable to create agent resources (service account, role) | -| Agents.Image.dockerImage | string | `"cloudbees/cloudbees-core-agent:2.249.3.1"` | Used to override the default docker image used for agents | +| Agents.Image.dockerImage | string | `"cloudbees/cloudbees-core-agent:2.249.3.3"` | Used to override the default docker image used for agents | | Agents.SeparateNamespace.Create | bool | `false` | If true, the second namespace will be created when installing this chart. Otherwise, the existing namespace should be labeled with `cloudbees.com/role: agents` in order for network policies to work. | | Agents.SeparateNamespace.Enabled | bool | `false` | If enabled, agents resources will be created in a separate namespace as well as bindings allowing masters to schedule them. | | Agents.SeparateNamespace.Name | string | `nil` | Namespace where to create agents resources. Defaults to `${namespace}-builds` where `${namespace}` is the namespace where the chart is installed. | @@ -116,7 +118,7 @@ CloudBees provides complete and more detailed installation and operation documen | Hibernation.Image.dockerImage | string | `"cloudbees/managed-master-hibernation-monitor:230.ee066a318539"` | Used to override the default docker image | | Hibernation.Image.dockerPullPolicy | string | `"IfNotPresent"` | Used to override the default pull policy | | Master.Enabled | bool | `true` | Whether to create the resources required to schedule masters. | -| Master.Image.dockerImage | string | `"cloudbees/cloudbees-core-mm:2.249.3.1"` | Used to override the default docker image | +| Master.Image.dockerImage | string | `"cloudbees/cloudbees-core-mm:2.249.3.3"` | Used to override the default docker image | | Master.JavaOpts | string | `nil` | Additional Java options to pass to managed masters. For example, setting up a JMX port | | Master.OperationsCenterNamespace | string | `nil` | When deploying Master resources, this grants an Operations Center deployed in another namespace the right to deploy masters | | NetworkPolicy.Enabled | bool | `false` | Enable only if the cluster supports it. Read the [documentation](https://kubernetes.io/docs/concepts/services-networking/network-policies/) to understand what this is about. | @@ -131,7 +133,7 @@ CloudBees provides complete and more detailed installation and operation documen | OperationsCenter.HealthProbeLivenessFailureThreshold | int | `12` | Threshold for liveness failure | | OperationsCenter.HealthProbes | bool | `true` | Enable Kubernetes Liveness and Readiness Probes | | OperationsCenter.HostName | string | `nil` | The hostname used to access Operations Center through the ingress controller. | -| OperationsCenter.Image.dockerImage | string | `"cloudbees/cloudbees-cloud-core-oc:2.249.3.1"` | Container image to use for Operations Center | +| OperationsCenter.Image.dockerImage | string | `"cloudbees/cloudbees-cloud-core-oc:2.249.3.3"` | Container image to use for Operations Center | | OperationsCenter.Image.dockerPullPolicy | string | `"Always"` | https://kubernetes.io/docs/concepts/containers/images/#updating-images | | OperationsCenter.ImagePullSecrets | string | `nil` | The name of the image pull secret to pull private docker images | | OperationsCenter.Ingress.Annotations | object | `{"kubernetes.io/tls-acme":"false"}` | annotations to put on Ingress object | diff --git a/helm/requirements.lock b/helm/requirements.lock index 06db7ac..a5cf6dc 100644 --- a/helm/requirements.lock +++ b/helm/requirements.lock @@ -9,4 +9,4 @@ dependencies: repository: https://charts.cloudbees.com/public/cloudbees version: 2.1.0 digest: sha256:9e5e49c0f4e06500b06a529b2dcd0ded06bed93a20427287539a1f267f5c45a0 -generated: "2020-11-12T11:44:35.044232426Z" +generated: "2020-11-19T13:49:22.025947935Z" diff --git a/helm/values.yaml b/helm/values.yaml index 52e074b..56f2db9 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -50,7 +50,7 @@ OperationsCenter: # Operations Center docker image Image: # OperationsCenter.Image.dockerImage -- Container image to use for Operations Center - dockerImage: dcar/core-oc:2.249.3.2 + dockerImage: dcar/core-oc:2.249.3.3 # OperationsCenter.Image.dockerPullPolicy -- https://kubernetes.io/docs/concepts/containers/images/#updating-images dockerPullPolicy: IfNotPresent @@ -241,7 +241,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.249.3.2 + dockerImage: dcar/core-mm:2.249.3.3 # Master.JavaOpts -- Additional Java options to pass to managed masters. For example, setting up a JMX port JavaOpts: null @@ -258,7 +258,7 @@ Agents: Create: false Image: # Agents.Image.dockerImage -- Used to override the default docker image used for agents - dockerImage: dcar/agent:2.249.3.2 + dockerImage: dcar/agent:2.249.3.3 Persistence: # Persistence.StorageClass -- Persistent Volume Storage Class for Jenkins Home -- GitLab