Hello community, here is the log from the commit of package kubernetes for openSUSE:Factory checked in at 2019-02-04 21:21:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes (Old) and /work/SRC/openSUSE:Factory/.kubernetes.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes" Mon Feb 4 21:21:28 2019 rev:36 rq:666751 version:1.13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes/kubernetes.changes 2019-01-15 09:08:45.202658423 +0100 +++ /work/SRC/openSUSE:Factory/.kubernetes.new.28833/kubernetes.changes 2019-02-04 21:21:34.123651805 +0100 @@ -1,0 +2,11 @@ +Thu Jan 17 14:49:43 UTC 2019 - Richard Brown <[email protected]> + +- Remove source conditionals for CaaSP + +------------------------------------------------------------------- +Thu Jan 17 13:39:10 UTC 2019 - Michal Jura <[email protected]> + +- Make Kubernetes package re-usable for CaaSP once again + * Add apiserver, config, controller-manager, kubelet, kubelet-config.yaml, proxy, scheduler + +------------------------------------------------------------------- New: ---- apiserver config controller-manager kubelet kubelet-config.yaml proxy scheduler ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes.spec ++++++ --- /var/tmp/diff_new_pack.EYad9e/_old 2019-02-04 21:21:37.339651035 +0100 +++ /var/tmp/diff_new_pack.EYad9e/_new 2019-02-04 21:21:37.339651035 +0100 @@ -47,6 +47,15 @@ Source27: kubernetes-rpmlintrc Source28: kubernetes.obsinfo +# Configuration files used for CaaSP +Source31: apiserver +Source32: config +Source33: controller-manager +Source34: kubelet +Source35: kubelet-config.yaml +Source36: proxy +Source37: scheduler + # Patches so it also builds in ppc64le and arm64. Patch1: git-upstream.patch Patch4: make-e2e_node-run-over-distro-bins.patch @@ -279,6 +288,14 @@ install -d %{buildroot}%{_mandir}/man1 install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1 +%if 0%{?is_susecaasp} +# install config files for CaaSP +install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name} +for src in %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} %{SOURCE36} %{SOURCE37} do + install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} "$src" +done +%endif + # create config folder install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name} @@ -368,6 +385,9 @@ %files common %defattr(-,root,root) +%if 0%{?is_susecaasp} +%config(noreplace) %{_sysconfdir}/%{name}/config +%endif %{_bindir}/hyperkube %files master @@ -390,6 +410,11 @@ %attr(0750,root,root) %dir %ghost %{_rundir}/%{name} %dir %{_sysconfdir}/%{name} +%if 0%{?is_susecaasp} +%config(noreplace) %{_sysconfdir}/%{name}/apiserver +%config(noreplace) %{_sysconfdir}/%{name}/controller-manager +%config(noreplace) %{_sysconfdir}/%{name}/scheduler +%endif %{_tmpfilesdir}/kubernetes.conf %files kubelet @@ -404,6 +429,10 @@ %dir %{_localstatedir}/lib/kubelet %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/manifests +%if 0%{?is_susecaasp} +%config(noreplace) %{_sysconfdir}/%{name}/kubelet +%config(noreplace) %{_sysconfdir}/%{name}/kubelet-config.yaml +%endif %{_tmpfilesdir}/%{name}.conf %attr(0750,root,root) %dir %ghost %{_rundir}/%{name} %dir %{_libexecdir}/kubernetes @@ -431,6 +460,9 @@ %{_sbindir}/rckube-proxy %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/manifests +%if 0%{?is_susecaasp} +%config(noreplace) %{_sysconfdir}/%{name}/proxy +%endif %files client %defattr(-,root,root) ++++++ apiserver ++++++ ### # kubernetes system config # # The following values are used to configure the kube-apiserver # # The address on the local server to listen to. KUBE_API_ADDRESS="--insecure-bind-address=127.0.0.1" # The port on the local server to listen on. # KUBE_API_PORT="--port=8080" # Port minions listen on # KUBELET_PORT="--kubelet-port=10250" # Comma separated list of nodes in the etcd cluster KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:2379"; # Address range to use for services KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16" # default admission control policies KUBE_ADMISSION_CONTROL="--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota" # Add your own! KUBE_API_ARGS="" ++++++ config ++++++ ### # kubernetes system config # # The following values are used to configure various aspects of all # kubernetes services, including # # kube-apiserver.service # kube-controller-manager.service # kubelet.service # kube-proxy.service # logging to stderr means we get it in the systemd journal KUBE_LOGTOSTDERR="--logtostderr=true" # journal message level, 0 is debug KUBE_LOG_LEVEL="--v=2" # Should this cluster be allowed to run privileged docker containers KUBE_ALLOW_PRIV="--allow-privileged=false" # How the controller-manager, and proxy find the apiserver KUBE_MASTER="--master=http://127.0.0.1:8080"; # Kubernetes feature gates flags KUBE_FEATURE_GATES="" ++++++ controller-manager ++++++ ### # The following values are used to configure the kubernetes controller-manager # defaults from config and apiserver should be adequate # Add your own! KUBE_CONTROLLER_MANAGER_ARGS="--service-account-private-key-file=/var/lib/kubernetes/serviceaccount.key --cluster-name=kubernetes" ++++++ kubelet ++++++ ### # kubernetes kubelet (minion) config # DEPRECATED!!! This option was moved to kubelet-config.yaml # The address for the info server to serve on (set to 0.0.0.0 or "" for all interfaces) #KUBELET_ADDRESS="--address=127.0.0.1" # DEPRECATED!!! This option was moved to kubelet-config.yaml # The port for the info server to serve on # KUBELET_PORT="--port=10250" # You may leave this blank to use the actual hostname KUBELET_HOSTNAME="--hostname-override=127.0.0.1" # Add your own! KUBELET_ARGS="--config=/etc/kubernetes/kubelet-config.yaml --volume-plugin-dir=/usr/lib/kubernetes/kubelet-plugins" ++++++ kubelet-config.yaml ++++++ kind: KubeletConfiguration apiVersion: kubelet.config.k8s.io/v1beta1 staticPodPath: "/etc/kubernetes/manifests" address: 127.0.0.1 port: 10250 authentication: webhook: enabled: false anonymous: enabled: true authorization: mode: AlwaysAllow ++++++ proxy ++++++ ### # kubernetes proxy config # default config should be adequate # Add your own! KUBE_PROXY_ARGS="" ++++++ scheduler ++++++ ### # kubernetes scheduler config # default config should be adequate # Add your own! KUBE_SCHEDULER_ARGS=""
