Browse code

Update kubelet param configuration to use kubeconfig

Change-Id: I67c172764a56be29be3f9d7bb63c7a43246fd40f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4262
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
(cherry picked from commit 4124bcd6b758e2c30257d2aa10c1d4e754240798)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4294

Vinay Kulkarni authored on 2017/11/11 04:15:47
Showing 2 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Kubernetes cluster management
2 2
 Name:           kubernetes
3 3
 Version:        1.8.1
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        ASL 2.0
6 6
 URL:            https://github.com/kubernetes/kubernetes/archive/v%{version}.tar.gz
7 7
 Source0:        kubernetes-v%{version}.tar.gz
... ...
@@ -78,6 +78,13 @@ cd ..
78 78
 # install config files
79 79
 install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
80 80
 install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} contrib-0.7.0/init/systemd/environ/*
81
+cat << EOF >> %{buildroot}%{_sysconfdir}/%{name}/kubeconfig
82
+apiVersion: v1
83
+clusters:
84
+- cluster:
85
+    server: http://127.0.0.1:8080
86
+EOF
87
+sed -i '/KUBELET_API_SERVER/c\KUBELET_API_SERVER="/etc/kubernetes/kubeconfig"' %{buildroot}%{_sysconfdir}/%{name}/kubelet
81 88
 
82 89
 # install service files
83 90
 install -d -m 0755 %{buildroot}/usr/lib/systemd/system
... ...
@@ -162,6 +169,7 @@ fi
162 162
 %config(noreplace) %{_sysconfdir}/%{name}/controller-manager
163 163
 %config(noreplace) %{_sysconfdir}/%{name}/proxy
164 164
 %config(noreplace) %{_sysconfdir}/%{name}/kubelet
165
+%config(noreplace) %{_sysconfdir}/%{name}/kubeconfig
165 166
 %config(noreplace) %{_sysconfdir}/%{name}/scheduler
166 167
 
167 168
 %files kubeadm
... ...
@@ -175,6 +183,8 @@ fi
175 175
 %{_bindir}/pause-amd64
176 176
 
177 177
 %changelog
178
+*   Tue Nov 07 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.1-2
179
+-   Specify API server via kubeconfig file.
178 180
 *   Wed Nov 01 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.1-1
179 181
 -   k8s v1.8.1.
180 182
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.7.5-2
... ...
@@ -9,8 +9,8 @@ ARCH=x86_64
9 9
 #
10 10
 # Docker images for kubernetes artifacts
11 11
 #
12
-K8S_VER=`cat ${SPEC_DIR}/kubernetes/kubernetes.spec | grep Version | cut -d: -f2 | tr -d ' '`
13
-K8S_VER_REL=${K8S_VER}-`cat ${SPEC_DIR}/kubernetes/kubernetes.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`
12
+K8S_VER=`cat ${SPEC_DIR}/kubernetes/kubernetes.spec | grep "^Version:" | cut -d: -f2 | tr -d ' '`
13
+K8S_VER_REL=${K8S_VER}-`cat ${SPEC_DIR}/kubernetes/kubernetes.spec | grep "^Release:" | cut -d: -f2 | tr -d ' ' | cut -d% -f1`
14 14
 K8S_RPM=kubernetes-${K8S_VER_REL}${DIST_TAG}.${ARCH}.rpm
15 15
 K8S_RPM_FILE=../../../stage/RPMS/x86_64/${K8S_RPM}
16 16
 K8S_PAUSE_RPM=kubernetes-pause-${K8S_VER_REL}${DIST_TAG}.${ARCH}.rpm