1. photon
  2. Commit e7a01510245bfd9633ebb65f3c413eddbb6f5b0b
Browse code

Upgrade kubernetes packages to fix numerous build issues in k8s-dashboard

The k8s-dashboard build is quite unstable at the moment, due to
problems with the version that we are currently using in Photon OS 3.0
(dev). Fix it by upgrading to version 1.8.3 that is known to work well
in Photon OS 2.0.

To handle dependencies, this commit encapulates changes from the
following commits in Photon OS 2.0:

- d5207f80f Fix build issue in k8s dashboard
- a7f9c4ba2 Update nginx to 1.13.8 to support nginx-ingress
- fb8b92784 Upgrade k8s,calico,calico-ci,k8s-dashboard,k8s-dns and
nginx-ingress

Change-Id: I837b68e09155f827504c9f3b358b99be3931f010
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5169
Reviewed-by: Sharath George
Tested-by: Sharath George

Srivatsa S. Bhat authored on 2018/05/19 05:20:19
Showing 6 changed files
SPECS/calico-cni/calico-cni.spec
History View file @ e7a0151
... ... 
@@ -1,13 +1,13 @@
1 1 
 Summary:        Calico networking for CNI
2 2 
 Name:           calico-cni
3 
-Version:        1.11.0
4 
-Release:        2%{?dist}
3 
+Version:        1.11.2
4 
+Release:        1%{?dist}
5 5 
 License:        ASL 2.0
6 6 
 URL:            https://github.com/projectcalico/cni-plugin
7 7 
 Source0:        %{name}-%{version}.tar.gz
8 
-%define sha1 calico-cni=0fee124daa5e3a5f72e9af28ca1df61e6c2443c3
8 
+%define sha1 calico-cni=c12ce655eb5b1cd42c3976d6bf4ac3ebcbc4dc86
9 9 
 Source1:        %{name}-vendor-cache-%{version}.tar.gz
10 
-%define sha1 calico-cni-vendor-cache=8683bb5598d807c8c1c85e0cd13944ac09f6f450
10 
+%define sha1 calico-cni-vendor-cache=7c64de41b90cc74231090441ff359936689737df
11 11 
 Group:          Development/Tools
12 12 
 Vendor:         VMware, Inc.
13 13 
 Distribution:   Photon
... ... 
@@ -59,6 +59,8 @@ install -vpm 0755 -t %{buildroot}/usr/share/calico-cni/k8s/ k8s-install/scripts/
59 59 
 /usr/share/calico-cni/k8s/calico.conf.default
60 60
61 61 
 %changelog
62 
+*   Fri May 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 1.11.2-1
63 
+-   calico-cni v1.11.2
62 64 
 *   Thu Dec 07 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.11.0-2
63 65 
 -   Cache build dependencies in our repo.
64 66 
 *   Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.11.0-1
SPECS/calico/calico.spec
History View file @ e7a0151
... ... 
@@ -1,11 +1,11 @@
1 1 
 Summary:        Calico node and documentation for project calico.
2 2 
 Name:           calico
3 
-Version:        2.6.3
3 
+Version:        2.6.7
4 4 
 Release:        1%{?dist}
5 5 
 License:        Apache-2.0
6 6 
 URL:            https://github.com/projectcalico/calico
7 7 
 Source0:        %{name}-%{version}.tar.gz
8 
-%define sha1 calico=6cc983c49618c95fbe6b3d63d6f45725df577c7c
8 
+%define sha1 calico=d74b2103f84ed470322b5f33b75cf552db93d830
9 9 
 Group:          Development/Tools
10 10 
 Vendor:         VMware, Inc.
11 11 
 Distribution:   Photon
... ... 
@@ -50,6 +50,8 @@ sed -i 's/. startup.env/source \/startup.env/g' %{buildroot}/usr/share/calico/do
50 50 
 /usr/share/calico/docker/fs/*
51 51
52 52 
 %changelog
53 
+*   Fri May 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 2.6.7-1
54 
+-   Calico Node v2.6.7.
53 55 
 *   Tue Dec 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.3-1
54 56 
 -   Calico Node v2.6.3.
55 57 
 *   Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.2-1
SPECS/kubernetes-dashboard/kubernetes-dashboard.spec
History View file @ e7a0151
... ... 
@@ -1,11 +1,11 @@
1 1 
 Summary:        Kubernetes Dashboard UI
2 2 
 Name:           kubernetes-dashboard
3 
-Version:        1.6.3
4 
-Release:        2%{?dist}
3 
+Version:        1.8.3
4 
+Release:        1%{?dist}
5 5 
 License:        Apache-2.0
6 6 
 URL:            https://github.com/kubernetes/dashboard
7 
-Source0:        %{name}-v%{version}.tar.gz
8 
-%define sha1    kubernetes-dashboard=8e06cb5cd145ffa5c691c3af5fc6e49caececfb2
7 
+Source0:        %{name}-%{version}.tar.gz
8 
+%define sha1    kubernetes-dashboard=d0e85648129f6b480773539dc2a83e04f85c76f1
9 9 
 Group:          Development/Tools
10 10 
 Vendor:         VMware, Inc.
11 11 
 Distribution:   Photon
... ... 
@@ -15,7 +15,6 @@ BuildRequires:  glibc-devel
15 15 
 BuildRequires:  go
16 16 
 BuildRequires:  linux-api-headers
17 17 
 BuildRequires:  nodejs
18 
-BuildRequires:  nodejs
19 18 
 BuildRequires:  openjre8
20 19 
 BuildRequires:  which
21 20 
 Requires:       nodejs
... ... 
@@ -29,10 +28,9 @@ Kubernetes Dashboard UI.
29 29
30 30 
 %build
31 31 
 export PATH=${PATH}:/usr/bin
32 
-sed -i 's/"google-closure-library": "\*"/"google-closure-library": "v20170521"/' ./bower.json
33 
-npm install
34 
-npm install babel-loader@7.1.1
35 
-./build/postinstall.sh
32 
+npm install --unsafe-perm
33 
+#Remove the lines which strips the debuginfo.
34 
+sed -i '/https:\/\/golang.org\/cmd\/link\//,+2d' ./build/backend.js
36 35 
 ./node_modules/.bin/gulp build
37 36
38 37 
 %install
... ... 
@@ -54,6 +52,8 @@ cp -p -r ./src/deploy/Dockerfile %{buildroot}/opt/k8dashboard/
54 54 
 /opt/k8dashboard/public/*
55 55
56 56 
 %changelog
57 
+*    Fri May 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 1.8.3-1
58 
+-    kubernetes-dashboard 1.8.3
57 59 
 *    Tue Apr 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 1.6.3-2
58 60 
 -    Fix build break in google-closure-library.
59 61 
 *    Mon Sep 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.6.3-1
SPECS/kubernetes-dns/kubernetes-dns.spec
History View file @ e7a0151
... ... 
@@ -1,11 +1,11 @@
1 1 
 Summary:        Kubernetes DNS
2 2 
 Name:           kubernetes-dns
3 
-Version:        1.14.6
4 
-Release:        3%{?dist}
3 
+Version:        1.14.8
4 
+Release:        1%{?dist}
5 5 
 License:        ASL 2.0
6 6 
 URL:            https://github.com/kubernetes/dns/archive/%{version}.tar.gz
7 7 
 Source0:        kubernetes-dns-%{version}.tar.gz
8 
-%define sha1    kubernetes-dns-%{version}.tar.gz=456f28dcb52d5338ce076d62051e33b827172b2a
8 
+%define sha1    kubernetes-dns-%{version}.tar.gz=cad22fbc8499901262dfea3da504eabb7f616129
9 9 
 Group:          Development/Tools
10 10 
 Vendor:         VMware, Inc.
11 11 
 Distribution:   Photon
... ... 
@@ -69,6 +69,8 @@ rm -rf %{buildroot}/*
69 69 
 %{_bindir}/sidecar-e2e
70 70
71 71 
 %changelog
72 
+*   Fri May 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 1.14.8-1
73 
+-   kubernetes-dns 1.14.8.
72 74 
 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.14.6-3
73 75 
 -   Aarch64 support
74 76 
 *   Wed Nov 01 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.14.6-2
SPECS/nginx-ingress/nginx-ingress.spec
History View file @ e7a0151
... ... 
@@ -1,11 +1,11 @@
1 1 
 Summary:        NGINX Ingress Controller for Kubernetes
2 2 
 Name:           nginx-ingress
3 
-Version:        0.9.0
3 
+Version:        1.1.1
4 4 
 Release:        1%{?dist}
5 5 
 License:        Apache-2.0
6 6 
 URL:            https://github.com/nginxinc/kubernetes-ingress
7 7 
 Source0:        %{name}-%{version}.tar.gz
8 
-%define sha1 nginx-ingress=ea71044b1c8298c85cf5f0971100f735f99240ce
8 
+%define sha1 nginx-ingress=3978c365d3b83d9c454bde936411a95047ff1320
9 9 
 Group:          Development/Tools
10 10 
 Vendor:         VMware, Inc.
11 11 
 Distribution:   Photon
... ... 
@@ -37,5 +37,7 @@ install -vpm 0755 -t %{buildroot}/usr/share/nginx-ingress/docker/ nginx/template
37 37 
 /usr/share/nginx-ingress/docker/nginx.*
38 38
39 39 
 %changelog
40 
+*   Fri May 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 1.1.1-1
41 
+-   Bumped up version to 1.1.1
40 42 
 *   Mon Aug 28 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.9.0-1
41 43 
 -   K8S NGINX Ingress Controller for PhotonOS.
SPECS/nginx/nginx.spec
History View file @ e7a0151
... ... 
@@ -1,14 +1,14 @@
1 1 
 Summary:        High-performance HTTP server and reverse proxy
2 2 
 Name:           nginx
3 
-Version:        1.13.5
4 
-Release:        2%{?dist}
3 
+Version:        1.13.8
4 
+Release:        1%{?dist}
5 5 
 License:        BSD-2-Clause
6 6 
 URL:            http://nginx.org/download/nginx-%{version}.tar.gz
7 7 
 Group:          Applications/System
8 8 
 Vendor:         VMware, Inc.
9 9 
 Distribution:   Photon
10 10 
 Source0:        %{name}-%{version}.tar.gz
11 
-%define sha1    nginx=8eac59db4ee2a90373a8a44f174317110b666526
11 
+%define sha1    nginx=a1f9348c9c46f449a0b549d0519dd34191d30cee
12 12 
 Source1:        nginx.service
13 13 
 BuildRequires:  openssl-devel
14 14 
 BuildRequires:  pcre-devel
... ... 
@@ -50,6 +50,8 @@ install -p -m 0644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/nginx.service
50 50 
 %{_var}/log/nginx
51 51
52 52 
 %changelog
53 
+*   Fri May 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 1.13.8-1
54 
+-   Update to version 1.13.8 to support nginx-ingress
53 55 
 *   Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  1.13.5-2
54 56 
 -   Fixed the log file directory structure
55 57 
 *   Wed Oct 04 2017 Xiaolin Li <xiaolinl@vmware.com> 1.13.5-1