openstack/openstack-helm-infra
Code Issues Proposed changes

Gate: Move to k8s v1.8.3 and expose params

Browse Source 
This PS moves to use version 1.8.3 of k8s and also exposes all the
versions as build params to the kubeadm-aio dockerfile.

Change-Id: I8e6ef8090f3fa178e950a42605a5d86e298e0c99
This commit is contained in:
intlabs 2017-11-12 01:18:06 -06:00 committed by Pete Birley
parent 8ac50d34af
commit 80e1d68fa0
5 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/gate/playbooks/build-helm-packages/tasks/setup-helm-serve.yaml
View File

@ -14,7 +14,7 @@
- name: check if correct version of helm client already installed - name: check if correct version of helm client already installed
shell: "[ \"x$($(type -p helm) version --client --short | awk '{ print $NF }' | awk -F '+' '{ print $1 }')\" == \"x${HELM_VERSION}\" ] || exit 1" shell: "[ \"x$($(type -p helm) version --client --short | awk '{ print $NF }' | awk -F '+' '{ print $1 }')\" == \"x${HELM_VERSION}\" ] || exit 1"
environment: environment:
HELM_VERSION: "{{ helm.version }}" HELM_VERSION: "{{ version.helm }}"
register: need_helm register: need_helm
ignore_errors: True ignore_errors: True
- name: install helm client - name: install helm client
@ -22,7 +22,7 @@
become_user: root become_user: root
shell: | shell: |
TMP_DIR=$(mktemp -d) TMP_DIR=$(mktemp -d)
curl -sSL https://storage.googleapis.com/kubernetes-helm/helm-{{ helm.version }}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} curl -sSL https://storage.googleapis.com/kubernetes-helm/helm-{{ version.helm }}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR}
sudo mv ${TMP_DIR}/helm /usr/bin/helm sudo mv ${TMP_DIR}/helm /usr/bin/helm
rm -rf ${TMP_DIR} rm -rf ${TMP_DIR}
- name: setting up helm client - name: setting up helm client

5
tools/gate/playbooks/build-images/tasks/kubeadm-aio.yaml
View File

@ -21,3 +21,8 @@
pull: yes pull: yes
state: present state: present
rm: yes rm: yes
buildargs:
KUBE_VERSION: "{{ version.kubernetes }}"
CNI_VERSION: "{{ version.cni }}"
HELM_VERSION: "{{ version.helm }}"
CHARTS: "calico,flannel,tiller,kube-dns"

7
tools/gate/playbooks/vars.yaml
View File

@ -12,12 +12,15 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
version:
kubernetes: v1.8.3
helm: v2.7.0
cni: v0.6.0
images: images:
kubernetes: kubernetes:
kubeadm_aio: openstackhelm/kubeadm-aio:dev kubeadm_aio: openstackhelm/kubeadm-aio:dev
helm:
version: v2.7.0
kubernetes: kubernetes:
network: network:

2
tools/image-repo-overides.sh
View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
KUBE_VERSION=v1.8.2 KUBE_VERSION=$(yq -r '.version.kubernetes' ./tools/gate/playbooks/vars.yaml)
KUBE_IMAGES="gcr.io/google_containers/hyperkube-amd64:${KUBE_VERSION} KUBE_IMAGES="gcr.io/google_containers/hyperkube-amd64:${KUBE_VERSION}
gcr.io/google_containers/kube-apiserver-amd64:${KUBE_VERSION} gcr.io/google_containers/kube-apiserver-amd64:${KUBE_VERSION}
gcr.io/google_containers/kube-controller-manager-amd64:${KUBE_VERSION} gcr.io/google_containers/kube-controller-manager-amd64:${KUBE_VERSION}

20
tools/images/kubeadm-aio/Dockerfile
View File

@ -16,13 +16,21 @@
FROM gcr.io/google_containers/ubuntu-slim:0.14 FROM gcr.io/google_containers/ubuntu-slim:0.14
MAINTAINER pete.birley@att.com MAINTAINER pete.birley@att.com
ENV KUBE_VERSION="v1.8.2" \ ARG KUBE_VERSION="v1.8.3"
CNI_VERSION="v0.6.0" \ ENV KUBE_VERSION ${KUBE_VERSION}
HELM_VERSION="v2.7.0" \
container="docker" \ ARG CNI_VERSION="v0.6.0"
ENV CNI_VERSION ${CNI_VERSION}
ARG HELM_VERSION="v2.7.0"
ENV HELM_VERSION ${HELM_VERSION}
ARG CHARTS="calico,flannel,tiller,kube-dns"
ENV CHARTS ${CHARTS}
ENV container="docker" \
DEBIAN_FRONTEND="noninteractive" \ DEBIAN_FRONTEND="noninteractive" \
CNI_BIN_DIR="/opt/cni/bin" \ CNI_BIN_DIR="/opt/cni/bin"
CHARTS="calico,flannel,tiller,kube-dns"
RUN set -ex ;\ RUN set -ex ;\
apt-get update ;\ apt-get update ;\