-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Added notice for setting up external jenkins #3452
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added notice for setting up external jenkins #3452
Conversation
@bparees sorry, forgot to ping you. ptal? |
@oatmealraisin Thanks! Is this for 3.4, or does it apply to the current release? |
@ahardin-rh It should apply to the current release, but I'll let Ben have the final word on that |
the technique applies to 3.4 and beyond, since 3.4 is when we introduced autoprovisioning. |
|
||
[IMPORTANT] | ||
==== | ||
If you're using an external Jenkins server to manage your pipeline, you'll need |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/you're/you are
s/you'll need to create/you must create
==== | ||
If you're using an external Jenkins server to manage your pipeline, you'll need | ||
to create a service for {product-title} to use it. | ||
xref:../dev_guide/integrating_external_services.adoc#dev-guide-integrating-external-services[Learn more about integrating external services.] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we want to say more on this topic. We are trying to communicate two things:
-
if you want to prevent autoprovisioning from happening, you can do so by creating a properly named service(and make it clear how to determine that name), which will block the autoprovisioning (because the service already exists).
-
one reason you might want to do (1) is because you already have a jenkins server that you want to use. that server could be running in another project, or external to openshift entirely. either way, you should point the service you create in fulfillment of (1), to that jenkins, using the external service mechanism.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm going to absorb the warning above to try not to repeat information, how does that sound?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes i think it's all related information that can be in a single warning/note block.
@bparees I've updated the language to try and be more clear about why you would manually create a service. However, I didn't explicitly say that you could disable autoprovisioning by creating a Service matching serviceName. My worry is that we'd have to take more language to explain the case where you couldn't edit the autoProvisionEnabled option. Let me know if I should use this language anyways :) Also, I noticed that this pull was tagged I've made changes to Builds and Image Streams, ptal? |
i still think we need to discuss it. there are really two cases and we should mention them both:
|
@bparees I've removed the IMPORTANT tag and expanded on what is said. I mentioned the second case at the end of the article, is that sufficient? |
xref:../dev_guide/integrating_external_services.adoc#dev-guide-integrating-external-services[Learn more about integrating external services.] | ||
endif::[] | ||
ifndef::openshift-online[] | ||
For more details on how the Jenkins server is deployed, see |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"For more details on how the Jenkins server is deployed and how to configure or disable the autoprovisioning behavior, see"
server external to {product-title}, for example), create a Service with the | ||
name `*jenkins*` in your project, and configure it to point to the external | ||
Jenkins. | ||
xref:../dev_guide/integrating_external_services.adoc#dev-guide-integrating-external-services[Learn more about integrating external services.] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
drop these lines (145-150). in general we try to keep implementation/config details out of the "architecture" section. it's a high level overview of concepts, not a usage guide.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think that the install_config section will show up for online documentation, should we put this blurb somewhere else or leave it out?
Jenkins. | ||
xref:../dev_guide/integrating_external_services.adoc#dev-guide-integrating-external-services[Learn more about integrating external services.] | ||
endif::[] | ||
ifndef::openshift-online[] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this ifndef?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The document in the link doesn't exist in the online version, and will lead to a 404
edit: I removed them in the latest version
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but it sounds like that means online users will have no guidance whatsoever for how to disable autoprovisioning.
* If you're a cluster admin, simply set `*autoProvisionEnabled*` to `*false*`. | ||
This will disable autoprovisioning across the cluster. | ||
* If you're an unpriviledged user, a Service must be created for {product-title} | ||
to use. The default value of `*serviceName*` is `*jenkins*`. However, this only |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"The service name must match the cluster configuration value of serviceName in the jenkinsPipelineConfig. The default value is jenkins."
* If you're an unpriviledged user, a Service must be created for {product-title} | ||
to use. The default value of `*serviceName*` is `*jenkins*`. However, this only | ||
disables autoprovisioning on a project-by-project level. | ||
xref:../dev_guide/integrating_external_services.adoc#dev-guide-integrating-external-services[Learn more about integrating external services.] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"If you are disabling autoprovisioning because you are running a Jenkins server outside your project, it is recommended to point this new service to your existing Jenkins server. See:"
@bparees I've implemented your requests, ptal? |
lgtm |
@ahardin-rh ptal/merge? |
(if you would like to use a Jenkins server external to {product-title}, for | ||
example), there are a few things you can do, depending on who you are. | ||
|
||
* If you're a cluster admin, simply set `*autoProvisionEnabled*` to `*false*`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/you're/you are
s/admin/administrator
|
||
* If you're a cluster admin, simply set `*autoProvisionEnabled*` to `*false*`. | ||
This will disable autoprovisioning across the cluster. | ||
* If you're an unpriviledged user, a Service must be created for {product-title} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/you're/you are
to use. The service name must match the cluster configuration value of | ||
`*serviceName*` in the `*jenkinsPipelineConfig*`. The default value is | ||
`*jenkins*`. If you are disabling autoprovisioning because you are running a | ||
Jenkins server outside your project, it is recommended to point this new |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it is recommended that you point this new...
@oatmealraisin just a few minor nits from me. Once those are addressed and commits squashed, we should be golden. 🌟 Thanks! |
This is for users interested in using existing Jenkins servers for the pipeline build strategy.
@ahardin-rh Done! Merge? |
[rev_history] |
This is for users interested in using existing Jenkins servers for
the pipeline build strategy.
I have language for putting more detail into the Pipeline page, but it seems that the External Services page is sufficient.