From 2c121d8be31df74c2b8489f4d4afb5b515e39b8f Mon Sep 17 00:00:00 2001 From: imontero Date: Thu, 27 Aug 2020 14:14:04 +0000 Subject: [PATCH] 2.235.2.3 --- Dockerfile | 10 +++++----- Jenkinsfile | 2 +- README.md | 12 ++++++------ download.json | 4 ++-- helm/Chart.yaml | 5 +++-- helm/requirements.lock | 6 +++--- helm/requirements.yaml | 2 +- helm/templates/cjoc-statefulset.yaml | 3 +-- helm/values.yaml | 22 +++++++++------------- scripts/usr/local/bin/jenkins.sh | 2 +- 10 files changed, 32 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32132d6..51b90c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,8 +42,8 @@ HEALTHCHECK --interval=5m --timeout=3s \ CMD curl -fsL ${JENKINS_URL}/login || exit 1 LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt" -LABEL release=6364f6b188910521ce09b771cbafab433fdde0e3 -LABEL version=2.235.5.1 +LABEL release=de251ed1df9dd7f5f828c18cfa9d4e51de5af0a7 +LABEL version=2.235.2.3 ARG TARBALL=files.tar COPY ${TARBALL} /tmp @@ -68,7 +68,7 @@ ENV VOLUME_SERVICE=http://localhost:31080 ENV TENANT=cjoc ENV JENKINS_VARIANT=cjoc -LABEL name="CloudBees Core Operation Center" \ +LABEL name="CloudBees CI Operation Center" \ vendor="CloudBees, Inc." \ - summary="CloudBees Core is the continuous delivery platform architected for the enterprise" \ - description="This container image will deploy one instance of CloudBees Core Operations Center." + summary="CloudBees CI is the continuous delivery platform architected for the enterprise" \ + description="This container image will deploy one instance of CloudBees CI Operations Center." diff --git a/Jenkinsfile b/Jenkinsfile index 5d0a6c1..e8d2f6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: '2.235.5.1') +dccscrPipeline(version: '2.235.2.3') diff --git a/README.md b/README.md index c667237..eb198fd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# CloudBees Core setup +# CloudBees CI setup -CloudBees Core consists of three Docker images installed via Helm chart: +CloudBees CI (formerly known as _CloudBees Core_) consists of three Docker images installed via Helm chart: * `core-oc`: the Operations Center * `core-mm`: a managed Jenkins master @@ -9,7 +9,7 @@ CloudBees Core consists of three Docker images installed via Helm chart: 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 Core is given in the format `2.235.5.1` +A version of CloudBees CI is given in the format `2.235.2.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.235.5.1 + dockerImage: your-registry/core-oc:2.235.2.3 Master: Image: - dockerImage: your-registry/core-mm:2.235.5.1 + dockerImage: your-registry/core-mm:2.235.2.3 Agents: Image: - dockerImage: your-registry/agent:2.235.5.1 + dockerImage: your-registry/agent:2.235.2.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 4869c59..72a7cf9 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "resources": [ { - "url": "https://dsop.s3.amazonaws.com/core-oc-files-450b795bdf21a1cd5dbb765af0ffee3e05d672ce16d3447030d061cc5c4c3455.tar", + "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-9395c40fb87cf0d70ed2c166d5fcf84b18163c17123cd50ff62f2f5150a58561.tar", "filename": "files.tar", "validation": { "type": "sha256", - "value": "450b795bdf21a1cd5dbb765af0ffee3e05d672ce16d3447030d061cc5c4c3455" + "value": "9395c40fb87cf0d70ed2c166d5fcf84b18163c17123cd50ff62f2f5150a58561" } } ] diff --git a/helm/Chart.yaml b/helm/Chart.yaml index aab57af..337a428 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,10 +1,11 @@ apiVersion: v1 -appVersion: 2.235.5.1 +appVersion: 2.235.2.3 description: The Continuous Delivery Solution for Enterprises +engine: gotpl home: https://www.cloudbees.com/products/cloudbees-core icon: https://images.ctfassets.net/vtn4rfaw6n2j/7xprMMXARXDBuVxW4y8XfV/349fff91035050e3f2a8ff37bc0615b5/cloudbees-core-logo_header.svg keywords: - cloudbees - jenkins name: cloudbees-core -version: 3.18.0-DEVELOPMENT +version: 3.16.1-DEVELOPMENT diff --git a/helm/requirements.lock b/helm/requirements.lock index 33a7a0d..03b6945 100644 --- a/helm/requirements.lock +++ b/helm/requirements.lock @@ -1,9 +1,9 @@ dependencies: - name: nginx-ingress repository: https://kubernetes-charts.storage.googleapis.com/ - version: 1.40.2 + version: 1.31.0 - name: cloudbees-sidecar-injector repository: https://charts.cloudbees.com/public/cloudbees version: 2.0.5 -digest: sha256:098216686eb47f2fc4126babeebc62d9f243af905dd304a8c43bf922689e93d5 -generated: "2020-07-08T15:03:31.071138-04:00" +digest: sha256:fa8962ae6715016680597010462281d7e7622a9a54ef2fab053bbe5765601279 +generated: "2020-08-27T14:11:45.561739414Z" diff --git a/helm/requirements.yaml b/helm/requirements.yaml index 4db7474..75a1c9e 100644 --- a/helm/requirements.yaml +++ b/helm/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - name: nginx-ingress - version: 1.40.2 + version: 1.31.0 repository: https://kubernetes-charts.storage.googleapis.com/ condition: nginx-ingress.Enabled - name: cloudbees-sidecar-injector diff --git a/helm/templates/cjoc-statefulset.yaml b/helm/templates/cjoc-statefulset.yaml index 9e7f843..f745a1d 100644 --- a/helm/templates/cjoc-statefulset.yaml +++ b/helm/templates/cjoc-statefulset.yaml @@ -125,6 +125,7 @@ spec: # -Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesMasterProvisioning.storageClassName=some-storage-class value: >- -XshowSettings:vm + -Dhudson.DNSMultiCast.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.slaveAgentPort={{ .Values.OperationsCenter.AgentListenerPort }} -Djenkins.model.Jenkins.slaveAgentPortEnforce=true @@ -151,8 +152,6 @@ spec: {{- if .Values.OperationsCenter.CSRF.ProxyCompatibility -}} -Djenkins.model.Jenkins.crumbIssuerProxyCompatibility=true {{- end }} - -XX:+UseG1GC - -XX:+DisableExplicitGC ports: - containerPort: {{ .Values.OperationsCenter.ContainerPort }} name: http diff --git a/helm/values.yaml b/helm/values.yaml index 8aea7c5..67afefb 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -3,19 +3,20 @@ # Declare variables to be passed into your templates. # Installs the nginx ingress controller (optional) -# Enable this section if you don't have an existing installation of nginx-ingress controller -# Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16 +# Only enable this section if you don't have an existing installation of nginx-ingress controller +# NOTE: The controller.nodeSelector and defaultBackend.nodeSelector keys "beta.kubernetes.io/os" will need to change to +# "kubernetes.io/os" to work with Kubernetes versions 1.18 or higher. nginx-ingress: Enabled: false controller: ingressClass: nginx nodeSelector: - kubernetes.io/os: linux + beta.kubernetes.io/os: linux service: externalTrafficPolicy: Local defaultBackend: nodeSelector: - kubernetes.io/os: linux + beta.kubernetes.io/os: linux # Sidecar injector (optional) # Useful when running infrastructure (GitHub Enterprise, Nexus, etc.) using a self-signed certificate. @@ -32,14 +33,9 @@ OperationsCenter: # Operations Center docker image Image: - dockerImage: dcar/core-oc:2.235.5.1 + dockerImage: dcar/core-oc:2.235.2.3 dockerPullPolicy: IfNotPresent - # 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 - # ImagePullSecrets: my-k8s-secret - # Platform enables specific settings, option defaults standard # platform specific values are: eks, aws, gke, aks, pks, openshift, openshift4 # Note: openshift maps to OpenShift 3.x @@ -128,7 +124,7 @@ OperationsCenter: ProxyCompatibility: false # Only used when ServiceType: LoadBalancer - # https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer + # https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service LoadBalancerSourceRanges: - 0.0.0.0/0 # Optionally assign a known public LB IP @@ -215,7 +211,7 @@ Master: # Docker image inserted in Operations Center automatically Image: - dockerImage: dcar/core-mm:2.235.5.1 + dockerImage: dcar/core-mm:2.235.2.3 dockerPullPolicy: IfNotPresent # Additional Java options to pass to managed masters. For example, setting up a JMX port JavaOpts: null @@ -233,7 +229,7 @@ Agents: Create: false Image: # Used to override the default docker image used for agents - dockerImage: dcar/agent:2.235.5.1 + dockerImage: dcar/agent:2.235.2.3 Persistence: ## Persistent Volume Storage Class for Jenkins Home diff --git a/scripts/usr/local/bin/jenkins.sh b/scripts/usr/local/bin/jenkins.sh index 4132d55..f684b4a 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=6364f6b188910521ce09b771cbafab433fdde0e3 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" + eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=de251ed1df9dd7f5f828c18cfa9d4e51de5af0a7 /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 -- GitLab