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

Vendor service-catalog and add to origin.spec #14301

Merged
merged 5 commits into from
Jun 9, 2017
Merged

Vendor service-catalog and add to origin.spec #14301

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5989557
Squashed 'cmd/service-catalog/go/src/github.com/kubernetes-incubator/…
Jun 8, 2017
b7677c6
Merge version 0.0.7 of Service Catalog from https://github.com/opensh…
Jun 8, 2017
023ebed
service-catalog: ignore needed directories
May 23, 2017
0ceba97
service-catalog: add sc files to origin RPM
May 22, 2017
840f4a8
service-catalog: add dockerfile and add to build
May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions origin.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ Summary: %{produce_name} Federation Services
Requires: %{name} = %{version}-%{release}

%description federation-services

%package service-catalog
Summary: %{product_name} Service Catalog
Requires: %{name} = %{version}-%{release}

%description service-catalog
%{summary}

%package cluster-capacity
Expand Down Expand Up @@ -225,6 +231,7 @@ of docker. Exclude those versions of docker.
%if 0%{make_redistributable}
# Create Binaries for all supported arches
%{os_git_vars} hack/build-cross.sh
%{os_git_vars} unset GOPATH; cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/build-cross.sh
%else
# Create Binaries only for building arch
%ifarch x86_64
Expand All @@ -243,6 +250,7 @@ of docker. Exclude those versions of docker.
BUILD_PLATFORM="linux/s390x"
%endif
OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} hack/build-cross.sh
OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} unset GOPATH; cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/build-cross.sh
%endif

# Build cluster capacity
Expand Down Expand Up @@ -301,6 +309,11 @@ install -p -m 755 _output/local/bin/${PLATFORM}/hyperkube %{buildroot}%{_bindir}
install -p -m 755 cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/_output/local/bin/${PLATFORM}/hypercc %{buildroot}%{_bindir}/
ln -s hypercc %{buildroot}%{_bindir}/cluster-capacity

# Install service-catalog
install -p -m 755 cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/_output/local/bin/${PLATFORM}/apiserver %{buildroot}%{_bindir}/
install -p -m 755 cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/_output/local/bin/${PLATFORM}/controller-manager %{buildroot}%{_bindir}/
install -p -m 755 cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/_output/local/bin/${PLATFORM}/user-broker %{buildroot}%{_bindir}/
Copy link
Member

Choose a reason for hiding this comment

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

@pmorie - why are we shipping this? we should remove the user-broker


# Install pod
install -p -m 755 _output/local/bin/${PLATFORM}/pod %{buildroot}%{_bindir}/

Expand Down Expand Up @@ -549,6 +562,11 @@ if [ -d %{kube_plugin_path} ]; then
rmdir %{kube_plugin_path}
fi

%files service-catalog
%{_bindir}/apiserver
%{_bindir}/controller-manager
%{_bindir}/user-broker
Copy link
Member

Choose a reason for hiding this comment

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

same here...


%files -n tuned-profiles-%{name}-node
%license LICENSE
%{_prefix}/lib/tuned/%{name}-node-host
Expand Down