Skip to content

Commit

Permalink
Merge pull request #289 from waveywaves/jenkins-monitored-update
Browse files Browse the repository at this point in the history 
Bug 1836032: Fix Jenkins Monitored templates typo and other updates
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Jun 10, 2020
2 parents 500c8ae + e42d8f9 commit 4f18aab
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 5 deletions.
25 changes: 23 additions & 2 deletions tmp/build/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"message": "A Jenkins service (monitored via prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.",
"metadata": {
"annotations": {
"description": "Jenkins service, without persistent storage.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing.",
"description": "Jenkins service, without persistent storage. \n\n To run this template extra RBAC permissions need to be provideed to the use to be able to create the ServiceMonitor Custom Resource managed by the prometheus-operator. \n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing.",
"iconClass": "icon-jenkins",
"openshift.io/display-name": "Jenkins (Ephemeral)",
"openshift.io/documentation-url": "https://docs.okd.io/latest/using_images/other_images/jenkins.html",
"openshift.io/long-description": "This template deploys a Jenkins server capable of managing OpenShift Pipeline builds and supporting OpenShift-based oauth login. The Jenkins configuration is stored in non-persistent storage, so this configuration should be used for experimental purposes only.",
"openshift.io/long-description": "This template deploys a Jenkins server capable of managing OpenShift Pipeline builds and supporting OpenShift-based oauth login and Prometheus monitoring. DISCLAIMER: User needs to have RBAC Permissions to create the Service Monitor. The Jenkins configuration is stored in non-persistent storage, so this configuration should be used for experimental purposes only.",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"openshift.io/support-url": "https://access.redhat.com",
"tags": "instant-app,jenkins"
Expand Down Expand Up @@ -41,6 +41,16 @@
}
}
},
{
"apiVersion": "v1",
"kind": "ConfigMap",
"metadata": {
"labels": {
"config.openshift.io/inject-trusted-cabundle": "true"
},
"name": "${JENKINS_SERVICE_NAME}-trusted-ca-bundle"
}
},
{
"apiVersion": "v1",
"kind": "DeploymentConfig",
Expand Down Expand Up @@ -137,6 +147,10 @@
{
"mountPath": "/var/lib/jenkins",
"name": "${JENKINS_SERVICE_NAME}-data"
},
{
"mountPath": "/etc/pki/ca-trust/source/anchors",
"name": "${JENKINS_SERVICE_NAME}-trusted-ca-bundle"
}
]
}
Expand All @@ -150,6 +164,13 @@
"medium": ""
},
"name": "${JENKINS_SERVICE_NAME}-data"
},
{
"configMap": {
"name": "${JENKINS_SERVICE_NAME}-trusted-ca-bundle",
"optional": true
},
"name": "${JENKINS_SERVICE_NAME}-trusted-ca-bundle"
}
]
}
Expand Down
27 changes: 24 additions & 3 deletions tmp/build/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent-monitored.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"message": "A Jenkins service (monitored via Prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.",
"metadata": {
"annotations": {
"description": "Jenkins service, with persistent storage.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.",
"description": "Jenkins service, with persistent storage. \n\n To run this template extra RBAC permissions need to be provideed to the use to be able to create the ServiceMonitor Custom Resource managed by the prometheus-operator. \n\nNOTE: You must have persistent volumes available in your cluster to use this template.",
"iconClass": "icon-jenkins",
"openshift.io/display-name": "Jenkins",
"openshift.io/documentation-url": "https://docs.okd.io/latest/using_images/other_images/jenkins.html",
"openshift.io/long-description": "This template deploys a Jenkins server capable of managing OpenShift Pipeline builds and supporting OpenShift-based oauth login.",
"openshift.io/long-description": "This template deploys a Jenkins server capable of managing OpenShift Pipeline builds and supporting OpenShift-based oauth login and Prometheus monitoring. DISCLAIMER: User needs to have RBAC Permissions to create the Service Monitor.",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"openshift.io/support-url": "https://access.redhat.com",
"tags": "instant-app,jenkins"
Expand Down Expand Up @@ -58,6 +58,16 @@
}
}
},
{
"apiVersion": "v1",
"kind": "ConfigMap",
"metadata": {
"labels": {
"config.openshift.io/inject-trusted-cabundle": "true"
},
"name": "${JENKINS_SERVICE_NAME}-trusted-ca-bundle"
}
},
{
"apiVersion": "v1",
"kind": "DeploymentConfig",
Expand Down Expand Up @@ -158,6 +168,10 @@
{
"mountPath": "/var/lib/jenkins",
"name": "${JENKINS_SERVICE_NAME}-data"
},
{
"mountPath": "/etc/pki/ca-trust/source/anchors",
"name": "${JENKINS_SERVICE_NAME}-trusted-ca-bundle"
}
]
}
Expand All @@ -171,6 +185,13 @@
"persistentVolumeClaim": {
"claimName": "${JENKINS_SERVICE_NAME}"
}
},
{
"configMap": {
"name": "${JENKINS_SERVICE_NAME}-trusted-ca-bundle",
"optional": true
},
"name": "${JENKINS_SERVICE_NAME}-trusted-ca-bundle"
}
]
}
Expand Down Expand Up @@ -276,7 +297,7 @@
},
{
"apiVersion": "monitoring.coreos.com/v1",
"kind": " servicemonitor.monitoring.coreos.com",
"kind": "ServiceMonitor",
"metadata": {
"labels": {
"app": "${NAME}",
Expand Down

0 comments on commit 4f18aab

Please sign in to comment.