Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Bug 1914196: Use route port field for docker container port in Dockerfile import #7767

Merged
merged 1 commit into from Jan 12, 2021
Merged

Bug 1914196: Use route port field for docker container port in Dockerfile import #7767

merged 1 commit into from Jan 12, 2021

Conversation

rottencandy
Copy link
Contributor

Fixes:
https://issues.redhat.com/browse/ODC-4866

Analysis / Root cause:

When using the from dockerfile add flow, there are 2 similar fields that are used to specify which port the application is listening on: dockerfile conainer port & route target port
No matter what value is entered, target port never persisted anywhere.

Solution Description:
Remove the docker container port, and use only the route target port to create the service and route.

Screen shots / Gifs for design review:

tmp.mp4

cc: @openshift/team-devconsole-ux

Browser conformance:

  • Chrome
  • Firefox
  • Safari
  • Edge

/kind bug

@openshift-ci-robot openshift-ci-robot added kind/bug Categorizes issue or PR as related to a bug. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jan 8, 2021
@openshift-ci-robot
Copy link
Contributor

@rottencandy: This pull request references Bugzilla bug 1914196, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1914196: Use route port field for docker container port in Dockerfile import

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the component/dev-console Related to dev-console label Jan 8, 2021
@rottencandy
Copy link
Contributor Author

/retest

@openshift-ci-robot openshift-ci-robot added the kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated label Jan 11, 2021
divyanshiGupta
divyanshiGupta reviewed Jan 11, 2021
View reviewed changes
frontend/packages/dev-console/src/utils/shared-submit-utils.ts
if (buildStrategy === 'Docker') {
const port = { containerPort: _.get(formData, 'docker.containerPort'), protocol: 'TCP' };
if (buildStrategy === 'Docker' && unknownTargetPort) {
const port = { containerPort: _.toInteger(unknownTargetPort), protocol: 'TCP' };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of not adding a port at all maybe we can add the defaultUnknownPort here in case there is no unknownTargetPort

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

divyanshiGupta
divyanshiGupta reviewed Jan 12, 2021
View reviewed changes
frontend/packages/dev-console/src/utils/shared-submit-utils.ts Outdated
if (buildStrategy === 'Docker') {
const port = { containerPort: _.get(formData, 'docker.containerPort'), protocol: 'TCP' };
if (buildStrategy === 'Docker' && unknownTargetPort) {
const containerPort = _.toInteger(unknownTargetPort) || defaultUnknownPort;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that you dont need to add defaultUnknownPort here since there is already a condition below which checks if the ports are empty then use defaultUnknownPort.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed defaultUnknownPort. Tested without providing containerPort and defaultUnknownPort is used if no ports are stated.

@divyanshiGupta
Copy link
Contributor

/cc @openshift/team-devconsole-ux

@divyanshiGupta
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2021
rohitkrai03
rohitkrai03 approved these changes Jan 12, 2021
View reviewed changes
Copy link
Contributor

@rohitkrai03 rohitkrai03 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: divyanshiGupta, rohitkrai03, rottencandy

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 12, 2021
@openshift-merge-robot openshift-merge-robot merged commit e70f6c7 into openshift:master Jan 12, 2021
@openshift-ci-robot
Copy link
Contributor

@rottencandy: All pull requests linked via external trackers have merged:

Bugzilla bug 1914196 has been moved to the MODIFIED state.

In response to this:

Bug 1914196: Use route port field for docker container port in Dockerfile import

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@spadgett spadgett added this to the v4.7 milestone Jan 13, 2021
@rottencandy rottencandy deleted the dockerport branch February 8, 2021 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@divyanshiGupta divyanshiGupta divyanshiGupta left review comments

@rohitkrai03 rohitkrai03 rohitkrai03 approved these changes

@andrewballantyne andrewballantyne Awaiting requested review from andrewballantyne

@jerolimov jerolimov Awaiting requested review from jerolimov

Assignees

@divyanshiGupta divyanshiGupta

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/dev-console Related to dev-console kind/bug Categorizes issue or PR as related to a bug. kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
v4.7
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@rottencandy @openshift-ci-robot @divyanshiGupta @rohitkrai03 @spadgett @openshift-merge-robot