Merge branch 'development' into 'master'

Development

See merge request !44

helm/templates/managed-master-hibernation-monitor-ingress.yaml

@@ -7,11 +7,7 @@ metadata:
   labels:
 {{ include "cloudbees-core.labels" . | indent 4 }}
   annotations:
-{{ toYaml .Values.OperationsCenter.Ingress.Annotations | indent 4 }}
-{{ if .Values.OperationsCenter.Ingress.Class }}
-    kubernetes.io/ingress.class: {{ .Values.OperationsCenter.Ingress.Class }}
-{{- end }}
-    nginx.ingress.kubernetes.io/ssl-redirect: "{{- template "ingress.ssl_redirect" . }}"
+{{ include "ingress.annotations" . | indent 4 }}
 spec:
   rules:
   -
@@ -20,11 +16,19 @@ spec:
 {{- end }}
     http:
       paths:
-      - path: /hibernation
+      - path: /hibernation/ns/{{ .Release.Namespace }}/
+        backend:
+          serviceName: managed-master-hibernation-monitor
+          servicePort: 80
+      - path: /hibernation/ns/{{ .Release.Namespace }}/*
+        backend:
+          serviceName: managed-master-hibernation-monitor
+          servicePort: 80
+      - path: /hibernation/
         backend:
           serviceName: managed-master-hibernation-monitor
           servicePort: 80
-      - path: /hibernation/ns/{{ .Release.Namespace }}
+      - path: /hibernation/*
         backend:
           serviceName: managed-master-hibernation-monitor
           servicePort: 80

helm/values.yaml

@@ -50,18 +50,18 @@ OperationsCenter:
   # Operations Center docker image
   Image:
     # OperationsCenter.Image.dockerImage -- Container image to use for Operations Center
-    dockerImage: dcar/core-oc:2.249.2.3
+    dockerImage: dcar/core-oc:2.263.2.4-ra
     # OperationsCenter.Image.dockerPullPolicy -- https://kubernetes.io/docs/concepts/containers/images/#updating-images
-    dockerPullPolicy: IfNotPresent
+    dockerPullPolicy: null
 
   # 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
-  # OperationsCenter.ImagePullSecrets -- The name of the image pull secret to pull private docker images
+  # OperationsCenter.ImagePullSecrets -- Name of image pull secret to pull private Docker images or an array of image pull secrets
   ImagePullSecrets: null
 
   # OperationsCenter.Platform -- Enables specific settings depending on the platform
-  # platform specific values are: `eks`, `aws`, `gke`, `aks`, `pks`, `openshift`, `openshift4`
+  # platform specific values are: `eks`, `aws`, `gke`, `aks`, `openshift`, `openshift4`
   # Note: `openshift` maps to OpenShift 3.x
   Platform: standard
 
@@ -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.2.3
+    dockerImage: dcar/core-mm:2.263.2.4-ra
   # Master.JavaOpts -- Additional Java options to pass to managed masters. For example, setting up a JMX port
   JavaOpts: null
 
@@ -258,7 +258,12 @@ Agents:
     Create: false
   Image:
     # Agents.Image.dockerImage -- Used to override the default docker image used for agents
-    dockerImage: dcar/agent:2.249.2.3
+    dockerImage: dcar/agent:2.263.2.4-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
+  # Agents.ImagePullSecrets -- Name of image pull secret to pull private Docker images or an array of image pull secrets
+  ImagePullSecrets: null
 
 Persistence:
   # Persistence.StorageClass -- Persistent Volume Storage Class for Jenkins Home
@@ -283,16 +288,6 @@ Persistence:
   # Persistence.Size -- Size of the Operations Center volume
   Size: 20Gi
 
-  # Persistence.volumes -- Additional volumes to attach to Operations Center pod
-  volumes: []
-#  - name: nothing
-#    emptyDir: {}
-  # Persistence.mounts -- Additional volume mounts to attach to Operations Center container
-  mounts: []
-#  - mountPath: /var/nothing
-#    name: nothing
-#    readOnly: true
-
 # Master hibernation
 Hibernation:
   # Hibernation.Enabled -- Whether to enable the [Hibernation](https://docs.cloudbees.com/docs/cloudbees-ci/latest/cloud-admin-guide/managing-masters#_hibernation_of_managed_masters) feature
@@ -301,7 +296,18 @@ Hibernation:
     # Hibernation.Image.dockerImage -- Used to override the default docker image
     dockerImage: cloudbees/managed-master-hibernation-monitor:230.ee066a318539
     # Hibernation.Image.dockerPullPolicy -- Used to override the default pull policy
-    dockerPullPolicy: IfNotPresent
+    dockerPullPolicy: null
+  # 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
+  # Hibernation.ImagePullSecrets -- Name of image pull secret to pull private Docker images or an array of image pull secrets
+  ImagePullSecrets: null
+  # Hibernation.NodeSelector -- Node labels and tolerations for pod assignment
+  # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  NodeSelector: {}
+  # Hibernation.Tolerations -- Specify tolerations for the Hibernation Monitor pod.
+  # See [documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)
+  Tolerations: []
 
 PodSecurityPolicy:
   # Requires rbac.installCluster = true
@@ -338,7 +344,7 @@ NetworkPolicy:
 ## Install Default RBAC roles and bindings
 rbac:
   # rbac.install -- Install `role`/`rolebindings`/`serviceAccount`.
-  # If false (and rbac is enabled in the cluster anyway), provide valid names for `serviceAccountName`, `masterServiceAccountName` and `hibernationMonitorServiceAccountName`
+  # If false (and rbac is enabled in the cluster anyway), provide valid names for all service accounts.
   install: true
 
   # rbac.installCluster -- Install `clusterrole`/`clusterrolebinding`

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=4c482ecc2d194d4868ade0a8cb5f773a3ab1c0d5 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\""
+  eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=69f7102311718b7e0fbed31edb877f1352ca5cf1 /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

scripts/usr/local/bin/support.sh

@@ -2,8 +2,6 @@
 
 set-java-options() {
     export JAVA_OPTS="-Duser.home=$JENKINS_HOME ${JAVA_OPTS:-}"
-    # CPLT2-6044: http/2 is causing issues with Openshift 4.x users
-    #export JAVA_OPTS="-Xbootclasspath/p:/usr/share/jenkins/alpn-boot.jar ${JAVA_OPTS:-}"
 }
 
 set-jenkins-options() {