From f1503607c9d493b5a5a9afae08da62c5c252bd45 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Jul 08 2017 13:31:40 +0000
Subject: Update to upstream v1.6.7

- resolves: #1468823
- resolves: #1468752

---

diff --git a/.gitignore b/.gitignore
index 8315f64..4a3b5f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/contrib-17c9a8d.tar.gz
-/kubernetes-0480917.tar.gz
-/kubernetes-d6f4332.tar.gz
+/kubernetes-095136c.tar.gz
+/contrib-0f5b210.tar.gz
diff --git a/Change-etcd-server-port.patch b/Change-etcd-server-port.patch
deleted file mode 100644
index ba956af..0000000
--- a/Change-etcd-server-port.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 23d7f34af3e6974eea43abe1ca9b3054822014cf Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Mon, 10 Aug 2015 09:55:49 +0200
-Subject: [PATCH] Change etcd server port
-
----
- contrib/init/systemd/environ/apiserver | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/init/systemd/environ/apiserver b/contrib/init/systemd/environ/apiserver
-index 223b992..ddb5974 100644
---- a/contrib/init/systemd/environ/apiserver
-+++ b/contrib/init/systemd/environ/apiserver
-@@ -14,7 +14,7 @@ KUBE_API_ADDRESS="--insecure-bind-address=127.0.0.1"
- # KUBELET_PORT="--kubelet-port=10250"
- 
- # Comma separated list of nodes in the etcd cluster
--KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:4001"
-+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"
--- 
-1.9.3
-
diff --git a/kubernetes.spec b/kubernetes.spec
index 53a27ed..312b1af 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -23,7 +23,7 @@
 
 %global provider_prefix         %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path             k8s.io/kubernetes
-%global commit                  d6f433224538d4f9ca2f7ae19b252e6fcb66a3ae
+%global commit                  095136c3078ccf887b9034b7ce598a0a1faff769
 %global shortcommit              %(c=%{commit}; echo ${c:0:7})
 
 %global con_provider            github
@@ -32,10 +32,10 @@
 %global con_repo                contrib
 # https://github.com/kubernetes/contrib
 %global con_provider_prefix     %{con_provider}.%{con_provider_tld}/%{con_project}/%{con_repo}
-%global con_commit              17c9a8df1be43378b0026dc22f6000a3e9952a18
+%global con_commit              0f5b210313371ff769da24d8264f5a7869c5a3f3
 %global con_shortcommit         %(c=%{con_commit}; echo ${c:0:7})
 
-%global kube_version            1.6.4
+%global kube_version            1.6.7
 %global kube_git_version        v%{kube_version}
 
 # Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work
@@ -57,7 +57,6 @@ Source4:        kubeadm.conf
 
 Source33:       genmanpages.sh
 
-Patch2:         Change-etcd-server-port.patch
 Patch3:         build-with-debug-info.patch
 #Patch4:         make-test-cmd-run-over-hyperkube-based-kubectl.patch
 #Patch5:         make-e2e_node-run-over-distro-bins.patch
@@ -868,8 +867,6 @@ Kubernetes client tools like kubectl
 mkdir contrib
 cp -r ../%{con_repo}-%{con_commit}/init contrib/.
 
-%patch2 -p1
-
 # Drop apiserver from hyperkube
 %patch12 -p1
 
@@ -1154,6 +1151,11 @@ fi
 
 ############################################
 %changelog
+* Sat Jul 08 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.6.7-1
+- Update to upstream v1.6.7
+  resolves: #1468823
+  resolves: #1468752
+
 * Fri May 19 2017 Timothy St. Clair <tstclair@heptio.com> - 1.6.4-1
 - Add kubeadm subpackage to enable upstream deployments
 
diff --git a/sources b/sources
index fb0aeb8..d61512a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (contrib-17c9a8d.tar.gz) = a35f13c6739194e860acf60d9455bea2aec855b86993df35dd9b5946acb5e99b3551d71c9b25335e02bfbd3e6ea7c0c1baba9add517e6168a7f98a0e4fc52894
-SHA512 (kubernetes-d6f4332.tar.gz) = f88cc4c04040d022d2233d78a7de2d714429fc67a66231eb958f2456efc4e9b580d7f2c9269efa184f88c0d2f209b94cd1835c22ee24c1494941ee13855e5d77
+SHA512 (kubernetes-095136c.tar.gz) = 79be6a1229fc70b966c6830566a3d467abe57732accab934a6aed79129ce20813c97751d95a597d4c549aee4b7582a8d9a0aa2d0d1ed6c997a334e67abfcd750
+SHA512 (contrib-0f5b210.tar.gz) = 4cf04c2214d52814d59ad9c276be91261785e4b6a911871637db5e068e6fd0a5de9d1eaee7db112159ce5860f0f339e1396106fcd00a97a16c912772d325ba8f