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

[release-4.15] OCPBUGS-30731: Upstream: <carry>: RPM: Split apiserver, scheduler, k-c-m, kubelet into subpackages #1906

Open
wants to merge 1 commit into
base: release-4.15
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 51 additions & 8 deletions openshift.spec
Expand Up @@ -69,17 +69,49 @@ Kubernetes allowing you to safely host many different applications and workloads
on a unified cluster.

%package hyperkube
Summary: OpenShift Kubernetes server commands
Requires: util-linux
Requires: socat
Requires: iptables
Summary: OpenShift Kubernetes server commands, via deps
Requires: kube-scheduler = %{version}
Requires: kube-kubelet = %{version}
Requires: kube-controller-manager = %{version}
Requires: kube-apiserver = %{version}
Provides: hyperkube = %{version}
Obsoletes: atomic-openshift-hyperkube <= %{version}
Obsoletes: atomic-openshift-node <= %{version}

%package kube-scheduler
Summary: OpenShift Kubernetes Scheduler
Provides: kube-scheduler = %{version}

%package kubelet
Summary: OpenShift Kubernetes Kubelet
Requires: util-linux
Requires: socat
Requires: iptables
Provides: kube-kubelet = %{version}

%package kube-controller-manager
Summary: OpenShift Kubernetes Controller Manager
Provides: kube-controller-manager = %{version}

%package kube-apiserver
Summary: OpenShift Kubernetes API Server
Provides: kube-apiserver = %{version}

%description hyperkube
%{summary}

%description kube-scheduler
%{summary}

%description kubelet
%{summary}

%description kube-controller-manager
%{summary}

%description kube-apiserver
%{summary}

%prep
%if 0%{do_prep}
%setup -q
Expand Down Expand Up @@ -120,18 +152,29 @@ install -p -m 755 openshift-hack/images/hyperkube/hyperkube %{buildroot}%{_bindi
install -p -m 755 openshift-hack/images/hyperkube/kubensenter %{buildroot}%{_bindir}/kubensenter
install -p -m 755 openshift-hack/sysctls/50-kubelet.conf %{buildroot}%{_sysctldir}/50-kubelet.conf

%post
%post kubelet
%sysctl_apply 50-kubelet.conf

%files hyperkube
%license LICENSE
%{_bindir}/hyperkube
%{_bindir}/kube-apiserver
%{_bindir}/kube-controller-manager
%{_bindir}/kube-scheduler
%defattr(-,root,root,0700)

%files kubelet
%{_bindir}/kubelet
%{_bindir}/kubensenter
%{_sysctldir}/50-kubelet.conf
%defattr(-,root,root,0700)

%files kube-scheduler
%{_bindir}/kube-scheduler

%files kube-controller-manager
%{_bindir}/kube-controller-manager

%files kube-apiserver
%{_bindir}/kube-apiserver



%changelog