Skip to content

Bug 1764224: Use extension manifests from openshift/api #316

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

Merged
openshift-merge-robot merged 4 commits into from
Oct 23, 2019
Merged

Bug 1764224: Use extension manifests from openshift/api #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80b01fd
Bump deps
benjaminapetersen Oct 16, 2019
98b4020
Add COPY command to Dockerfile to copy extension CRDs from vendor/ope…
benjaminapetersen Oct 16, 2019
1bdf3f8
Remove extension CRDs from /manifests
benjaminapetersen Oct 17, 2019
5454d46
Update DownloadsController to use CLIDownloadLink instead of Link
benjaminapetersen Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ COPY --from=builder /tmp/build/console /usr/bin/console
# these manifests are necessary for the installer
COPY manifests /manifests/

# extensions manifests generated from openshift/api types
COPY vendor/github.com/openshift/api/console/v1/*.yaml /manifests

LABEL io.k8s.display-name="OpenShift console-operator" \
io.k8s.description="This is a component of OpenShift Container Platform and manages the lifecycle of the web console." \
io.openshift.tags="openshift" \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ COPY --from=builder /tmp/build/console /usr/bin/console
# these manifests are necessary for the installer
COPY manifests /manifests/

# extensions manifests generated from openshift/api types
COPY vendor/github.com/openshift/api/console/v1/*.yaml /manifests

LABEL io.k8s.display-name="OpenShift console-operator" \
io.k8s.description="This is a component of OpenShift Container Platform and manages the lifecycle of the web console." \
io.openshift.tags="openshift" \
Expand Down
16 changes: 7 additions & 9 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/console/controllers/clidownloads/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ func PlatformBasedOCConsoleCLIDownloads(host, arch, cliDownloadsName string) *v1
{"Windows", "windows", "oc.zip"},
}

links := []v1.Link{}
links := []v1.CLIDownloadLink{}
for _, platform := range platforms {
links = append(links, v1.Link{
links = append(links, v1.CLIDownloadLink{
Href: GetPlatformURL(baseURL, platform.key, platform.archType),
Text: fmt.Sprintf("Download oc for %s", platform.label),
})
Expand Down Expand Up @@ -199,7 +199,7 @@ func ODOConsoleCLIDownloads() *v1.ConsoleCLIDownload {
odo abstracts away complex Kubernetes and OpenShift concepts, thus allowing developers to focus on what is most important to them: code.
`,
DisplayName: "odo - Developer-focused CLI for OpenShift",
Links: []v1.Link{
Links: []v1.CLIDownloadLink{
{
Href: "https://mirror.openshift.com/pub/openshift-v4/clients/odo/latest/",
Text: "Download odo",
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/controllers/clidownloads/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestPlatformBasedOCConsoleCLIDownloads(t *testing.T) {
The oc binary offers the same capabilities as the kubectl binary, but it is further extended to natively support OpenShift Container Platform features.
`,
DisplayName: "oc - OpenShift Command Line Interface (CLI)",
Links: []v1.Link{
Links: []v1.CLIDownloadLink{
{
Href: "https://www.example.com/amd64/linux/oc.tar",
Text: "Download oc for Linux",
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/openshift/api/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 36 additions & 20 deletions vendor/github.com/openshift/api/Makefile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/github.com/openshift/api/apps/v1/generated.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions vendor/github.com/openshift/api/apps/v1/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions vendor/github.com/openshift/api/apps/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/github.com/openshift/api/authorization/OWNERS
View file
Open in desktop

This file was deleted.

Loading