jcapik pushed to kubernetes (f20). "Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Jun 10 14:32:47 UTC 2015
From f435c959c508e7f4936a44838cea376b4b845d78 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis at redhat.com>
Date: Fri, 24 Oct 2014 08:23:43 -0400
Subject: Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
diff --git a/.gitignore b/.gitignore
index 76e5687..2ed7d62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+/clog
/kubernetes-98ac8e1.tar.gz
/kubernetes-4452163.tar.gz
/kubernetes-b011263.tar.gz
+/kubernetes-d5377e4.tar.gz
+/kubernetes-e868642.tar.gz
+/kubernetes-97dd730.tar.gz
+/kubernetes-77d2815.tar.gz
+/kubernetes-e46af6e.tar.gz
diff --git a/apiserver b/apiserver
deleted file mode 100644
index 204fe57..0000000
--- a/apiserver
+++ /dev/null
@@ -1,26 +0,0 @@
-###
-# kubernetes system config
-#
-# The following values are used to configure the kubernetes-apiserver
-#
-
-# The address on the local server to listen to.
-KUBE_API_ADDRESS="--address=127.0.0.1"
-
-# The port on the local server to listen on.
-KUBE_API_PORT="--port=8080"
-
-# How the replication controller and scheduler find the apiserver
-KUBE_MASTER="--master=127.0.0.1:8080"
-
-# Comma seperated list of minions
-MINION_ADDRESSES="--machines=127.0.0.1"
-
-# Port minions listen on
-MINION_PORT="--minion_port=10250"
-
-# Address range to use for services
-KUBE_SERVICE_ADDRESSES="--portal_net=10.254.0.0/16"
-
-# Add you own!
-KUBE_API_ARGS=""
diff --git a/config b/config
deleted file mode 100644
index c96170c..0000000
--- a/config
+++ /dev/null
@@ -1,23 +0,0 @@
-###
-# kubernetes system config
-#
-# The following values are used to configure various aspects of all
-# kubernetes services, including
-#
-# kubernetes-apiserver.service
-# kubernetes-controller-manager.service
-# kubernetes-scheduler.service
-# kubelet.service
-# kubernetes-proxy.service
-
-# Comma seperated list of nodes in the etcd cluster
-KUBE_ETCD_SERVERS="--etcd_servers=http://127.0.0.1:4001"
-
-# 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=0"
-
-# Should this cluster be allowed to run privleged docker containers
-KUBE_ALLOW_PRIV="--allow_privileged=false"
diff --git a/controller-manager b/controller-manager
deleted file mode 100644
index 8d8f491..0000000
--- a/controller-manager
+++ /dev/null
@@ -1,7 +0,0 @@
-###
-# The following values are used to configure the kubernetes controller-manager
-
-# defaults from config and apiserver should be adequate
-
-# Add you own!
-KUBE_CONTROLLER_MANAGER_ARGS=""
diff --git a/kube-apiserver.service b/kube-apiserver.service
deleted file mode 100644
index cbd6ca4..0000000
--- a/kube-apiserver.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Kubernetes API Server
-Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-
-[Service]
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/apiserver
-User=kube
-ExecStart=/usr/bin/kube-apiserver \
- ${KUBE_LOGTOSTDERR} \
- ${KUBE_LOG_LEVEL} \
- ${KUBE_ETCD_SERVERS} \
- ${KUBE_API_ADDRESS} \
- ${KUBE_API_PORT} \
- ${MINION_ADDRESSES} \
- ${MINION_PORT} \
- ${KUBE_ALLOW_PRIV} \
- ${KUBE_SERVICE_ADDRESSES} \
- ${KUBE_API_ARGS}
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kube-controller-manager.service b/kube-controller-manager.service
deleted file mode 100644
index 6c2bfb2..0000000
--- a/kube-controller-manager.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Kubernetes Controller Manager
-Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-
-[Service]
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/apiserver
-EnvironmentFile=-/etc/kubernetes/controller-manager
-User=kube
-ExecStart=/usr/bin/kube-controller-manager \
- ${KUBE_LOGTOSTDERR} \
- ${KUBE_LOG_LEVEL} \
- ${KUBE_MASTER} \
- ${KUBE_CONTROLLER_MANAGER_ARGS}
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kube-proxy.service b/kube-proxy.service
deleted file mode 100644
index fcfc2e2..0000000
--- a/kube-proxy.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Kubernetes Kube-Proxy Server
-Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-
-[Service]
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/proxy
-ExecStart=/usr/bin/kube-proxy \
- ${KUBE_LOGTOSTDERR} \
- ${KUBE_LOG_LEVEL} \
- ${KUBE_ETCD_SERVERS} \
- ${KUBE_PROXY_ARGS}
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kube-scheduler.service b/kube-scheduler.service
deleted file mode 100644
index 6d123ed..0000000
--- a/kube-scheduler.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Kubernetes Scheduler Plugin
-Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-
-[Service]
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/apiserver
-EnvironmentFile=-/etc/kubernetes/scheduler
-ExecStart=/usr/bin/kube-scheduler \
- ${KUBE_LOGTOSTDERR} \
- ${KUBE_LOG_LEVEL} \
- ${KUBE_MASTER} \
- ${KUBE_SCHEDULER_ARGS}
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kubecfg.bash b/kubecfg.bash
deleted file mode 100644
index bf7284d..0000000
--- a/kubecfg.bash
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/bin/bash
-#
-# bash completion file for core kubecfg commands
-#
-# This script provides supports completion of:
-# - commands and their options
-# - container ids and names
-# - image repos and tags
-# - filepaths
-#
-# To enable the completions either:
-# - place this file in /etc/bash_completion.d
-# or
-# - copy this file and add the line below to your .bashrc after
-# bash completion features are loaded
-# . kubecfg.bash
-#
-# Note:
-# Currently, the completions will not work if the kubecfg daemon is not
-# bound to the default communication port/socket
-# If the kubecfg daemon is using a unix socket for communication your user
-# must have access to the socket for the completions to function correctly
-
-__kubecfg_q() {
- kubecfg 2>/dev/null "$@"
-}
-
-__contains_word () {
- local w word=$1; shift
- for w in "$@"; do
- [[ $w = "$word" ]] && return
- done
-}
-
-__has_service() {
- for ((i=0; i < ${cword}; i++)); do
- local word=${words[i]}
- word=$(echo ${word} | awk -F"/" '{print $1}')
- if __contains_word "${words[i]}" "${services[@]}" &&
- ! __contains_word "${words[i-1]}" "${opts[@]}"; then
- return 0
- fi
- done
- return 1
-}
-
-__kubecfg_all_pods()
-{
- local pods=($( __kubecfg_q list pods | tail -n +3 | awk {'print $1'} ))
- pods=${pods[@]/#/"pods/"}
- COMPREPLY=( $( compgen -W "${pods[*]}" -- "$cur" ) )
-}
-
-__kubecfg_all_minions()
-{
- local minions=($( __kubecfg_q list minions | tail -n +3 | awk {'print $1'} ))
- minions=${minions[@]/#/"minions/"}
- COMPREPLY=( $( compgen -W "${minions[*]}" -- "$cur" ) )
-}
-
-__kubecfg_all_replicationControllers()
-{
- local replicationControllers=($( __kubecfg_q list replicationControllers | tail -n +3 | awk {'print $1'} ))
- replicationControllers=${replicationControllers[@]/#/"replicationControllers/"}
- COMPREPLY=( $( compgen -W "${replicationControllers[*]}" -- "$cur" ) )
-}
-
-__kubecfg_all_services()
-{
- local services=($( __kubecfg_q list services | tail -n +3 | awk {'print $1'} ))
- services=${services[@]/#/"services/"}
- COMPREPLY=( $( compgen -W "${services[*]}" -- "$cur" ) )
-}
-
-_kubecfg_specific_service_match()
-{
- case "$cur" in
- pods/*)
- __kubecfg_all_pods
- ;;
- minions/*)
- __kubecfg_all_minions
- ;;
- replicationControllers/*)
- __kubecfg_all_replicationControllers
- ;;
- services/*)
- __kubecfg_all_services
- ;;
- *)
- if __has_service; then
- return 0
- fi
- compopt -o nospace
- COMPREPLY=( $( compgen -S / -W "${services[*]}" -- "$cur" ) )
- ;;
- esac
-}
-
-_kubecfg_get()
-{
- _kubecfg_specific_service_match
-}
-
-_kubecfg_delete()
-{
- _kubecfg_specific_service_match
-}
-
-_kubecfg_update()
-{
- _kubecfg_specific_service_match
-}
-
-_kubecfg_service_match()
-{
- if __has_service; then
- return 0
- fi
-
- case "$cur" in
- *)
- COMPREPLY=( $( compgen -W "${services[*]}" -- "$cur" ) )
- ;;
- esac
-}
-
-_kubecfg_list()
-{
- _kubecfg_service_match
-}
-
-_kubecfg_create()
-{
- _kubecfg_service_match
-}
-
-_kubecfg()
-{
- local opts=(
- -h
- -c
- )
- local -A all_services=(
- [CREATE]="pods replicationControllers services"
- [UPDATE]="replicationControllers"
- [ALL]="pods replicationControllers services minions"
- )
- local services=(${all_services[ALL]})
- local -A all_commands=(
- [WITH_JSON]="create update"
- [ALL]="create update get list delete stop rm rollingupdate resize"
- )
- local commands=(${all_commands[ALL]})
-
- COMPREPLY=()
- local command
- local cur prev words cword
- _get_comp_words_by_ref -n : cur prev words cword
-
- if __contains_word "$prev" "${opts[@]}"; then
- case $prev in
- -h)
- comps=$(compgen -A hostname)
- return 0
- ;;
- -c)
- _filedir json
- return 0
- ;;
- esac
- fi
-
- if [[ "$cur" = -* ]]; then
- COMPREPLY=( $(compgen -W '${opts[*]}' -- "$cur") )
- return 0
- fi
-
- # if you passed -c, you are limited to create
- if __contains_word "-c" "${words[@]}"; then
- services=(${all_services[CREATE]} ${all_services[UPDATE]})
- commands=(${all_commands[WITH_JSON]})
- fi
-
- # figure out which command they are running, remembering that arguments to
- # options don't count as the command! So a hostname named 'create' won't
- # trip things up
- for ((i=0; i < ${cword}; i++)); do
- if __contains_word "${words[i]}" "${commands[@]}" &&
- ! __contains_word "${words[i-1]}" "${opts[@]}"; then
- command=${words[i]}
- break
- fi
- done
-
- # tell the list of possible commands
- if [[ -z ${command} ]]; then
- COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
- return 0
- fi
-
- # remove services which you can't update given your command
- if [[ ${command} == "create" ]]; then
- services=(${all_services[CREATE]})
- elif [[ ${command} == "update" ]]; then
- services=(${all_services[UPDATE]})
- fi
-
- # run the _kubecfg_${command} function to keep parsing
- local completions_func=_kubecfg_${command}
- declare -F $completions_func >/dev/null && $completions_func
-
- return 0
-}
-
-complete -F _kubecfg kubecfg
-# ex: ts=4 sw=4 et filetype=sh
diff --git a/kubelet b/kubelet
deleted file mode 100644
index 1208038..0000000
--- a/kubelet
+++ /dev/null
@@ -1,14 +0,0 @@
-###
-# kubernetes kublet (minion) config
-
-# The address for the info server to serve on (set to 0.0.0.0 or "" for all interfaces)
-MINION_ADDRESS="--address=127.0.0.1"
-
-# The port for the info server to serve on
-MINION_PORT="--port=10250"
-
-# You may leave this blank to use the actual hostname
-MINION_HOSTNAME="--hostname_override=127.0.0.1"
-
-# Add your own!
-MINION_ARGS=""
diff --git a/kubelet.service b/kubelet.service
deleted file mode 100644
index 6b26473..0000000
--- a/kubelet.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Kubernetes Kubelet Server
-Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-After=docker.socket cadvisor.service
-Requires=docker.socket
-
-[Service]
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/kubelet
-ExecStart=/usr/bin/kubelet \
- ${KUBE_LOGTOSTDERR} \
- ${KUBE_LOG_LEVEL} \
- ${KUBE_ETCD_SERVERS} \
- ${MINION_ADDRESS} \
- ${MINION_PORT} \
- ${MINION_HOSTNAME} \
- ${KUBE_ALLOW_PRIV} \
- ${MINION_ARGS}
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kubernetes.spec b/kubernetes.spec
index 4de307e..1dd07b7 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,7 +1,7 @@
#debuginfo not supported with Go
%global debug_package %{nil}
%global import_path github.com/GoogleCloudPlatform/kubernetes
-%global commit b01126322b826a15db06f6eeefeeb56dc06db7af
+%global commit e46af6e37f6e6965a63edb8eb8f115ae8ef41482
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#binaries which should be called kube-*
@@ -18,27 +18,13 @@
Name: kubernetes
Version: 0.4
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 0.6.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
ExclusiveArch: x86_64
Source0: https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kubernetes-%{shortcommit}.tar.gz
-#config files
-Source10: config
-Source11: apiserver
-Source12: controller-manager
-Source13: proxy
-Source14: kubelet
-Source15: scheduler
-#service files
-Source20: kube-apiserver.service
-Source21: kube-controller-manager.service
-Source22: kube-proxy.service
-Source23: kubelet.service
-Source24: kube-scheduler.service
-
Patch1: 0001-remove-all-third-party-software.patch
%if 0%{?fedora} >= 21 || 0%{?rhel}
@@ -152,15 +138,15 @@ done
# install the bash completion
install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/
-install -t %{buildroot}%{_datadir}/bash-completion/completions/ contrib/completions/bash/kubecfg
+install -t %{buildroot}%{_datadir}/bash-completion/completions/ contrib/completions/bash/kubectl
# install config files
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
-install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15}
+install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} contrib/init/systemd/environ/*
# install service files
install -d -m 0755 %{buildroot}%{_unitdir}
-install -m 0644 -t %{buildroot}%{_unitdir} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
+install -m 0644 -t %{buildroot}%{_unitdir} contrib/init/systemd/*.service
# install manpages
install -d %{buildroot}%{_mandir}/man1
@@ -184,7 +170,7 @@ install -d %{buildroot}/var/lib/kubelet
%{_unitdir}/kube-controller-manager.service
%{_unitdir}/kube-proxy.service
%dir %{_sysconfdir}/%{name}
-%{_datadir}/bash-completion/completions/kubecfg
+%{_datadir}/bash-completion/completions/kubectl
%dir /var/lib/kubelet
%config(noreplace) %{_sysconfdir}/%{name}/config
%config(noreplace) %{_sysconfdir}/%{name}/apiserver
@@ -198,15 +184,34 @@ getent group kube >/dev/null || groupadd -r kube
getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
-c "Kubernetes user" kube
%post
-%systemd_post %{basename:%{SOURCE20}} %{basename:%{SOURCE21}} %{basename:%{SOURCE22}} %{basename:%{SOURCE22}} %{basename:%{SOURCE24}}
+%systemd_post kube-apiserver kube-scheduler kube-controller-manager kubelet kube-proxy
%preun
-%systemd_preun %{basename:%{SOURCE20}} %{basename:%{SOURCE21}} %{basename:%{SOURCE22}} %{basename:%{SOURCE23}} %{basename:%{SOURCE24}}
+%systemd_preun kube-apiserver kube-scheduler kube-controller-manager kubelet kube-proxy
%postun
%systemd_postun
%changelog
+* Fri Oct 24 2014 Eric Paris <eparis at redhat.com - 0.4-0.6.gite46af6e
+- Bump to upstream e46af6e37f6e6965a63edb8eb8f115ae8ef41482
+
+* Thu Oct 23 2014 Eric Paris <eparis at redhat.com - 0.4-0.5.git77d2815
+- Bump to upstream 77d2815b86e9581393d7de4379759c536df89edc
+
+* Wed Oct 22 2014 Eric Paris <eparis at redhat.com - 0.4-0.4.git97dd730
+- Bump to upstream 97dd7302ac2c2b9458a9348462a614ebf394b1ed
+- Use upstream kubectl bash completion instead of in-repo
+- Fix systemd_post and systemd_preun since we are using upstream service files
+
+* Tue Oct 21 2014 Eric Paris <eparis at redhat.com - 0.4-0.3.gite868642
+- Bump to upstream e8686429c4aa63fc73401259c8818da168a7b85e
+
+* Mon Oct 20 2014 Eric Paris <eparis at redhat.com - 0.4-0.2.gitd5377e4
+- Bump to upstream d5377e4a394b4fc6e3088634729b538eac124b1b
+- Use in tree systemd unit and Environment files
+- Include kubectl bash completion from outside tree
+
* Fri Oct 17 2014 Eric Paris <eparis at redhat.com - 0.4-0.1.gitb011263
- Bump to upstream b01126322b826a15db06f6eeefeeb56dc06db7af
- This is a major non backward compatible change.
diff --git a/proxy b/proxy
deleted file mode 100644
index 0342768..0000000
--- a/proxy
+++ /dev/null
@@ -1,7 +0,0 @@
-###
-# kubernetes proxy config
-
-# default config should be adequate
-
-# Add your own!
-KUBE_PROXY_ARGS=""
diff --git a/scheduler b/scheduler
deleted file mode 100644
index f6fc507..0000000
--- a/scheduler
+++ /dev/null
@@ -1,7 +0,0 @@
-###
-# kubernetes scheduler config
-
-# default config should be adequate
-
-# Add your own!
-KUBE_SCHEDULER_ARGS=""
diff --git a/sources b/sources
index 996d449..4b7c976 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dfac48ac66d5752dacdc8c24c37702d kubernetes-b011263.tar.gz
+e8c37ca3d308f303ac55771aa5925ce5 kubernetes-e46af6e.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=f20&id=f435c959c508e7f4936a44838cea376b4b845d78
More information about the scm-commits
mailing list