-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Add an ability to match machine configuration to OpenShift container by annotations #7391
Conversation
*/ | ||
public static String podName(String machineName) { | ||
return machineName.split("/")[0]; | ||
public static String machineName(Pod pod, Container container) { |
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.
You dont use anything from container except the name. Maybe leave param containerName
?
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'd leave Container
as it gives us an opportunity to use something else from container later.
|
||
@BeforeMethod | ||
public void setup() throws Exception { | ||
MockitoAnnotations.initMocks(this); | ||
internalRuntime = | ||
new OpenShiftInternalRuntime( | ||
internalRuntimeSpy = |
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.
Are you sure that you need spy here?
* Returns pod name that is extracted from machine name. | ||
* | ||
* @see #machineName(String, String) | ||
* Returns machine name that has the following format `{POD_NAME}/{CONTAINER_NAME}` or machine |
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.
Please rewrite java doc here to make clear that there are three possible ways in which machine name can be constructed.
I mean
- MACHINE_NAME_ANNOTATION_FMT
- CHE_ORIGINAL_NAME_LABEL
- Names of objects
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.
Looks good to me. A special thank for repairing che debug mode! 👍
What does this PR do?
Provides a way to implement converter from docker image recipes into OpenShift recipes.
Provides an ability to use simple (not composite) machine names in OpenShift recipes.
Fix provisioning of Che debug property in deploy_che.sh.
Adds logs filtering for foreign containers while workspace start.
What issues does this PR fix or reference?
#7308
#7367
Release Notes
n/a