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

Bug 1813775: Publish license file #439

Merged
merged 4 commits into from Jun 15, 2020

Conversation

jhadvig
Copy link
Member

@jhadvig jhadvig commented Jun 15, 2020

Based on:

Addressing comments + rebasing on top of master and fixing tests, so we can start backport process.

Screen:
Screenshot 2020-06-15 at 17 22 06

Not sure if it makes sense to backport all four commits, since my last on removes most of the added code. Would make the backport a lot easier.

/assign @spadgett

eramoto and others added 3 commits June 15, 2020 15:19
Publish the license file with oc binary on downloads-openshift-console
since oc binary is applied Apache License 2.0.

This depends on openshift/oc#337 to provide the license in cli-artifacts.
@openshift-ci-robot openshift-ci-robot added 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 Jun 15, 2020
@openshift-ci-robot
Copy link
Contributor

@jhadvig: This pull request references Bugzilla bug 1813775, which is valid. 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.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1813775: Publish license file

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 15, 2020
@@ -186,6 +186,11 @@ func PlatformBasedOCConsoleCLIDownloads(host, cliDownloadsName string) *v1.Conso
})
}

links = append(links, v1.CLIDownloadLink{
Href: fmt.Sprintf("%s/oc-license", baseURL),
Text: fmt.Sprintf("Download LICENSE for OpenShift Command Line Interface"),
Copy link
Member

Choose a reason for hiding this comment

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

Maybe just "LICENSE"? Shouldn't need Sprintf

Suggested change
Text: fmt.Sprintf("Download LICENSE for OpenShift Command Line Interface"),
Text: "LICENSE",

@@ -135,6 +135,10 @@ The oc binary offers the same capabilities as the kubectl binary, but it is furt
Href: "https://www.example.com/s390x/linux/oc.tar",
Text: "Download oc for Linux for IBM Z (unsupported)",
},
{
Href: "https://www.example.com/oc-license",
Text: "Download LICENSE for OpenShift Command Line Interface",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Text: "Download LICENSE for OpenShift Command Line Interface",
Text: "LICENSE",

@spadgett
Copy link
Member

/cc @wking

@jhadvig
Copy link
Member Author

jhadvig commented Jun 15, 2020

@spadgett comments addressed. Just FYI there is a TestDownloadsEndpoint that is testing the license file endpoint.

Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 15, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, spadgett

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-merge-robot openshift-merge-robot merged commit 55b564f into openshift:master Jun 15, 2020
@openshift-ci-robot
Copy link
Contributor

@jhadvig: Some pull requests linked via external trackers have merged: openshift/console-operator#439. The following pull requests linked via external trackers have not merged:

In response to this:

Bug 1813775: Publish license file

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.

@jhadvig
Copy link
Member Author

jhadvig commented Jun 16, 2020

/cherry-pick release-4.5

@openshift-cherrypick-robot

@jhadvig: new pull request created: #440

In response to this:

/cherry-pick release-4.5

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants