Merge "Update helm version to 2.14.1"
This commit is contained in:
commit
ce2c0e08d2
@ -63,7 +63,6 @@ spec:
|
||||
{{ tuple $envAll "ceph" "rgw-s3-admin" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
||||
spec:
|
||||
{{ dict "envAll" $envAll "application" "rgw_s3_admin" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
||||
namespace: ceph
|
||||
serviceAccountName: {{ $serviceAccountName }}
|
||||
restartPolicy: OnFailure
|
||||
nodeSelector:
|
||||
|
@ -256,7 +256,7 @@ conf:
|
||||
# .network.vip.addr when running in host networking
|
||||
# and .network.vip.manage=true, otherwise it is left as
|
||||
# an empty string (the default).
|
||||
bind-address: null
|
||||
bind-address: "null"
|
||||
enable-vts-status: "true"
|
||||
server-tokens: "false"
|
||||
services:
|
||||
|
@ -13,6 +13,6 @@
|
||||
# limitations under the License.
|
||||
|
||||
version:
|
||||
helm: v2.13.1
|
||||
helm: v2.14.1
|
||||
url:
|
||||
google_helm_repo: https://storage.googleapis.com/kubernetes-helm
|
||||
|
@ -26,7 +26,7 @@ release_group: null
|
||||
|
||||
images:
|
||||
tags:
|
||||
tiller: gcr.io/kubernetes-helm/tiller:v2.13.0
|
||||
tiller: gcr.io/kubernetes-helm/tiller:v2.14.1
|
||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
image_repo_sync: docker.io/docker:17.07.0
|
||||
pull_policy: IfNotPresent
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
set -xe
|
||||
|
||||
: ${HELM_VERSION:="v2.13.1"}
|
||||
: ${HELM_VERSION:="v2.14.1"}
|
||||
: ${KUBE_VERSION:="v1.13.4"}
|
||||
: ${MINIKUBE_VERSION:="v0.30.0"}
|
||||
: ${CALICO_VERSION:="v3.3"}
|
||||
|
@ -43,7 +43,7 @@ ENV CNI_VERSION ${CNI_VERSION}
|
||||
ARG CNI_REPO_URL=https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION
|
||||
ENV CNI_REPO_URL ${CNI_REPO_URL}
|
||||
|
||||
ARG HELM_VERSION="v2.13.1"
|
||||
ARG HELM_VERSION="v2.14.1"
|
||||
ENV HELM_VERSION ${HELM_VERSION}
|
||||
|
||||
ARG CHARTS="calico,flannel,tiller,kube-dns,kubernetes-keystone-webhook"
|
||||
|
Loading…
Reference in New Issue
Block a user