From b229ab4ace62227717c0cded63751002a5b3382c Mon Sep 17 00:00:00 2001 From: imontero Date: Thu, 12 Nov 2020 11:49:13 +0000 Subject: [PATCH] 2.249.3.2 --- Dockerfile | 2 +- Jenkinsfile | 2 +- README.md | 8 ++++---- download.json | 4 ++-- helm/README.md | 6 +++--- helm/requirements.lock | 2 +- helm/values.yaml | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6bf06e3..bfc8b47 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.1 +LABEL version=2.249.3.2 ARG TARBALL=files.tar COPY ${TARBALL} /tmp diff --git a/Jenkinsfile b/Jenkinsfile index e1f1927..018aa91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: '2.249.3.1') +dccscrPipeline(version: '2.249.3.2') diff --git a/README.md b/README.md index 606cf42..95e319d 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.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. 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.1 + dockerImage: your-registry/core-oc:2.249.3.2 Master: Image: - dockerImage: your-registry/core-mm:2.249.3.1 + dockerImage: your-registry/core-mm:2.249.3.2 Agents: 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: diff --git a/download.json b/download.json index 9862a66..6f54fcc 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "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", "validation": { "type": "sha256", - "value": "185ba37cfbe5145a632eb4b91e6ba257cfa3172a30452a9ff6c96205e9cab451" + "value": "45df0b174ea42936f67a06b7afec951c191e1efc68aa08cc14ba6e532b3372c4" } } ] diff --git a/helm/README.md b/helm/README.md index 0da9b46..5beb633 100644 --- a/helm/README.md +++ b/helm/README.md @@ -108,7 +108,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 | `"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.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 +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.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 | `"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.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 +131,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 | `"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.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 03c0434..06db7ac 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-04T11:46:50.730617819Z" +generated: "2020-11-12T11:44:35.044232426Z" diff --git a/helm/values.yaml b/helm/values.yaml index a928def..52e074b 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.1 + dockerImage: dcar/core-oc:2.249.3.2 # 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.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 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.1 + dockerImage: dcar/agent:2.249.3.2 Persistence: # Persistence.StorageClass -- Persistent Volume Storage Class for Jenkins Home -- GitLab