diff options
| author |   Di Xu <di.xu@arm.com> | 2018-05-16 17:04:18 +0800 |
|---|---|---|
| committer | Di Xu <di.xu@arm.com> | 2018-05-18 15:48:53 +0800 |
| commit | 6829c69226b285dcc1be5a8ca05c81df33615874 (patch) | |
| tree | ba8922fe2a4b8fc234e8b8beda528ad5c3b83260 /compass-tasks-k8s/arm64/thunderx1.patch | |
| parent | 2b37a39287912d20ef86ec43e8f731d5b427fb29 (diff) | |
fixup docker package and upgrade k8s to 1.9.1
Change-Id: I05c53c3163845713d0d59ee2330edf3bae563e00
Signed-off-by: Di Xu <di.xu@arm.com>
Diffstat (limited to 'compass-tasks-k8s/arm64/thunderx1.patch')
| -rw-r--r-- | compass-tasks-k8s/arm64/thunderx1.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/compass-tasks-k8s/arm64/thunderx1.patch b/compass-tasks-k8s/arm64/thunderx1.patch deleted file mode 100644 index 8ce9f73..0000000 --- a/compass-tasks-k8s/arm64/thunderx1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 97355abab655f9f2935e6e48fc11ec46dd3c7c26 Mon Sep 17 00:00:00 2001 -From: Yibo Cai <yibo.cai@linaro.org> -Date: Thu, 25 Jan 2018 16:17:02 +0800 -Subject: [PATCH] workaround thunderx with longer timeout - ---- - roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 | 2 +- - .../master/templates/manifests/kube-controller-manager.manifest.j2 | 2 +- - roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 -index 58c7629..554410d 100644 ---- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 -+++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 -@@ -102,7 +102,7 @@ spec: - host: 127.0.0.1 - path: /healthz - port: {{ kube_apiserver_insecure_port }} -- initialDelaySeconds: 30 -+ initialDelaySeconds: 120 - timeoutSeconds: 10 - volumeMounts: - - mountPath: {{ kube_config_dir }} -diff --git a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 -index bf03e60..87e8b5c 100644 ---- a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 -+++ b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 -@@ -70,7 +70,7 @@ spec: - host: 127.0.0.1 - path: /healthz - port: 10252 -- initialDelaySeconds: 30 -+ initialDelaySeconds: 120 - timeoutSeconds: 10 - volumeMounts: - - mountPath: /etc/ssl -diff --git a/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 -index 6353ca1..cac8c64 100644 ---- a/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 -+++ b/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 -@@ -44,7 +44,7 @@ spec: - host: 127.0.0.1 - path: /healthz - port: 10251 -- initialDelaySeconds: 30 -+ initialDelaySeconds: 120 - timeoutSeconds: 10 - volumeMounts: - - mountPath: /etc/ssl --- -2.7.4 - |