diff --git a/.gitignore b/.gitignore index 15ab7ea..c36155b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kubernetes-77be29e.tar.gz +/kubernetes-41f8907.tar.gz diff --git a/genmanpages.sh b/genmanpages.sh new file mode 100644 index 0000000..0dd1c24 --- /dev/null +++ b/genmanpages.sh @@ -0,0 +1,76 @@ +MDSFORMANPAGES="kube-apiserver.md kube-controller-manager.md kube-proxy.md kube-scheduler.md kubelet.md" + +# for each man page add NAME and SYNOPSIS section +# kube-apiserver +sed -i -s "s/## kube-apiserver/# NAME\nkube-apiserver \- Provides the API for kubernetes orchestration.\n\n# SYNOPSIS\n**kube-apiserver** [OPTIONS]\n/" kube-apiserver.md + +cat << 'EOF' >> kube-apiserver.md +# EXAMPLES +``` +/usr/bin/kube-apiserver --logtostderr=true --v=0 --etcd_servers=http://127.0.0.1:4001 --insecure_bind_address=127.0.0.1 --insecure_port=8080 --kubelet_port=10250 --service-cluster-ip-range=10.1.1.0/24 --allow_privileged=false +``` +EOF +# kube-controller-manager +sed -i -s "s/## kube-controller-manager/# NAME\nkube-controller-manager \- Enforces kubernetes services.\n\n# SYNOPSIS\n**kube-controller-manager** [OPTIONS]\n/" kube-controller-manager.md + +cat << 'EOF' >> kube-controller-manager.md +# EXAMPLES +``` +/usr/bin/kube-controller-manager --logtostderr=true --v=0 --master=127.0.0.1:8080 +``` +EOF +# kube-proxy +sed -i -s "s/## kube-proxy/# NAME\nkube-proxy \- Provides network proxy services.\n\n# SYNOPSIS\n**kube-proxy** [OPTIONS]\n/" kube-proxy.md + +cat << 'EOF' >> kube-proxy.md +# EXAMPLES +``` +/usr/bin/kube-proxy --logtostderr=true --v=0 --master=http://127.0.0.1:8080 +``` +EOF +# kube-scheduler +sed -i -s "s/## kube-scheduler/# NAME\nkube-scheduler \- Schedules containers on hosts.\n\n# SYNOPSIS\n**kube-scheduler** [OPTIONS]\n/" kube-scheduler.md + +cat << 'EOF' >> kube-scheduler.md +# EXAMPLES +``` +/usr/bin/kube-scheduler --logtostderr=true --v=0 --master=127.0.0.1:8080 +``` +EOF +# kubelet +sed -i -s "s/## kubelet/# NAME\nkubelet \- Processes a container manifest so the containers are launched according to how they are described.\n\n# SYNOPSIS\n**kubelet** [OPTIONS]\n/" kubelet.md + +cat << 'EOF' >> kubelet.md +# EXAMPLES +``` +/usr/bin/kubelet --logtostderr=true --v=0 --api_servers=http://127.0.0.1:8080 --address=127.0.0.1 --port=10250 --hostname_override=127.0.0.1 --allow-privileged=false +``` +EOF + +# for all man-pages +for md in $MDSFORMANPAGES; do + # correct section names + sed -i -s "s/### Synopsis/# DESCRIPTION/" $md + sed -i -s "s/### Options/# OPTIONS/" $md + # add header + sed -i "s/# NAME/% KUBERNETES(1) kubernetes User Manuals\n# NAME/" $md + # modify list of options + # options with no value in "" + sed -i -r 's/(^ )(-[^":][^":]*)(:)(.*)/\*\*\2\*\*\n\t\4\n/' $md + # option with value in "" + sed -i -r 's/(^ )(-[^":][^":]*)("[^"]*")(:)(.*)/\*\*\2\3\*\*\n\t\5\n/' $md + # options in -s, --long + sed -i -r 's/(^ )(-[a-z], -[^":][^":]*)(:)(.*)/\*\*\2\*\*\n\t\4\n/' $md + sed -i -r 's/(^ )(-[a-z], -[^":][^":]*)("[^"]*")(:)(.*)/\*\*\2\3\*\*\n\t\5\n/' $md + # remove ``` + sed -i 's/```//' $md + # remove all lines starting with ###### + sed -i 's/^######.*//' $md + # modify footer + sed -i -r "s/^\[!\[Analytics\].*//" $md + # md does not contain section => taking 1 + name="${md%.md}" + go-md2man -in $md -out man/man1/$name.1 +done + + diff --git a/kubernetes.spec b/kubernetes.spec index bb29c32..52a9cde 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -20,7 +20,7 @@ %global repo kubernetes # https://github.com/GoogleCloudPlatform/kubernetes %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 77be29e3da71f0a136b6aa4048b2f0575c2598e4 +%global commit 41f89075396329cd46c58495c7d3f7e13adcaa96 %global shortcommit %(c=%{commit}; echo ${c:0:7}) #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)" @@ -29,13 +29,14 @@ %global _checkshell /bin/bash Name: kubernetes -Version: 0.20.2 -Release: 0.5.git%{shortcommit}%{?dist} +Version: 0.21.1 +Release: 0.1.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} ExclusiveArch: x86_64 Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source1: genmanpages.sh %if 0%{?with_debug} Patch0: build-with-debug-info.patch %endif @@ -362,24 +363,15 @@ Kubernetes services for node host %build export KUBE_GIT_TREE_STATE="clean" export KUBE_GIT_COMMIT=%{commit} -export KUBE_GIT_VERSION=v0.21.0-35-g77be29e3da71f0 +export KUBE_GIT_VERSION=v0.21.1-142-g41f89075396329 hack/build-go.sh --use_go_build hack/build-go.sh --use_go_build cmd/kube-version-change # convert md to man -pushd docs/man -for md in *.md; do - # add header - sed -i "s/# NAME/% KUBERNETES(1) kubernetes User Manuals\n# NAME/" $md - # modify list of options - sed -i -r 's/(^\*[ ]*)(\*\*--[^*]*\*\*)(:)(.*)/\2\n\t\4\n/' $md - # modify footer - sed -i -r "s/^\[!\[Analytics\].*//" $md - # md does not contain section => taking 1 - name="${md%.md}" - go-md2man -in $md -out man1/$name.1 -done +pushd docs +cp %{SOURCE1} genmanpages.sh +bash genmanpages.sh popd %install @@ -541,6 +533,11 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun %changelog +* Thu Jul 09 2015 jchaloup - 0.21.1-0.1.git41f8907 +- Update generating of man pages from md (add genmanpages.sh) +- Bump to upstream 41f89075396329cd46c58495c7d3f7e13adcaa96 + related: #1211266 + * Wed Jul 08 2015 jchaloup - 0.20.2-0.5.git77be29e - Bump to upstream 77be29e3da71f0a136b6aa4048b2f0575c2598e4 related: #1211266 diff --git a/sources b/sources index 98b2c9f..8e6a5f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e4ee6842222da0c8588a5d2862beca4 kubernetes-77be29e.tar.gz +bfe2e948a1936bad25ce7e8993cbaa3f kubernetes-41f8907.tar.gz