UNCLASSIFIED

Skip to content

GitLab

Commit 0f4b20ea authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch '2.277.2.1-ra' into 'development' 

2.277.2.1-ra

See merge request !51
parents eb72502a fe9bd55c
Pipeline #215237 passed with stages
in 22 minutes and 23 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 60 deletions
Dockerfile
View file @ 0f4b20ea
...@@ -42,8 +42,8 @@ HEALTHCHECK --interval=5m --timeout=3s \ ...@@ -42,8 +42,8 @@ HEALTHCHECK --interval=5m --timeout=3s \
CMD curl -fsL ${JENKINS_URL}/login || exit 1 CMD curl -fsL ${JENKINS_URL}/login || exit 1
# L-A-B-E-L securitytxt="https://www.cloudbees.com/.well-known/security.txt" # L-A-B-E-L securitytxt="https://www.cloudbees.com/.well-known/security.txt"
# L-A-B-E-L release=d7a5eee17fd68064fb4268ca23a591bdc00af60b # L-A-B-E-L release=308768c9f176b5155dd19ff01ca06396b66f5afd
# L-A-B-E-L version=2.277.1.7-ra # L-A-B-E-L version=2.277.2.1-ra
COPY files.tar /tmp COPY files.tar /tmp
RUN cd / && tar xvf /tmp/files.tar && rm /tmp/files.tar RUN cd / && tar xvf /tmp/files.tar && rm /tmp/files.tar
......
README.md
View file @ 0f4b20ea
...@@ -12,7 +12,7 @@ CloudBees CI (formerly known as _CloudBees Core_) consists of three Docker image ...@@ -12,7 +12,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.277.1.7-ra` A version of CloudBees CI is given in the format `2.277.2.1-ra`
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,
...@@ -25,13 +25,13 @@ plus whatever other customizations are desired: ...@@ -25,13 +25,13 @@ plus whatever other customizations are desired:
```yaml ```yaml
OperationsCenter: OperationsCenter:
Image: Image:
dockerImage: your-registry/core-oc:2.277.1.7-ra dockerImage: your-registry/core-oc:2.277.2.1-ra
Master: Master:
Image: Image:
dockerImage: your-registry/core-mm:2.277.1.7-ra dockerImage: your-registry/core-mm:2.277.2.1-ra
Agents: Agents:
Image: Image:
dockerImage: your-registry/agent:2.277.1.7-ra dockerImage: your-registry/agent:2.277.2.1-ra
``` ```
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:
......
hardening_manifest.yaml
View file @ 0f4b20ea
apiVersion: v1 apiVersion: v1
name: "cloudbees/core/core-oc" name: "cloudbees/core/core-oc"
tags: tags:
- "2.277.1.7-ra" - "2.277.2.1-ra"
- latest - latest
labels: labels:
org.opencontainers.image.title: "core-oc" org.opencontainers.image.title: "core-oc"
...@@ -9,7 +9,7 @@ labels: ...@@ -9,7 +9,7 @@ labels:
org.opencontainers.image.licenses: proprietary org.opencontainers.image.licenses: proprietary
org.opencontainers.image.url: https://docs.cloudbees.com/docs/cloudbees-ci/ org.opencontainers.image.url: https://docs.cloudbees.com/docs/cloudbees-ci/
org.opencontainers.image.vendor: CloudBees org.opencontainers.image.vendor: CloudBees
org.opencontainers.image.version: "2.277.1.7-ra" org.opencontainers.image.version: "2.277.2.1-ra"
mil.dso.ironbank.image.keywords: cicd mil.dso.ironbank.image.keywords: cicd
mil.dso.ironbank.image.type: commercial mil.dso.ironbank.image.type: commercial
mil.dso.ironbank.product.name: CloudBees CI mil.dso.ironbank.product.name: CloudBees CI
...@@ -18,10 +18,10 @@ args: ...@@ -18,10 +18,10 @@ args:
BASE_TAG: "1.8.0" BASE_TAG: "1.8.0"
resources: resources:
- filename: files.tar - filename: files.tar
url: https://downloads.cloudbees.com/dsop-files/core-oc-files-5ef009a0f4b225510975a80b9a9ab9327de74ba12412d7044c9ef589f4521a3d.tar url: https://downloads.cloudbees.com/dsop-files/core-oc-files-a8c75c110388343781c00894fcade262363681eb914929bf19c94be5195463a3.tar
validation: validation:
type: sha256 type: sha256
value: "5ef009a0f4b225510975a80b9a9ab9327de74ba12412d7044c9ef589f4521a3d" value: "a8c75c110388343781c00894fcade262363681eb914929bf19c94be5195463a3"
maintainers: maintainers:
- email: productivity-team@cloudbees.com - email: productivity-team@cloudbees.com
name: CloudBees name: CloudBees
......
helm/Chart.yaml
View file @ 0f4b20ea
apiVersion: v2 apiVersion: v2
name: cloudbees-core name: cloudbees-core
version: 3.28.1 version: 3.29.2
description: Enterprise Continuous Integration with Jenkins description: Enterprise Continuous Integration with Jenkins
keywords: keywords:
- cloudbees - cloudbees
...@@ -20,7 +20,7 @@ dependencies: ...@@ -20,7 +20,7 @@ dependencies:
repository: https://charts.cloudbees.com/public/cloudbees repository: https://charts.cloudbees.com/public/cloudbees
condition: sidecarinjector.Enabled condition: sidecarinjector.Enabled
icon: https://images.ctfassets.net/vtn4rfaw6n2j/7xprMMXARXDBuVxW4y8XfV/349fff91035050e3f2a8ff37bc0615b5/cloudbees-core-logo_header.svg icon: https://images.ctfassets.net/vtn4rfaw6n2j/7xprMMXARXDBuVxW4y8XfV/349fff91035050e3f2a8ff37bc0615b5/cloudbees-core-logo_header.svg
appVersion: 2.277.1.2 appVersion: 2.277.2.3
annotations: annotations:
artifacthub.io/links: | artifacthub.io/links: |
- name: Product overview - name: Product overview
......
helm/README-template.md
View file @ 0f4b20ea
# cloudbees-core # cloudbees-core
![Version: 3.28.1](https://img.shields.io/badge/Version-3.28.1-informational?style=flat-square) ![AppVersion: 2.277.1.2](https://img.shields.io/badge/AppVersion-2.277.1.2-informational?style=flat-square) ![Version: 3.29.2](https://img.shields.io/badge/Version-3.29.2-informational?style=flat-square) ![AppVersion: 2.277.2.3](https://img.shields.io/badge/AppVersion-2.277.2.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: [CloudBees CI](https://www.cloudbees.com/products/continuous-integration) is the continuous integration platform architected for the enterprise. It provides:
...@@ -114,7 +114,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -114,7 +114,7 @@ CloudBees provides complete and more detailed installation and operation documen
| 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. |
| Hibernation.Enabled | bool | `false` | Whether to enable the [Hibernation](https://docs.cloudbees.com/docs/cloudbees-ci/latest/cloud-admin-guide/managing-masters#_hibernation_of_managed_masters) feature | | Hibernation.Enabled | bool | `false` | Whether to enable the [Hibernation](https://docs.cloudbees.com/docs/cloudbees-ci/latest/cloud-admin-guide/managing-masters#_hibernation_of_managed_masters) feature |
| 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:247.c5dfce00a179"` | Used to override the default docker image |
| Hibernation.Image.dockerPullPolicy | string | `nil` | Used to override the default pull policy | | Hibernation.Image.dockerPullPolicy | string | `nil` | Used to override the default pull policy |
| Hibernation.ImagePullSecrets | string | `nil` | Name of image pull secret to pull private Docker images or an array of image pull secrets | | Hibernation.ImagePullSecrets | string | `nil` | Name of image pull secret to pull private Docker images or an array of image pull secrets |
| Hibernation.NodeSelector | object | `{}` | Node labels and tolerations for pod assignment ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector | | Hibernation.NodeSelector | object | `{}` | Node labels and tolerations for pod assignment ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector |
...@@ -130,7 +130,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -130,7 +130,7 @@ CloudBees provides complete and more detailed installation and operation documen
| OperationsCenter.Annotations | object | `{}` | Additional annotations to put on the pod running Operations Center | | OperationsCenter.Annotations | object | `{}` | Additional annotations to put on the pod running Operations Center |
| OperationsCenter.CSRF.ProxyCompatibility | bool | `false` | Proxy compatibility for the default CSRF issuer | | OperationsCenter.CSRF.ProxyCompatibility | bool | `false` | Proxy compatibility for the default CSRF issuer |
| OperationsCenter.ContainerPort | int | `8080` | Container port for http traffic | | OperationsCenter.ContainerPort | int | `8080` | Container port for http traffic |
| OperationsCenter.ContextPath | string | `"/cjoc"` | the path under which Operations Center will be accessible in the given host. | | OperationsCenter.ContextPath | string | `nil` | the path under which Operations Center will be accessible in the given host. DEPRECATED - Use OperationsCenter.Name instead. |
| OperationsCenter.Enabled | bool | `true` | Disable for particular use case like setting up namespaces to host masters only | | OperationsCenter.Enabled | bool | `true` | Disable for particular use case like setting up namespaces to host masters only |
| OperationsCenter.ExtraConfigMaps | list | `[]` | Extra configmaps deployed with the chart | | OperationsCenter.ExtraConfigMaps | list | `[]` | Extra configmaps deployed with the chart |
| OperationsCenter.ExtraContainers | list | `[]` | Extra containers to add to the pod containing Operations Center. | | OperationsCenter.ExtraContainers | list | `[]` | Extra containers to add to the pod containing Operations Center. |
...@@ -151,6 +151,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -151,6 +151,7 @@ CloudBees provides complete and more detailed installation and operation documen
| OperationsCenter.JenkinsOpts | string | `nil` | Additional arguments for jenkins.war | | OperationsCenter.JenkinsOpts | string | `nil` | Additional arguments for jenkins.war |
| OperationsCenter.LoadBalancerIP | string | `nil` | Optionally assign a known public LB IP | | OperationsCenter.LoadBalancerIP | string | `nil` | Optionally assign a known public LB IP |
| OperationsCenter.LoadBalancerSourceRanges | list | `["0.0.0.0/0"]` | Only applicable when using `ServiceType: LoadBalancer` | | OperationsCenter.LoadBalancerSourceRanges | list | `["0.0.0.0/0"]` | Only applicable when using `ServiceType: LoadBalancer` |
| OperationsCenter.Name | string | `"cjoc"` | the name in the URL under which Operations Center will be accessible in the given host. For instance, if Subdomain is true, the URL to access Operations Center will be {{OperationsCenter.Protocol}}://{{OperationsCenter.Name}}.{{OperationsCenter.HostName}}:{{OperationsCenter.Port}} If Subdomain is false, the URL to access Operations Center will be {{OperationsCenter.Protocol}}://{{OperationsCenter.HostName}}:{{OperationsCenter.Port}}/{{OperationsCenter.Name}} |
| OperationsCenter.NodeSelector | object | `{}` | Node labels and tolerations for pod assignment ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector | | OperationsCenter.NodeSelector | object | `{}` | Node labels and tolerations for pod assignment ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector |
| OperationsCenter.Platform | string | `"standard"` | Enables specific settings depending on the platform platform specific values are: `eks`, `aws`, `gke`, `aks`, `openshift`, `openshift4` Note: `openshift` maps to OpenShift 3.x | | OperationsCenter.Platform | string | `"standard"` | Enables specific settings depending on the platform platform specific values are: `eks`, `aws`, `gke`, `aks`, `openshift`, `openshift4` Note: `openshift` maps to OpenShift 3.x |
| OperationsCenter.Protocol | string | `"http"` | the protocol used to access CJOC. Possible values are http/https. | | OperationsCenter.Protocol | string | `"http"` | the protocol used to access CJOC. Possible values are http/https. |
...@@ -176,6 +177,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -176,6 +177,7 @@ CloudBees provides complete and more detailed installation and operation documen
| Persistence.StorageClass | string | `nil` | Persistent Volume Storage Class for Jenkins Home If defined, storageClassName: <storageClass>. If set to "-", storageClassName: "", which disables dynamic provisioning. If undefined (the default) or set to null, the default storage class will be used, unless specified otherwise below. If setting OperationsCenter.Platform == gke, a storage class backed with SSD drives will be created by this chart and used automatically. | | Persistence.StorageClass | string | `nil` | Persistent Volume Storage Class for Jenkins Home If defined, storageClassName: <storageClass>. If set to "-", storageClassName: "", which disables dynamic provisioning. If undefined (the default) or set to null, the default storage class will be used, unless specified otherwise below. If setting OperationsCenter.Platform == gke, a storage class backed with SSD drives will be created by this chart and used automatically. |
| PodSecurityPolicy.Annotations | object | `{}` | Additional annotations to put on the PodSecurityPolicy, e.g. AppArmor/Seccomp settings | | PodSecurityPolicy.Annotations | object | `{}` | Additional annotations to put on the PodSecurityPolicy, e.g. AppArmor/Seccomp settings |
| PodSecurityPolicy.Enabled | bool | `false` | Enables [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) support Enable only if the cluster supports it. | | PodSecurityPolicy.Enabled | bool | `false` | Enables [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) support Enable only if the cluster supports it. |
| Subdomain | bool | `false` | Whether to use a DNS subdomain for each controller. |
| ingress-nginx.Enabled | bool | `false` | Installs the [ingress-nginx](https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx) controller (optional). Enable this section if you don't have an existing installation of ingress-nginx controller Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16 | | ingress-nginx.Enabled | bool | `false` | Installs the [ingress-nginx](https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx) controller (optional). Enable this section if you don't have an existing installation of ingress-nginx controller Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16 |
| ingress-nginx.controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | | | ingress-nginx.controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
| ingress-nginx.controller.ingressClass | string | `"nginx"` | | | ingress-nginx.controller.ingressClass | string | `"nginx"` | |
......
helm/README.md
View file @ 0f4b20ea
# cloudbees-core # cloudbees-core
![Version: 3.28.1](https://img.shields.io/badge/Version-3.28.1-informational?style=flat-square) ![AppVersion: 2.277.1.2](https://img.shields.io/badge/AppVersion-2.277.1.2-informational?style=flat-square) ![Version: 3.29.2](https://img.shields.io/badge/Version-3.29.2-informational?style=flat-square) ![AppVersion: 2.277.2.3](https://img.shields.io/badge/AppVersion-2.277.2.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: [CloudBees CI](https://www.cloudbees.com/products/continuous-integration) is the continuous integration platform architected for the enterprise. It provides:
...@@ -114,7 +114,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -114,7 +114,7 @@ CloudBees provides complete and more detailed installation and operation documen
| 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. |
| Hibernation.Enabled | bool | `false` | Whether to enable the [Hibernation](https://docs.cloudbees.com/docs/cloudbees-ci/latest/cloud-admin-guide/managing-masters#_hibernation_of_managed_masters) feature | | Hibernation.Enabled | bool | `false` | Whether to enable the [Hibernation](https://docs.cloudbees.com/docs/cloudbees-ci/latest/cloud-admin-guide/managing-masters#_hibernation_of_managed_masters) feature |
| 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:247.c5dfce00a179"` | Used to override the default docker image |
| Hibernation.Image.dockerPullPolicy | string | `nil` | Used to override the default pull policy | | Hibernation.Image.dockerPullPolicy | string | `nil` | Used to override the default pull policy |
| Hibernation.ImagePullSecrets | string | `nil` | Name of image pull secret to pull private Docker images or an array of image pull secrets | | Hibernation.ImagePullSecrets | string | `nil` | Name of image pull secret to pull private Docker images or an array of image pull secrets |
| Hibernation.NodeSelector | object | `{}` | Node labels and tolerations for pod assignment ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector | | Hibernation.NodeSelector | object | `{}` | Node labels and tolerations for pod assignment ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector |
...@@ -130,7 +130,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -130,7 +130,7 @@ CloudBees provides complete and more detailed installation and operation documen
| OperationsCenter.Annotations | object | `{}` | Additional annotations to put on the pod running Operations Center | | OperationsCenter.Annotations | object | `{}` | Additional annotations to put on the pod running Operations Center |
| OperationsCenter.CSRF.ProxyCompatibility | bool | `false` | Proxy compatibility for the default CSRF issuer | | OperationsCenter.CSRF.ProxyCompatibility | bool | `false` | Proxy compatibility for the default CSRF issuer |
| OperationsCenter.ContainerPort | int | `8080` | Container port for http traffic | | OperationsCenter.ContainerPort | int | `8080` | Container port for http traffic |
| OperationsCenter.ContextPath | string | `"/cjoc"` | the path under which Operations Center will be accessible in the given host. | | OperationsCenter.ContextPath | string | `nil` | the path under which Operations Center will be accessible in the given host. DEPRECATED - Use OperationsCenter.Name instead. |
| OperationsCenter.Enabled | bool | `true` | Disable for particular use case like setting up namespaces to host masters only | | OperationsCenter.Enabled | bool | `true` | Disable for particular use case like setting up namespaces to host masters only |
| OperationsCenter.ExtraConfigMaps | list | `[]` | Extra configmaps deployed with the chart | | OperationsCenter.ExtraConfigMaps | list | `[]` | Extra configmaps deployed with the chart |
| OperationsCenter.ExtraContainers | list | `[]` | Extra containers to add to the pod containing Operations Center. | | OperationsCenter.ExtraContainers | list | `[]` | Extra containers to add to the pod containing Operations Center. |
...@@ -151,6 +151,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -151,6 +151,7 @@ CloudBees provides complete and more detailed installation and operation documen
| OperationsCenter.JenkinsOpts | string | `nil` | Additional arguments for jenkins.war | | OperationsCenter.JenkinsOpts | string | `nil` | Additional arguments for jenkins.war |
| OperationsCenter.LoadBalancerIP | string | `nil` | Optionally assign a known public LB IP | | OperationsCenter.LoadBalancerIP | string | `nil` | Optionally assign a known public LB IP |
| OperationsCenter.LoadBalancerSourceRanges | list | `["0.0.0.0/0"]` | Only applicable when using `ServiceType: LoadBalancer` | | OperationsCenter.LoadBalancerSourceRanges | list | `["0.0.0.0/0"]` | Only applicable when using `ServiceType: LoadBalancer` |
| OperationsCenter.Name | string | `"cjoc"` | the name in the URL under which Operations Center will be accessible in the given host. For instance, if Subdomain is true, the URL to access Operations Center will be {{OperationsCenter.Protocol}}://{{OperationsCenter.Name}}.{{OperationsCenter.HostName}}:{{OperationsCenter.Port}} If Subdomain is false, the URL to access Operations Center will be {{OperationsCenter.Protocol}}://{{OperationsCenter.HostName}}:{{OperationsCenter.Port}}/{{OperationsCenter.Name}} |
| OperationsCenter.NodeSelector | object | `{}` | Node labels and tolerations for pod assignment ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector | | OperationsCenter.NodeSelector | object | `{}` | Node labels and tolerations for pod assignment ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector |
| OperationsCenter.Platform | string | `"standard"` | Enables specific settings depending on the platform platform specific values are: `eks`, `aws`, `gke`, `aks`, `openshift`, `openshift4` Note: `openshift` maps to OpenShift 3.x | | OperationsCenter.Platform | string | `"standard"` | Enables specific settings depending on the platform platform specific values are: `eks`, `aws`, `gke`, `aks`, `openshift`, `openshift4` Note: `openshift` maps to OpenShift 3.x |
| OperationsCenter.Protocol | string | `"http"` | the protocol used to access CJOC. Possible values are http/https. | | OperationsCenter.Protocol | string | `"http"` | the protocol used to access CJOC. Possible values are http/https. |
...@@ -176,6 +177,7 @@ CloudBees provides complete and more detailed installation and operation documen ...@@ -176,6 +177,7 @@ CloudBees provides complete and more detailed installation and operation documen
| Persistence.StorageClass | string | `nil` | Persistent Volume Storage Class for Jenkins Home If defined, storageClassName: <storageClass>. If set to "-", storageClassName: "", which disables dynamic provisioning. If undefined (the default) or set to null, the default storage class will be used, unless specified otherwise below. If setting OperationsCenter.Platform == gke, a storage class backed with SSD drives will be created by this chart and used automatically. | | Persistence.StorageClass | string | `nil` | Persistent Volume Storage Class for Jenkins Home If defined, storageClassName: <storageClass>. If set to "-", storageClassName: "", which disables dynamic provisioning. If undefined (the default) or set to null, the default storage class will be used, unless specified otherwise below. If setting OperationsCenter.Platform == gke, a storage class backed with SSD drives will be created by this chart and used automatically. |
| PodSecurityPolicy.Annotations | object | `{}` | Additional annotations to put on the PodSecurityPolicy, e.g. AppArmor/Seccomp settings | | PodSecurityPolicy.Annotations | object | `{}` | Additional annotations to put on the PodSecurityPolicy, e.g. AppArmor/Seccomp settings |
| PodSecurityPolicy.Enabled | bool | `false` | Enables [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) support Enable only if the cluster supports it. | | PodSecurityPolicy.Enabled | bool | `false` | Enables [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) support Enable only if the cluster supports it. |
| Subdomain | bool | `false` | Whether to use a DNS subdomain for each controller. |
| ingress-nginx.Enabled | bool | `false` | Installs the [ingress-nginx](https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx) controller (optional). Enable this section if you don't have an existing installation of ingress-nginx controller Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16 | | ingress-nginx.Enabled | bool | `false` | Installs the [ingress-nginx](https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx) controller (optional). Enable this section if you don't have an existing installation of ingress-nginx controller Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16 |
| ingress-nginx.controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | | | ingress-nginx.controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
| ingress-nginx.controller.ingressClass | string | `"nginx"` | | | ingress-nginx.controller.ingressClass | string | `"nginx"` | |
......
helm/templates/_helpers.tpl
View file @ 0f4b20ea
...@@ -88,6 +88,12 @@ true ...@@ -88,6 +88,12 @@ true
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- define "cloudbees-core.use-subdomain" -}}
{{- if and (eq (typeOf .Values.Subdomain) "bool") (eq .Values.Subdomain true) -}}
true
{{- end -}}
{{- end -}}
{{/* {{/*
Return labels, including instance and name. Return labels, including instance and name.
*/}} */}}
...@@ -109,7 +115,18 @@ helm.sh/chart: {{ include "cloudbees-core.chart" . | quote }} ...@@ -109,7 +115,18 @@ helm.sh/chart: {{ include "cloudbees-core.chart" . | quote }}
Sanitize Operations Center context path to never have a trailing slash Sanitize Operations Center context path to never have a trailing slash
*/}} */}}
{{- define "oc.contextpath" -}} {{- define "oc.contextpath" -}}
{{ trimSuffix "/" .Values.OperationsCenter.ContextPath }} {{- if not (empty .Values.OperationsCenter.ContextPath) -}}
{{- trimSuffix "/" .Values.OperationsCenter.ContextPath -}}
{{- else -}}
{{- if not (include "cloudbees-core.use-subdomain" .) -}}
/
{{- include "oc.name" . }}
{{- end -}}
{{- end -}}
{{- end -}}
{{- define "oc.name" -}}
{{ .Values.OperationsCenter.Name }}
{{- end -}} {{- end -}}
{{- define "oc.defaultPort" -}} {{- define "oc.defaultPort" -}}
...@@ -130,14 +147,34 @@ Sanitize Operations Center context path to never have a trailing slash ...@@ -130,14 +147,34 @@ Sanitize Operations Center context path to never have a trailing slash
Expected Operations Center Hostname. Include port if not 80/443. Expected Operations Center Hostname. Include port if not 80/443.
*/}} */}}
{{- define "oc.hostname" -}} {{- define "oc.hostname" -}}
{{ .Values.OperationsCenter.HostName }}{{- include "oc.optionalPort" . -}} {{- include "oc.hostnamewithoutport" . -}}{{- include "oc.optionalPort" . -}}
{{- end -}}
{{/*
Expected Operations Center Hostname. Include port if not 80/443.
*/}}
{{- define "oc.hostnamewithoutport" -}}
{{- if (include "cloudbees-core.use-subdomain" .) -}}
{{- include "oc.name" . -}}.
{{- end -}}
{{ .Values.OperationsCenter.HostName }}
{{- end -}}
{{/*
Expected Operations Center Hostname. Include port if not 80/443.
*/}}
{{- define "hibernation.hostnamewithoutport" -}}
{{- if (include "cloudbees-core.use-subdomain" .) -}}
hibernation-{{ .Release.Namespace }}.
{{- end -}}
{{ .Values.OperationsCenter.HostName }}
{{- end -}} {{- end -}}
{{/* {{/*
Expected Operations Center URL. Always ends with a trailing slash. Expected Operations Center URL. Always ends with a trailing slash.
*/}} */}}
{{- define "oc.url" -}} {{- define "oc.url" -}}
{{- template "oc.protocol" . -}}://{{ include "oc.hostname" . }}{{ include "oc.contextpath" . }}/ {{- include "oc.protocol" . -}}://{{ include "oc.hostname" . }}{{ include "oc.contextpath" . }}/
{{- end -}} {{- end -}}
{{- define "ingress.annotations" -}} {{- define "ingress.annotations" -}}
...@@ -161,6 +198,21 @@ nginx.ingress.kubernetes.io/ssl-redirect: "{{- template "ingress.ssl_redirect" . ...@@ -161,6 +198,21 @@ nginx.ingress.kubernetes.io/ssl-redirect: "{{- template "ingress.ssl_redirect" .
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- define "cjoc.ingress.annotations" -}}
{{ include "ingress.annotations" . }}
{{- if eq .Values.OperationsCenter.Platform "eks" }}
alb.ingress.kubernetes.io/healthcheck-path: {{ include "oc.contextpath" . }}/login
{{- end }}
{{- end }}
{{- define "hibernationMonitor.ingress.annotations" -}}
{{ include "ingress.annotations" . }}
{{- if eq .Values.OperationsCenter.Platform "eks" }}
alb.ingress.kubernetes.io/healthcheck-path: /health/live
{{- end }}
{{- end }}
{{- define "ingress.root-redirect" -}} {{- define "ingress.root-redirect" -}}
{{ include "oc.contextpath" . }}/teams-check/ {{ include "oc.contextpath" . }}/teams-check/
{{- end }} {{- end }}
...@@ -191,7 +243,9 @@ extensions ...@@ -191,7 +243,9 @@ extensions
{{- end -}} {{- end -}}
{{- define "ingress.apiVersion" -}} {{- define "ingress.apiVersion" -}}
{{- if ge (atoi (.Capabilities.KubeVersion.Minor)) 15 -}} {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
networking.k8s.io/v1
{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" -}}
networking.k8s.io/v1beta1 networking.k8s.io/v1beta1
{{- else -}} {{- else -}}
extensions/v1beta1 extensions/v1beta1
...@@ -202,6 +256,30 @@ extensions/v1beta1 ...@@ -202,6 +256,30 @@ extensions/v1beta1
{{- .Values.OperationsCenter.Ingress.tls.Enable }} {{- .Values.OperationsCenter.Ingress.tls.Enable }}
{{- end -}} {{- end -}}
{{- define "ingress.backend.cjoc" -}}
{{- if eq (include "ingress.apiVersion" .) "networking.k8s.io/v1" -}}
service:
name: cjoc
port:
number: {{ .Values.OperationsCenter.ServicePort }}
{{- else -}}
serviceName: cjoc
servicePort: {{ .Values.OperationsCenter.ServicePort }}
{{- end -}}
{{- end -}}
{{- define "ingress.backend.hibernation" -}}
{{- if eq (include "ingress.apiVersion" .) "networking.k8s.io/v1" -}}
service:
name: managed-master-hibernation-monitor
port:
number: 80
{{- else -}}
serviceName: managed-master-hibernation-monitor
servicePort: 80
{{- end -}}
{{- end -}}
{{/* {{/*
If rbac.installCluster is defined, honor it. If rbac.installCluster is defined, honor it.
Otherwise, default to true, except on Openshift 3 where we default to "" (falsy) Otherwise, default to true, except on Openshift 3 where we default to "" (falsy)
...@@ -471,3 +549,11 @@ status: ...@@ -471,3 +549,11 @@ status:
true true
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- define "hibernation.routenonnamespacedurls" -}}
{{- if and (eq (typeOf .Values.OperationsCenter.Enabled) "bool") (eq .Values.OperationsCenter.Enabled false) -}}
true
{{- else -}}
false
{{- end -}}
{{- end -}}
helm/templates/cjoc-configure-jenkins-groovy.yaml
View file @ 0f4b20ea
...@@ -7,7 +7,7 @@ metadata: ...@@ -7,7 +7,7 @@ metadata:
{{ include "cloudbees-core.labels" . | indent 4 }} {{ include "cloudbees-core.labels" . | indent 4 }}
data: data:
location.groovy: | location.groovy: |
{{- if .Values.OperationsCenter.HostName }} {{- if (include "oc.hostnamewithoutport" .) }}
jenkins.model.JenkinsLocationConfiguration.get().setUrl("{{- template "oc.url" . -}}") jenkins.model.JenkinsLocationConfiguration.get().setUrl("{{- template "oc.url" . -}}")
{{- end }} {{- end }}
{{- if .Values.OperationsCenter.ExtraGroovyConfiguration }} {{- if .Values.OperationsCenter.ExtraGroovyConfiguration }}
......
helm/templates/cjoc-ingress.yaml
View file @ 0f4b20ea
...@@ -8,7 +8,7 @@ metadata: ...@@ -8,7 +8,7 @@ metadata:
labels: labels:
{{ include "cloudbees-core.labels" . | indent 4 }} {{ include "cloudbees-core.labels" . | indent 4 }}
annotations: annotations:
{{ include "ingress.annotations" . | indent 4 }} {{ include "cjoc.ingress.annotations" . | indent 4 }}
{{- if not (include "cloudbees-core.is-openshift" .) }} {{- if not (include "cloudbees-core.is-openshift" .) }}
nginx.ingress.kubernetes.io/app-root: {{ include "ingress.root-redirect" . | quote }} nginx.ingress.kubernetes.io/app-root: {{ include "ingress.root-redirect" . | quote }}
# "413 Request Entity Too Large" uploading plugins, increase client_max_body_size # "413 Request Entity Too Large" uploading plugins, increase client_max_body_size
...@@ -18,24 +18,26 @@ metadata: ...@@ -18,24 +18,26 @@ metadata:
spec: spec:
rules: rules:
- -
{{- if .Values.OperationsCenter.HostName }} {{- if (include "oc.hostnamewithoutport" . ) }}
host: {{ .Values.OperationsCenter.HostName | quote }} host: {{ include "oc.hostnamewithoutport" . | quote }}
{{- end }} {{- end }}
http: http:
paths: paths:
{{- include "ingress.redirect-rules" . | indent 6 }} {{- include "ingress.redirect-rules" . | indent 6 }}
- path: {{ include "oc.contextpath" . }} - path: {{ include "oc.contextpath" . | quote }}
backend: backend:
serviceName: cjoc {{ include "ingress.backend.cjoc" . | indent 10 -}}
servicePort: {{ .Values.OperationsCenter.ServicePort }} {{ if eq (include "ingress.apiVersion" .) "networking.k8s.io/v1" }}
pathType: Prefix
{{ else }}
- path: {{ include "oc.contextpath" . }}/* - path: {{ include "oc.contextpath" . }}/*
backend: backend:
serviceName: cjoc {{ include "ingress.backend.cjoc" . | indent 10 -}}
servicePort: {{ .Values.OperationsCenter.ServicePort }} {{- end -}}
{{- if .Values.OperationsCenter.Ingress.tls.Enable }} {{- if .Values.OperationsCenter.Ingress.tls.Enable }}
tls: tls:
- hosts: - hosts:
- {{ .Values.OperationsCenter.HostName | quote }} - {{ include "oc.hostnamewithoutport" . | quote }}
secretName: {{ .Values.OperationsCenter.Ingress.tls.SecretName }} secretName: {{ .Values.OperationsCenter.Ingress.tls.SecretName }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
......
helm/templates/cjoc-route.yaml
View file @ 0f4b20ea
...@@ -7,8 +7,8 @@ metadata: ...@@ -7,8 +7,8 @@ metadata:
labels: labels:
{{ include "cloudbees-core.labels" . | indent 4 }} {{ include "cloudbees-core.labels" . | indent 4 }}
spec: spec:
{{- if .Values.OperationsCenter.HostName }} {{- if (include "oc.hostnamewithoutport" .) }}
host: {{ .Values.OperationsCenter.HostName | quote }} host: {{ include "oc.hostnamewithoutport" . | quote }}
{{- end }} {{- end }}
path: {{ include "oc.contextpath" . | quote }} path: {{ include "oc.contextpath" . | quote }}
to: to:
......
helm/templates/cjoc-statefulset.yaml
View file @ 0f4b20ea
...@@ -116,6 +116,10 @@ spec: ...@@ -116,6 +116,10 @@ spec:
-Dcom.cloudbees.jenkins.plugins.kube.NamespaceFilter.defaultNamespace={{ template "agents.namespace" . }} -Dcom.cloudbees.jenkins.plugins.kube.NamespaceFilter.defaultNamespace={{ template "agents.namespace" . }}
{{- end }} {{- end }}
-Dcom.cloudbees.jenkins.plugins.kube.ServiceAccountFilter.defaultServiceAccount={{ .Values.rbac.agentsServiceAccountName }} -Dcom.cloudbees.jenkins.plugins.kube.ServiceAccountFilter.defaultServiceAccount={{ .Values.rbac.agentsServiceAccountName }}
-Dcom.cloudbees.networking.useSubdomain={{ default "false" (include "cloudbees-core.use-subdomain" .) }}
-Dcom.cloudbees.networking.protocol={{ include "oc.protocol" . }}
-Dcom.cloudbees.networking.hostname={{ .Values.OperationsCenter.HostName }}
-Dcom.cloudbees.networking.port={{ include "oc.port" . }}
{{- if .Values.Master.JavaOpts }} {{- if .Values.Master.JavaOpts }}
{{ .Values.Master.JavaOpts }} {{ .Values.Master.JavaOpts }}
{{- end }} {{- end }}
...@@ -137,6 +141,10 @@ spec: ...@@ -137,6 +141,10 @@ spec:
-Dcom.cloudbees.opscenter.analytics.reporter.JocAnalyticsReporter.PERIOD=120 -Dcom.cloudbees.opscenter.analytics.reporter.JocAnalyticsReporter.PERIOD=120
-Dcom.cloudbees.opscenter.analytics.reporter.metrics.AperiodicMetricSubmitter.PERIOD=120 -Dcom.cloudbees.opscenter.analytics.reporter.metrics.AperiodicMetricSubmitter.PERIOD=120
-Dcom.cloudbees.opscenter.analytics.FeederConfiguration.PERIOD=120 -Dcom.cloudbees.opscenter.analytics.FeederConfiguration.PERIOD=120
-Dcom.cloudbees.networking.useSubdomain={{ default "false" (include "cloudbees-core.use-subdomain" .) }}
-Dcom.cloudbees.networking.protocol={{ include "oc.protocol" . }}
-Dcom.cloudbees.networking.hostname={{ .Values.OperationsCenter.HostName }}
-Dcom.cloudbees.networking.port={{ include "oc.port" . }}
-Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesMasterProvisioning.fsGroup={{ include "oc.fsGroup" . }} -Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesMasterProvisioning.fsGroup={{ include "oc.fsGroup" . }}
-Dcom.cloudbees.jce.masterprovisioning.DockerImageDefinitionConfiguration.disableAutoConfiguration=true -Dcom.cloudbees.jce.masterprovisioning.DockerImageDefinitionConfiguration.disableAutoConfiguration=true
-Dcom.cloudbees.jce.masterprovisioning.DockerImageDefinitionConfiguration.masterImageName={{ include "mm.longname" . | quote}} -Dcom.cloudbees.jce.masterprovisioning.DockerImageDefinitionConfiguration.masterImageName={{ include "mm.longname" . | quote}}
...@@ -151,7 +159,7 @@ spec: ...@@ -151,7 +159,7 @@ spec:
{{- if .Values.OperationsCenter.Ingress.Class }} {{- if .Values.OperationsCenter.Ingress.Class }}
-Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesMasterProvisioning.ingressClass={{ .Values.OperationsCenter.Ingress.Class }} -Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesMasterProvisioning.ingressClass={{ .Values.OperationsCenter.Ingress.Class }}
{{- end }} {{- end }}
{{- if not (.Values.OperationsCenter.HostName) }} {{- if not (include "oc.hostnamewithoutport" .) }}
-Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesClusterEndpoint.wildcardIngress=true -Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesClusterEndpoint.wildcardIngress=true
{{- end }} {{- end }}
{{- if .Values.OperationsCenter.JavaOpts }} {{- if .Values.OperationsCenter.JavaOpts }}
...@@ -164,7 +172,7 @@ spec: ...@@ -164,7 +172,7 @@ spec:
{{- if .Values.OperationsCenter.HostName }} {{- if .Values.OperationsCenter.HostName }}
-Dcom.cloudbees.jenkins.plugins.platform.PlatformConfiguration.url={{- include "oc.protocol" . -}}://{{ include "oc.hostname" . }}/ -Dcom.cloudbees.jenkins.plugins.platform.PlatformConfiguration.url={{- include "oc.protocol" . -}}://{{ include "oc.hostname" . }}/
{{- end }} {{- end }}
-Dcom.cloudbees.jenkins.plugins.platform.PlatformServer.apiUrl=https://flow-server:8443/ -Dcom.cloudbees.jenkins.plugins.platform.PlatformServer.apiUrl=https://flow-server.{{ .Release.Namespace }}:8443/
{{- end }} {{- end }}
-XX:+UseG1GC -XX:+UseG1GC
-XX:+DisableExplicitGC -XX:+DisableExplicitGC
......
helm/templates/managed-master-hibernation-monitor-deployment.yaml
View file @ 0f4b20ea
...@@ -48,6 +48,9 @@ spec: ...@@ -48,6 +48,9 @@ spec:
imagePullPolicy: {{ .dockerPullPolicy }} imagePullPolicy: {{ .dockerPullPolicy }}
{{- end}} {{- end}}
{{- end}} {{- end}}
args:
- '-Dcom.cloudbees.networking.useSubdomain={{ default "false" (include "cloudbees-core.use-subdomain" .) }}'
- '-Dcom.cloudbees.networking.routeNonnamespacedURLs={{- include "hibernation.routenonnamespacedurls" . }}'
ports: ports:
- containerPort: 8090 - containerPort: 8090
name: http name: http
......
helm/templates/managed-master-hibernation-monitor-ingress.yaml
View file @ 0f4b20ea
...@@ -7,35 +7,40 @@ metadata: ...@@ -7,35 +7,40 @@ metadata:
labels: labels:
{{ include "cloudbees-core.labels" . | indent 4 }} {{ include "cloudbees-core.labels" . | indent 4 }}
annotations: annotations:
{{ include "ingress.annotations" . | indent 4 }} {{ include "hibernationMonitor.ingress.annotations" . | indent 4}}
spec: spec:
rules: rules:
- -
{{- if .Values.OperationsCenter.HostName }} {{- if (include "hibernation.hostnamewithoutport" . ) }}
host: {{ .Values.OperationsCenter.HostName | quote }} host: {{ include "hibernation.hostnamewithoutport" . | quote }}
{{- end }} {{- end }}
http: http:
paths: paths:
- path: /hibernation/ns/{{ .Release.Namespace }}/ - path: /hibernation/ns/{{ .Release.Namespace }}/
backend: backend:
serviceName: managed-master-hibernation-monitor {{ include "ingress.backend.hibernation" . | indent 10 }}
servicePort: 80 {{- if eq (include "ingress.apiVersion" .) "networking.k8s.io/v1" }}
pathType: Prefix
{{- else }}
- path: /hibernation/ns/{{ .Release.Namespace }}/* - path: /hibernation/ns/{{ .Release.Namespace }}/*
backend: backend:
serviceName: managed-master-hibernation-monitor
servicePort: 80 {{ include "ingress.backend.hibernation" . | indent 10 }}
{{- end }}
- path: /hibernation/ - path: /hibernation/
backend: backend:
serviceName: managed-master-hibernation-monitor {{ include "ingress.backend.hibernation" . | indent 10 }}
servicePort: 80 {{- if eq (include "ingress.apiVersion" .) "networking.k8s.io/v1" }}
pathType: Prefix
{{- else }}
- path: /hibernation/* - path: /hibernation/*
backend: backend:
serviceName: managed-master-hibernation-monitor {{ include "ingress.backend.hibernation" . | indent 10 }}
servicePort: 80 {{- end }}
{{- if .Values.OperationsCenter.Ingress.tls.Enable }} {{- if .Values.OperationsCenter.Ingress.tls.Enable }}
tls: tls:
- hosts: - hosts:
- {{ .Values.OperationsCenter.HostName | quote }} - {{ include "hibernation.hostnamewithoutport" . | quote }}
secretName: {{ .Values.OperationsCenter.Ingress.tls.SecretName }} secretName: {{ .Values.OperationsCenter.Ingress.tls.SecretName }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
......
helm/templates/managed-master-hibernation-monitor-route-namespaced.yaml
View file @ 0f4b20ea
...@@ -5,8 +5,8 @@ kind: Route ...@@ -5,8 +5,8 @@ kind: Route
metadata: metadata:
name: managed-master-hibernation-monitor-namespaced name: managed-master-hibernation-monitor-namespaced
spec: spec:
{{- if .Values.OperationsCenter.HostName }} {{- if (include "hibernation.hostnamewithoutport" . ) }}
host: {{ .Values.OperationsCenter.HostName | quote }} host: {{ include "hibernation.hostnamewithoutport" . | quote }}
{{- end }} {{- end }}
path: /hibernation/ns/{{ .Release.Namespace }} path: /hibernation/ns/{{ .Release.Namespace }}
to: to:
......
helm/templates/managed-master-hibernation-monitor-route.yaml
View file @ 0f4b20ea
{{- if .Values.OperationsCenter.Enabled -}}
{{- if .Values.Hibernation.Enabled -}} {{- if .Values.Hibernation.Enabled -}}
{{- if include "cloudbees-core.needs-routes" . -}} {{- if include "cloudbees-core.needs-routes" . -}}
apiVersion: route.openshift.io/v1 apiVersion: route.openshift.io/v1
...@@ -6,8 +5,8 @@ kind: Route ...@@ -6,8 +5,8 @@ kind: Route
metadata: metadata:
name: managed-master-hibernation-monitor name: managed-master-hibernation-monitor
spec: spec:
{{- if .Values.OperationsCenter.HostName }} {{- if (include "hibernation.hostnamewithoutport" . ) }}
host: {{ .Values.OperationsCenter.HostName | quote }} host: {{ include "hibernation.hostnamewithoutport" . | quote }}
{{- end }} {{- end }}
path: /hibernation path: /hibernation
to: to:
...@@ -21,4 +20,3 @@ spec: ...@@ -21,4 +20,3 @@ spec:
{{ include "chart.helmRouteFix" $ }} {{ include "chart.helmRouteFix" $ }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}}
helm/values.yaml
View file @ 0f4b20ea
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
# This is a YAML-formatted file. # This is a YAML-formatted file.
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
# Subdomain -- Whether to use a DNS subdomain for each controller.
Subdomain: false
# ingress-nginx.Enabled -- Installs the [ingress-nginx](https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx) controller (optional). # ingress-nginx.Enabled -- Installs the [ingress-nginx](https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx) controller (optional).
# Enable this section if you don't have an existing installation of ingress-nginx controller # Enable this section if you don't have an existing installation of ingress-nginx controller
# Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16 # Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16
...@@ -54,7 +57,7 @@ OperationsCenter: ...@@ -54,7 +57,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.277.1.7-ra dockerImage: dcar/core-oc:2.277.2.1-ra
# 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: null dockerPullPolicy: null
...@@ -73,7 +76,13 @@ OperationsCenter: ...@@ -73,7 +76,13 @@ OperationsCenter:
HostName: null HostName: null
# OperationsCenter.ContextPath -- the path under which Operations Center will be accessible in the given host. # OperationsCenter.ContextPath -- the path under which Operations Center will be accessible in the given host.
ContextPath: /cjoc # DEPRECATED - Use OperationsCenter.Name instead.
ContextPath: null
# OperationsCenter.Name -- the name in the URL under which Operations Center will be accessible in the given host.
# For instance, if Subdomain is true, the URL to access Operations Center will be {{OperationsCenter.Protocol}}://{{OperationsCenter.Name}}.{{OperationsCenter.HostName}}:{{OperationsCenter.Port}}
# If Subdomain is false, the URL to access Operations Center will be {{OperationsCenter.Protocol}}://{{OperationsCenter.HostName}}:{{OperationsCenter.Port}}/{{OperationsCenter.Name}}
Name: cjoc
# OperationsCenter.Protocol -- the protocol used to access CJOC. Possible values are http/https. # OperationsCenter.Protocol -- the protocol used to access CJOC. Possible values are http/https.
Protocol: http Protocol: http
...@@ -253,7 +262,7 @@ Master: ...@@ -253,7 +262,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.277.1.7-ra dockerImage: dcar/core-mm:2.277.2.1-ra
# 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
...@@ -270,7 +279,7 @@ Agents: ...@@ -270,7 +279,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.277.1.7-ra dockerImage: dcar/agent:2.277.2.1-ra
# Image pull secrets # Image pull secrets
# Enable this option when using a private registry. # 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 # https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-secret-by-providing-credentials-on-the-command-line
...@@ -306,7 +315,7 @@ Hibernation: ...@@ -306,7 +315,7 @@ Hibernation:
Enabled: false Enabled: false
Image: Image:
# Hibernation.Image.dockerImage -- Used to override the default docker image # Hibernation.Image.dockerImage -- Used to override the default docker image
dockerImage: cloudbees/managed-master-hibernation-monitor:230.ee066a318539 dockerImage: cloudbees/managed-master-hibernation-monitor:247.c5dfce00a179
# Hibernation.Image.dockerPullPolicy -- Used to override the default pull policy # Hibernation.Image.dockerPullPolicy -- Used to override the default pull policy
dockerPullPolicy: null dockerPullPolicy: null
# Image pull secrets # Image pull secrets
......
scripts/usr/local/bin/jenkins.sh
View file @ 0f4b20ea
...@@ -52,7 +52,7 @@ find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \; ...@@ -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 `docker run` first argument start with `--` the user is passing jenkins launcher arguments
if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=d7a5eee17fd68064fb4268ca23a591bdc00af60b /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=308768c9f176b5155dd19ff01ca06396b66f5afd /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\""
fi fi
# As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image # As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image
......
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

UNCLASSIFIED