UNCLASSIFIED

Commit a7a6bc3c authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch '2.249.3.2' into 'development'

2.249.3.2

See merge request !36
parents 2fd559fc b229ab4a
Pipeline #73994 passed with stages
in 26 minutes and 39 seconds
...@@ -43,7 +43,7 @@ HEALTHCHECK --interval=5m --timeout=3s \ ...@@ -43,7 +43,7 @@ HEALTHCHECK --interval=5m --timeout=3s \
LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt" LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt"
LABEL release=35bd8640427b6d61f14c96f9f6e8aecbe4f3822e LABEL release=35bd8640427b6d61f14c96f9f6e8aecbe4f3822e
LABEL version=2.249.3.1 LABEL version=2.249.3.2
ARG TARBALL=files.tar ARG TARBALL=files.tar
COPY ${TARBALL} /tmp COPY ${TARBALL} /tmp
......
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: '2.249.3.1') dccscrPipeline(version: '2.249.3.2')
...@@ -9,7 +9,7 @@ CloudBees CI (formerly known as _CloudBees Core_) consists of three Docker image ...@@ -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 For each image, all files other than UBI and native packages
are included in a `files.tar` marked with a SHA-256 checksum. 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.1` A version of CloudBees CI is given in the format `2.249.3.2`
where the first three components are aligned with a Jenkins LTS. where the first three components are aligned with a Jenkins LTS.
The Helm chart is coversioned with `core-oc`. The Helm chart is coversioned with `core-oc`.
The `core-mm` image typically shares the same version, The `core-mm` image typically shares the same version,
...@@ -22,13 +22,13 @@ plus whatever other customizations are desired: ...@@ -22,13 +22,13 @@ plus whatever other customizations are desired:
```yaml ```yaml
OperationsCenter: OperationsCenter:
Image: Image:
dockerImage: your-registry/core-oc:2.249.3.1 dockerImage: your-registry/core-oc:2.249.3.2
Master: Master:
Image: Image:
dockerImage: your-registry/core-mm:2.249.3.1 dockerImage: your-registry/core-mm:2.249.3.2
Agents: Agents:
Image: Image:
dockerImage: your-registry/agent:2.249.3.1 dockerImage: your-registry/agent:2.249.3.2
``` ```
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: 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:
......
{ {
"resources": [ "resources": [
{ {
"url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-185ba37cfbe5145a632eb4b91e6ba257cfa3172a30452a9ff6c96205e9cab451.tar", "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-45df0b174ea42936f67a06b7afec951c191e1efc68aa08cc14ba6e532b3372c4.tar",
"filename": "files.tar", "filename": "files.tar",
"validation": { "validation": {
"type": "sha256", "type": "sha256",
"value": "185ba37cfbe5145a632eb4b91e6ba257cfa3172a30452a9ff6c96205e9cab451" "value": "45df0b174ea42936f67a06b7afec951c191e1efc68aa08cc14ba6e532b3372c4"
} }
} }
] ]
......
...@@ -108,7 +108,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -108,7 +108,7 @@ CloudBees provides complete and more detailed installation and operation documen
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| |-----|------|---------|-------------|
| Agents.Enabled | bool | `true` | Enable to create agent resources (service account, role) | | Agents.Enabled | bool | `true` | Enable to create agent resources (service account, role) |
| Agents.Image.dockerImage | string | `"063356183961.dkr.ecr.us-east-1.amazonaws.com/ubi/unified-distribution/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.1"` | 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.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.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. | | 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 +116,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -116,7 +116,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.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 | | 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.Enabled | bool | `true` | Whether to create the resources required to schedule masters. |
| Master.Image.dockerImage | string | `"063356183961.dkr.ecr.us-east-1.amazonaws.com/ubi/unified-distribution/core-mm:2.249.3.1"` | Used to override the default docker image | | Master.Image.dockerImage | string | `"cloudbees/cloudbees-core-mm:2.249.3.1"` | 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.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 | | 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. | | 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 +131,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -131,7 +131,7 @@ CloudBees provides complete and more detailed installation and operation documen
| OperationsCenter.HealthProbeLivenessFailureThreshold | int | `12` | Threshold for liveness failure | | OperationsCenter.HealthProbeLivenessFailureThreshold | int | `12` | Threshold for liveness failure |
| OperationsCenter.HealthProbes | bool | `true` | Enable Kubernetes Liveness and Readiness Probes | | 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.HostName | string | `nil` | The hostname used to access Operations Center through the ingress controller. |
| OperationsCenter.Image.dockerImage | string | `"063356183961.dkr.ecr.us-east-1.amazonaws.com/ubi/unified-distribution/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.1"` | Container image to use for Operations Center |
| OperationsCenter.Image.dockerPullPolicy | string | `"Always"` | https://kubernetes.io/docs/concepts/containers/images/#updating-images | | 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.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 | | OperationsCenter.Ingress.Annotations | object | `{"kubernetes.io/tls-acme":"false"}` | annotations to put on Ingress object |
......
...@@ -9,4 +9,4 @@ dependencies: ...@@ -9,4 +9,4 @@ dependencies:
repository: https://charts.cloudbees.com/public/cloudbees repository: https://charts.cloudbees.com/public/cloudbees
version: 2.1.0 version: 2.1.0
digest: sha256:9e5e49c0f4e06500b06a529b2dcd0ded06bed93a20427287539a1f267f5c45a0 digest: sha256:9e5e49c0f4e06500b06a529b2dcd0ded06bed93a20427287539a1f267f5c45a0
generated: "2020-11-04T11:46:50.730617819Z" generated: "2020-11-12T11:44:35.044232426Z"
...@@ -50,7 +50,7 @@ OperationsCenter: ...@@ -50,7 +50,7 @@ OperationsCenter:
# Operations Center docker image # Operations Center docker image
Image: Image:
# OperationsCenter.Image.dockerImage -- Container image to use for Operations Center # OperationsCenter.Image.dockerImage -- Container image to use for Operations Center
dockerImage: dcar/core-oc:2.249.3.1 dockerImage: dcar/core-oc:2.249.3.2
# OperationsCenter.Image.dockerPullPolicy -- https://kubernetes.io/docs/concepts/containers/images/#updating-images # OperationsCenter.Image.dockerPullPolicy -- https://kubernetes.io/docs/concepts/containers/images/#updating-images
dockerPullPolicy: IfNotPresent dockerPullPolicy: IfNotPresent
...@@ -241,7 +241,7 @@ Master: ...@@ -241,7 +241,7 @@ Master:
# Docker image inserted in Operations Center automatically # Docker image inserted in Operations Center automatically
Image: Image:
# Master.Image.dockerImage -- Used to override the default docker image # Master.Image.dockerImage -- Used to override the default docker image
dockerImage: dcar/core-mm:2.249.3.1 dockerImage: dcar/core-mm:2.249.3.2
# Master.JavaOpts -- Additional Java options to pass to managed masters. For example, setting up a JMX port # Master.JavaOpts -- Additional Java options to pass to managed masters. For example, setting up a JMX port
JavaOpts: null JavaOpts: null
...@@ -258,7 +258,7 @@ Agents: ...@@ -258,7 +258,7 @@ Agents:
Create: false Create: false
Image: Image:
# Agents.Image.dockerImage -- Used to override the default docker image used for agents # Agents.Image.dockerImage -- Used to override the default docker image used for agents
dockerImage: dcar/agent:2.249.3.1 dockerImage: dcar/agent:2.249.3.2
Persistence: Persistence:
# Persistence.StorageClass -- Persistent Volume Storage Class for Jenkins Home # Persistence.StorageClass -- Persistent Volume Storage Class for Jenkins Home
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment