starlingx
/
integ
Code Issues Proposed changes

Merge "De-couple kubernetes rpms from one another"

This commit is contained in:
Zuul 2019-10-10 15:37:37 +00:00 committed by Gerrit Code Review
parent adc1f00b8c f0870b2e48
commit d2acda56bb
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kubernetes/kubernetes/centos/build_srpm.data
View File

@ -6,4 +6,4 @@ CONTRIB="$TAR_NAME-contrib-v$CON_VERSION.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/$CONTRIB $FILES_BASE/*" COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/$CONTRIB $FILES_BASE/*"
TIS_PATCH_VER=1 TIS_PATCH_VER=2

20
kubernetes/kubernetes/centos/kubernetes.spec
View File

@ -60,8 +60,8 @@ Obsoletes: cadvisor
# kubernetes is decomposed into master and node subpackages # kubernetes is decomposed into master and node subpackages
# require both of them for updates # require both of them for updates
Requires: kubernetes-master = %{version}-%{release} Requires: kubernetes-master
Requires: kubernetes-node = %{version}-%{release} Requires: kubernetes-node
%description %description
%{summary} %{summary}
@ -781,11 +781,7 @@ BuildRequires: go-md2man
BuildRequires: go-bindata BuildRequires: go-bindata
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: kubernetes-client = %{version}-%{release} Requires: kubernetes-client
# if node is installed with node, version and release must be the same
Conflicts: kubernetes-node < %{version}-%{release}
Conflicts: kubernetes-node > %{version}-%{release}
%description master %description master
Kubernetes services for master host Kubernetes services for master host
@ -810,11 +806,7 @@ BuildRequires: go-bindata
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: socat Requires: socat
Requires: kubernetes-client = %{version}-%{release} Requires: kubernetes-client
# if master is installed with node, version and release must be the same
Conflicts: kubernetes-master < %{version}-%{release}
Conflicts: kubernetes-master > %{version}-%{release}
%description node %description node
Kubernetes services for node host Kubernetes services for node host
@ -822,7 +814,7 @@ Kubernetes services for node host
############################################## ##############################################
%package kubeadm %package kubeadm
Summary: Kubernetes tool for standing up clusters Summary: Kubernetes tool for standing up clusters
Requires: kubernetes-node = %{version}-%{release} Requires: kubernetes-client
Requires: containernetworking-cni Requires: containernetworking-cni
%description kubeadm %description kubeadm
@ -1023,7 +1015,6 @@ fi
%attr(754, -, kube) %caps(cap_net_bind_service=ep) %{_bindir}/kube-apiserver %attr(754, -, kube) %caps(cap_net_bind_service=ep) %{_bindir}/kube-apiserver
%{_bindir}/kube-controller-manager %{_bindir}/kube-controller-manager
%{_bindir}/kube-scheduler %{_bindir}/kube-scheduler
%{_bindir}/hyperkube
%{_unitdir}/kube-apiserver.service %{_unitdir}/kube-apiserver.service
%{_unitdir}/kube-controller-manager.service %{_unitdir}/kube-controller-manager.service
%{_unitdir}/kube-scheduler.service %{_unitdir}/kube-scheduler.service
@ -1044,7 +1035,6 @@ fi
%{_bindir}/kubelet %{_bindir}/kubelet
%{_bindir}/kubelet-cgroup-setup.sh %{_bindir}/kubelet-cgroup-setup.sh
%{_bindir}/kube-proxy %{_bindir}/kube-proxy
%{_bindir}/hyperkube
%{_unitdir}/kube-proxy.service %{_unitdir}/kube-proxy.service
%{_unitdir}/kubelet.service %{_unitdir}/kubelet.service
%dir %{_sharedstatedir}/kubelet %dir %{_sharedstatedir}/kubelet