Merge pull request #443 from jhadvig/bz1847323

[release-4.4] Bug 1847323: Publish license file
openshift · Sep 19, 2020 · df1bd0b · df1bd0b
2 parents a6f79b0 + 2a93c56
commit df1bd0b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/manifests/07-downloads-deployment.yaml b/manifests/07-downloads-deployment.yaml
@@ -93,6 +93,7 @@ spec:
               os.mkdir(arch)
               for operating_system in ['linux']:
                   os.mkdir(os.path.join(arch, operating_system))
+          os.symlink('/usr/share/openshift/LICENSE', 'oc-license')
 
           for arch, operating_system, path in [
                   ('amd64', 'linux', '/usr/share/openshift/linux_amd64/oc'),

diff --git a/pkg/console/controllers/clidownloads/controller.go b/pkg/console/controllers/clidownloads/controller.go
@@ -173,6 +173,11 @@ func PlatformBasedOCConsoleCLIDownloads(host, cliDownloadsName string) *v1.Conso
 		})
 	}
 
+	links = append(links, v1.CLIDownloadLink{
+		Href: fmt.Sprintf("%s/oc-license", baseURL),
+		Text: "LICENSE",
+	})
+
 	return &v1.ConsoleCLIDownload{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: cliDownloadsName,

diff --git a/pkg/console/controllers/clidownloads/controller_test.go b/pkg/console/controllers/clidownloads/controller_test.go
@@ -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: "LICENSE",
+						},
 					},
 				},
 			},