Hello community, here is the log from the commit of package kubernetes for openSUSE:Factory checked in at 2018-08-15 10:36:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes (Old) and /work/SRC/openSUSE:Factory/.kubernetes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes" Wed Aug 15 10:36:52 2018 rev:29 rq:629006 version:1.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes/kubernetes.changes 2018-08-09 09:33:54.128261554 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes.new/kubernetes.changes 2018-08-15 10:36:55.940131722 +0200 @@ -1,0 +2,10 @@ +Mon Aug 13 11:37:51 UTC 2018 - [email protected] + +- Remove custom config files, introduce upstream equivalents + +------------------------------------------------------------------- +Mon Aug 13 11:10:43 CEST 2018 - [email protected] + +- Disable rpmlintrc checks for all architectures, not only x86_64 + +------------------------------------------------------------------- Old: ---- apiserver config controller-manager kubelet kubelet-config.yaml proxy scheduler New: ---- 10-kubeadm.conf kubelet.env ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes.spec ++++++ --- /var/tmp/diff_new_pack.o0jcne/_old 2018-08-15 10:36:57.748135017 +0200 +++ /var/tmp/diff_new_pack.o0jcne/_new 2018-08-15 10:36:57.752135025 +0200 @@ -40,16 +40,11 @@ Source13: kube-proxy.service Source14: kube-scheduler.service #config files -Source20: apiserver -Source21: config -Source22: controller-manager -Source23: kubelet -Source24: proxy -Source25: scheduler +Source24: kubelet.env +Source25: 10-kubeadm.conf Source26: kubernetes.tmp.conf Source27: kubernetes-rpmlintrc Source28: kubernetes.obsinfo -Source29: kubelet-config.yaml # Patches so it also builds in ppc64le and arm64. Patch1: git-upstream.patch @@ -138,6 +133,7 @@ Conflicts: cri-tools >= %{maxcriversion} Requires: socat Requires(pre): shadow +Requires(post): %fillup_prereq # if master is installed with node, version and release must be the same Conflicts: kubernetes-master < %{version}-%{release} Conflicts: kubernetes-master > %{version}-%{release} @@ -285,11 +281,11 @@ install -d %{buildroot}%{_mandir}/man1 install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1 -# install config files +# create config folder install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name} -for src in %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} %{SOURCE29}; do - install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} "$src" -done + +# place kubelet.env in fillupdir +install -D -m 0644 %{SOURCE24} %{buildroot}%{_fillupdir}/sysconfig.kubelet # manifests file for the kubelet install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/manifests @@ -307,6 +303,10 @@ # Remove dangling symlink (breaks post-build scripts) rm -f %{buildroot}%{_usrsrc}/kubernetes/hack/autogenerated_placeholder.txt +# Create kubeadm systemd unit drop-in +install -d -m 0755 %{buildroot}%{_unitdir}/kubelet.service.d +install -m 0644 -t %{buildroot}%{_unitdir}/kubelet.service.d/ %{SOURCE25} + %fdupes -s %{buildroot} %pre master @@ -336,6 +336,7 @@ %service_add_pre kubelet.service %post kubelet +%fillup_only -n kubelet %service_add_post kubelet.service %if 0%{?suse_version} < 1500 # create some subvolumes needed by CNI @@ -367,7 +368,6 @@ %files common %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/%{name}/config %{_bindir}/hyperkube %files master @@ -390,9 +390,6 @@ %attr(0750,root,root) %dir %ghost %{_rundir}/%{name} %dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/apiserver -%config(noreplace) %{_sysconfdir}/%{name}/controller-manager -%config(noreplace) %{_sysconfdir}/%{name}/scheduler %{_tmpfilesdir}/kubernetes.conf %files kubelet @@ -402,12 +399,12 @@ %{_mandir}/man1/kubelet.1* %{_bindir}/kubelet %{_unitdir}/kubelet.service +%dir %{_unitdir}/kubelet.service.d %{_sbindir}/rckubelet %dir %{_localstatedir}/lib/kubelet %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/manifests -%config(noreplace) %{_sysconfdir}/%{name}/kubelet -%config(noreplace) %{_sysconfdir}/%{name}/kubelet-config.yaml +%{_fillupdir}/sysconfig.kubelet %{_tmpfilesdir}/%{name}.conf %attr(0750,root,root) %dir %ghost %{_rundir}/%{name} %dir %{_libexecdir}/kubernetes @@ -416,6 +413,7 @@ %files kubeadm %defattr(-,root,root) %doc README.md CONTRIBUTING.md CHANGELOG-1.11.md +%{_unitdir}/kubelet.service.d/10-kubeadm.conf %license LICENSE %{_bindir}/kubeadm %{_sbindir}/rckubeadm @@ -431,7 +429,6 @@ %{_sbindir}/rckube-proxy %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/manifests -%config(noreplace) %{_sysconfdir}/%{name}/proxy %files client %defattr(-,root,root) ++++++ 10-kubeadm.conf ++++++ # Note: This dropin only works with kubeadm and kubelet v1.11+ [Service] Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf" Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml" # This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env # This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use # the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file. EnvironmentFile=-/etc/sysconfig/kubelet ExecStart= ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS ++++++ kubelet.env ++++++ KUBELET_EXTRA_ARGS= ++++++ kubelet.service ++++++ --- /var/tmp/diff_new_pack.o0jcne/_old 2018-08-15 10:36:57.936135360 +0200 +++ /var/tmp/diff_new_pack.o0jcne/_new 2018-08-15 10:36:57.940135367 +0200 @@ -1,30 +1,13 @@ [Unit] -Description=Kubernetes Kubelet Server -Documentation=https://github.com/GoogleCloudPlatform/kubernetes -After=docker.service -Requires=docker.service +Description=kubelet: The Kubernetes Node Agent +Documentation=https://kubernetes.io/docs/ +Wants=docker.service crio.service [Service] -WorkingDirectory=/var/lib/kubelet -EnvironmentFile=-/etc/kubernetes/config -EnvironmentFile=-/etc/kubernetes/kubelet -EnvironmentFile=-/etc/kubernetes/kubelet-initial -ExecStart=/usr/bin/hyperkube kubelet \ - $KUBE_LOGTOSTDERR \ - $KUBE_LOG_LEVEL \ - $KUBELET_API_SERVER \ - $KUBELET_ADDRESS \ - $KUBELET_PORT \ - $KUBELET_HOSTNAME \ - $KUBE_ALLOW_PRIV \ - $KUBELET_INITIAL_ARGS \ - $KUBE_FEATURE_GATES \ - $KUBELET_ARGS -Restart=on-failure - -# Kubernetes services should be under the podruntime slice. This the recommended -# deployment to allow fine resource control on Kubernetes. -Slice=podruntime.slice +ExecStart=/usr/bin/kubelet +Restart=always +StartLimitInterval=0 +RestartSec=10 [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target \ No newline at end of file ++++++ kubernetes-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.o0jcne/_old 2018-08-15 10:36:57.952135389 +0200 +++ /var/tmp/diff_new_pack.o0jcne/_new 2018-08-15 10:36:57.952135389 +0200 @@ -1,4 +1,4 @@ -addFilter ("^kubernetes-unit-test.x86_64: E: devel-file-in-non-devel-package") +addFilter ("^kubernetes-unit-test.*: E: devel-file-in-non-devel-package") addFilter ("^kubernetes-master.*: W: statically-linked-binary") -addFilter ("^kubernetes-extra.x86_64: E: env-script-interpreter") -addFilter ("^kubernetes-extra.x86_64: E: wrong-script-interpreter") +addFilter ("^kubernetes-extra.*: E: env-script-interpreter") +addFilter ("^kubernetes-extra.*: E: wrong-script-interpreter")
