From 7b82688b1f1f7ee408fc031e1e6b8d55d04723c4 Mon Sep 17 00:00:00 2001 From: gjmzj Date: Sat, 16 Feb 2019 09:57:30 +0800 Subject: [PATCH] update helm v2.12.3 --- docs/guide/helm.md | 2 +- down/offline_images | 10 +++++----- roles/helm/defaults/main.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/guide/helm.md b/docs/guide/helm.md index 8221f22..e221b01 100644 --- a/docs/guide/helm.md +++ b/docs/guide/helm.md @@ -6,7 +6,7 @@ ## 安全安装 helm（在线） -上述安装的tiller服务器默认允许匿名访问，那么k8s集群中的任何pod都能访问tiller，风险较大，因此需要在helm客户端和tiller服务器间建立安全的SSL/TLS认证机制；tiller服务器和helm客户端都是使用同一CA签发的`client cert`，然后互相识别对方身份。建议通过本项目提供的`ansible role`安装，符合官网上介绍的安全加固措施，在delpoy节点运行: +在helm客户端和tiller服务器间建立安全的SSL/TLS认证机制；tiller服务器和helm客户端都是使用同一CA签发的`client cert`，然后互相识别对方身份。建议通过本项目提供的`ansible role`安装，符合官网上介绍的安全加固措施，在delpoy节点运行: ``` bash # 1.如果已安装非安全模式，使用 helm reset 清理 # 2.配置默认helm参数 vi /etc/ansible/roles/helm/defaults/main.yml diff --git a/down/offline_images b/down/offline_images index 3aadebe..c2d5ae6 100644 --- a/down/offline_images +++ b/down/offline_images @@ -7,13 +7,13 @@ mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.13 # metrics-server mirrorgooglecontainers/metrics-server-amd64:v0.3.1 # calico -calico/node:v3.2.4 -calico/cni:v3.2.4 -calico/kube-controllers:v3.2.4 +calico/node:v3.4.1 +calico/cni:v3.4.1 +calico/kube-controllers:v3.4.1 # cilium cilium/cilium:v1.1.4 # flannel -jmgao1983/flannel:v0.10.0-amd64 +jmgao1983/flannel:v0.11.0-amd64 # kube-router cloudnativelabs/kube-router:v0.2.0 # dashboard @@ -30,7 +30,7 @@ mirrorgooglecontainers/heapster-influxdb-amd64:v1.3.3 ###---[extra-images] # helm tiller server -jmgao1983/tiller:v2.11.0 +jmgao1983/tiller:v2.12.3 # efk mirrorgooglecontainers/elasticsearch:v5.6.4 alpine:3.6 diff --git a/roles/helm/defaults/main.yml b/roles/helm/defaults/main.yml index 97cca48..890e8b4 100644 --- a/roles/helm/defaults/main.yml +++ b/roles/helm/defaults/main.yml @@ -2,7 +2,7 @@ helm_namespace: kube-system helm_cert_cn: helm001 tiller_sa: tiller tiller_cert_cn: tiller001 -tiller_image: jmgao1983/tiller:v2.11.0 +tiller_image: jmgao1983/tiller:v2.12.3 repo_url: https://kubernetes-charts.storage.googleapis.com # 如果默认官方repo 网络访问不稳定可以使用如下的阿里云镜像repo #repo_url: https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts