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

CONSOLE-2768: Update default and download deployments to use bindata #550

Merged
merged 6 commits into from
Sep 25, 2021
Merged

CONSOLE-2768: Update default and download deployments to use bindata #550

merged 6 commits into from
Sep 25, 2021

Conversation

florkbr
Copy link
Contributor

@florkbr florkbr commented May 25, 2021 •
edited
Loading

Tech debt - migrates our inline manifests for the default console deployment and the download deployment to Go bindata while substituting in necessary variables. This will make it clearer where to modify the base deployments in the console operator (versus looking through Go code). See bindata/deployments in the diff.

https://issues.redhat.com/browse/CONSOLE-2768

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 25, 2021
@florkbr florkbr requested a review from jhadvig May 25, 2021 22:21
@openshift-ci openshift-ci bot requested a review from spadgett May 25, 2021 22:21
@florkbr florkbr force-pushed the console-2768-deployments-to-bindata branch 2 times, most recently from 1f272a9 to a6d19df Compare May 27, 2021 15:35
jhadvig
jhadvig reviewed May 27, 2021
View reviewed changes
Copy link
Member

@jhadvig jhadvig left a comment

Choose a reason for hiding this comment

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

wondering if we will need to rewrite the deployment_test.go since we are not assembling the deployment programatically.

pkg/console/subresource/deployment/deployment.go Outdated Show resolved Hide resolved
pkg/console/subresource/deployment/deployment.go Outdated Show resolved Hide resolved
@jhadvig
Copy link
Member

jhadvig commented Jun 1, 2021

/retest

jhadvig
jhadvig reviewed Jun 1, 2021
View reviewed changes
Copy link
Member

@jhadvig jhadvig left a comment

Choose a reason for hiding this comment

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

@florkbr are you still working on the PR? Or can the WIP be removed?
Found two naming nits.

Also wondering if we still need TestDefaultDeployment and TestDefaultDownloadsDeployment in the deployment_test.go, since the the manifest is now static, except for generating:

  • annotations
  • replicas
  • affinity
  • volumes
  • containers

Thinking of rather migrating these into helpers(if they are already not) and unit test rather those.

bindata/deployments/console-default-deployment.yaml Outdated Show resolved Hide resolved
bindata/deployments/console-downloads-deployment.yaml Outdated Show resolved Hide resolved
@florkbr
Copy link
Contributor Author

florkbr commented Jun 1, 2021

@jhadvig I will remove the WIP, but am in the process of making your code review comment changes.

@florkbr florkbr changed the title [WIP] CONSOLE-2768: Update default and download deployments to use bindata CONSOLE-2768: Update default and download deployments to use bindata Jun 1, 2021
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 1, 2021
@jhadvig
Copy link
Member

jhadvig commented Jun 2, 2021

@florkbr let's keep TestDefaultDeployment and TestDefaultDownloadsDeployment TCs. Sorry for the confusion.

@florkbr florkbr changed the title CONSOLE-2768: Update default and download deployments to use bindata [WIP] CONSOLE-2768: Update default and download deployments to use bindata Jun 2, 2021
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2021
@florkbr florkbr force-pushed the console-2768-deployments-to-bindata branch from a6d19df to beb49b6 Compare June 2, 2021 18:34
@florkbr florkbr requested a review from jhadvig June 2, 2021 18:36
@florkbr
Copy link
Contributor Author

florkbr commented Jun 2, 2021

@jhadvig this snowballed on me, so I'm adding back the WIP until we sync and confirm this is what you had in mind.

  1. I have made your code review suggestions
  2. I used the auth operator as an example for string substitution in the yaml. We will now sub out simple things (image URLs)
  3. Less simple things that are yaml structured like volume mounts etc are set after we get the deployment struct
  4. I modified the UTs minimally to make them pass as an acceptance test. They are pretty useless IMO past seeing them pass once. I would like to refactor them as you stated previously (test the helpers I've added such as withAffinity etc)

@florkbr florkbr force-pushed the console-2768-deployments-to-bindata branch from beb49b6 to 7d7eede Compare June 2, 2021 18:48
@florkbr florkbr force-pushed the console-2768-deployments-to-bindata branch from 7d7eede to 4dbbe9f Compare June 10, 2021 16:49
@florkbr
CONSOLE-2768: Update default and download deployments to use bindata
9953c8d 
Migrates our inline manifests for the default console deployment and
the download deployment to bindata while substituting in necessary
variables.

https://issues.redhat.com/browse/CONSOLE-2768
@florkbr florkbr force-pushed the console-2768-deployments-to-bindata branch from 4dbbe9f to 9953c8d Compare June 10, 2021 22:39
@florkbr florkbr changed the title [WIP] CONSOLE-2768: Update default and download deployments to use bindata CONSOLE-2768: Update default and download deployments to use bindata Jun 10, 2021
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 10, 2021
@florkbr florkbr requested a review from jhadvig June 10, 2021 22:40
@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 15, 2021
@florkbr florkbr assigned RickJWagner and opayne1 and unassigned sferich888 Sep 21, 2021
@RickJWagner
Copy link

/lgtm
/label px-approved

@openshift-ci openshift-ci bot added the px-approved Signifies that Product Support has signed off on this PR label Sep 23, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 23, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: florkbr, jhadvig, RickJWagner

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

@opayne1
Copy link

opayne1 commented Sep 23, 2021

/label docs-approved

@openshift-ci openshift-ci bot added the docs-approved Signifies that Docs has signed off on this PR label Sep 23, 2021
@spadgett
Copy link
Member

/hold cancel
tide ensures the approved labels are present

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 23, 2021
@yanpzhan
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 24, 2021
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

14 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit bc56e6a into openshift:master Sep 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhadvig jhadvig jhadvig approved these changes

@spadgett spadgett Awaiting requested review from spadgett

Assignees

@RickJWagner RickJWagner

@jhadvig jhadvig

@yapei yapei

@ahardin-rh ahardin-rh

@opayne1 opayne1

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. docs-approved Signifies that Docs has signed off on this PR lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.