diff --git a/ceph-rgw/templates/job-s3-admin.yaml b/ceph-rgw/templates/job-s3-admin.yaml index 0bc3f5bd7..77bd7a411 100644 --- a/ceph-rgw/templates/job-s3-admin.yaml +++ b/ceph-rgw/templates/job-s3-admin.yaml @@ -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: diff --git a/ingress/values.yaml b/ingress/values.yaml index 3346a766f..c79687703 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -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: diff --git a/roles/build-helm-packages/defaults/main.yml b/roles/build-helm-packages/defaults/main.yml index 81c84a317..817851523 100644 --- a/roles/build-helm-packages/defaults/main.yml +++ b/roles/build-helm-packages/defaults/main.yml @@ -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 diff --git a/tiller/values.yaml b/tiller/values.yaml index 2b35d4ad4..53498069e 100644 --- a/tiller/values.yaml +++ b/tiller/values.yaml @@ -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 diff --git a/tools/deployment/common/005-deploy-k8s.sh b/tools/deployment/common/005-deploy-k8s.sh index a227e4564..73ac6782b 100755 --- a/tools/deployment/common/005-deploy-k8s.sh +++ b/tools/deployment/common/005-deploy-k8s.sh @@ -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"} diff --git a/tools/images/kubeadm-aio/Dockerfile b/tools/images/kubeadm-aio/Dockerfile index 563e257d3..47454eb13 100644 --- a/tools/images/kubeadm-aio/Dockerfile +++ b/tools/images/kubeadm-aio/Dockerfile @@ -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"