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.

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

mantle/ore: gcloud: clean up upload.go, stop mutating image name #1322

Conversation

dustymabe
Copy link
Member

Some cleanup in here to remove CL specific bits and change the code from mutating the image name on upload. See the individual commit messages for more info.

  • mantle/ore: gcloud: clean up a lot of CL specific bits in upload.go
  • mantle/ore: gcloud: remove bucket subpath from GCE image name

Copy link
Contributor

@bgilbert bgilbert left a comment

Choose a reason for hiding this comment

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

Re the second commit message, I don't think we ever needed it, I think it's just what we did. The code was introduced in d98ec2e and it might be good to link to that commit message for context.

mantle/cmd/ore/gcloud/upload.go Outdated Show resolved Hide resolved
- Don't try to detect or set defaults for bucket, name, or file arguments.
- Don't try to set a default prefix/path to use in GS buckets
Before this commit if I try to upload to gs://mybucket/fedora-coreos
my image name would get rewritten to append the path `fedora-coreos`
into the image name. For example:

- `fedora-coreos-31-20200404-dev-1-gcp-x86-64`

turns into

- `fedora-coreos-fedora-coreos-31-20200404-dev-1-gcp-x86-64`

This was introduced in d98ec2e and doesn't seem to be needed.
Let's rework it so that transformation doesn't happen.
@dustymabe dustymabe force-pushed the dusty-mantle-gcloud-upload-cleanup branch from bfb094c to 32b0062 Compare April 7, 2020 02:40
@dustymabe
Copy link
Member Author

Re the second commit message, I don't think we ever needed it, I think it's just what we did. The code was introduced in d98ec2e and it might be good to link to that commit message for context.

Update the second commit message to reference d98ec2e.

@dustymabe dustymabe marked this pull request as ready for review April 7, 2020 02:41
@dustymabe
Copy link
Member Author

cc @cgwalters - any issues with that second commit for the RHCOS pipeline?

@bgilbert
Copy link
Contributor

bgilbert commented Apr 7, 2020

/approve

@cgwalters
Copy link
Member

/lgtm

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bgilbert, cgwalters, dustymabe

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:
  • OWNERS [bgilbert,cgwalters,dustymabe]

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

@openshift-merge-robot openshift-merge-robot merged commit 1687e8d into coreos:master Apr 7, 2020
@dustymabe dustymabe deleted the dusty-mantle-gcloud-upload-cleanup branch April 7, 2020 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants