Browse Source

Merge "[hca] Use wallaby-stable-1 as default HCA tag"

changes/87/785987/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
bc6ec3ab63
5 changed files with 27 additions and 20 deletions
  1. +4
    -3
      doc/source/user/index.rst
  2. +1
    -1
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
  3. +1
    -1
      magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
  4. +1
    -2
      playbooks/container-builder-vars.yaml
  5. +20
    -13
      playbooks/container-builder.yaml

+ 4
- 3
doc/source/user/index.rst View File

@ -1358,9 +1358,10 @@ _`heat_container_agent_tag`
This label allows users to select `a specific heat_container_agent
version, based on its container tag
<https://hub.docker.com/r/openstackmagnum/heat-container-agent/tags/>`_.
Train-default: ussuri-dev
Ussuri-default: ussuri-dev
Victoria-default: victoria-dev
Train-default: train-stable-3
Ussuri-default: ussuri-stable-1
Victoria-default: victoria-stable-1
Wallaby-default: wallaby-stable-1
_`kube_dashboard_enabled`
This label triggers the deployment of the kubernetes dashboard.


+ 1
- 1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml View File

@ -675,7 +675,7 @@ parameters:
heat_container_agent_tag:
type: string
description: tag of the heat_container_agent system container
default: victoria-dev
default: wallaby-stable-1
keystone_auth_enabled:
type: boolean


+ 1
- 1
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml View File

@ -683,7 +683,7 @@ parameters:
heat_container_agent_tag:
type: string
description: tag of the heat_container_agent system container
default: victoria-dev
default: wallaby-stable-1
keystone_auth_enabled:
type: boolean


+ 1
- 2
playbooks/container-builder-vars.yaml View File

@ -7,8 +7,7 @@ magnum_repository: openstackmagnum
# image is re-built and pushed under the same tag every time.
heat_container_agent_images:
- tag: victoria-stable-1
- tag: wallaby-dev
dev: true
- tag: wallaby-stable-1
kubernetes_versions:
- version: v1.15.12


+ 20
- 13
playbooks/container-builder.yaml View File

@ -11,32 +11,35 @@
docker_image:
name: "{{ magnum_repository }}/heat-container-agent"
tag: "{{ item.tag }}"
pull: yes
source: pull
register: docker_output
when: not (item.dev | default(false) | bool)
ignore_errors: true
failed_when: (docker_output is failed and "pull rate limit" in docker_output.msg)
with_items: "{{ heat_container_agent_images }}"
- name: "Build {{ magnum_repository }}/heat-container-agent:{{ item.item.tag }} image"
docker_image:
path: "{{ magnum_src_dir }}/dockerfiles/heat-container-agent"
build:
path: "{{ magnum_src_dir }}/dockerfiles/heat-container-agent"
name: "{{ magnum_repository }}/heat-container-agent"
tag: "{{ item.item.tag }}"
push: no
source: build
with_items: "{{ docker_output.results }}"
when: (item is failed) or (item.item.dev | default(false) | bool)
when: ("msg" in item and "not found" in item.msg) or (item.item.dev | default(false) | bool)
retries: 10
- name: "Build kubernetes images"
block:
- name: "Build {{ magnum_repository }}/{{ item[1].name }}:{{ item[0].version }} image"
docker_image:
path: "{{ magnum_src_dir }}/dockerfiles/{{ item[1].name }}"
name: "{{ magnum_repository }}/{{ item[1].name }}"
tag: "{{ item[0].version }}"
buildargs:
KUBE_VERSION: "{{ item[0].version }}"
build:
path: "{{ magnum_src_dir }}/dockerfiles/{{ item[1].name }}"
args:
KUBE_VERSION: "{{ item[0].version }}"
push: no
source: build
with_nested:
- "{{ kubernetes_versions }}"
- "{{ kubernetes_images }}"
@ -45,12 +48,14 @@
- name: "Build helm-client image"
block:
- docker_image:
path: "{{ magnum_src_dir }}/dockerfiles/helm-client"
name: "{{ magnum_repository }}/helm-client"
tag: "{{ item.version }}"
buildargs:
HELM_VERSION: "{{ item.version }}"
build:
path: "{{ magnum_src_dir }}/dockerfiles/helm-client"
args:
HELM_VERSION: "{{ item.version }}"
push: no
source: build
with_items: "{{ helm_versions }}"
retries: 10
@ -58,11 +63,13 @@
block:
- name: "Build {{ magnum_repository }}/cluster-autoscaler:v{{ item.version }}"
docker_image:
path: "{{ magnum_src_dir }}/dockerfiles/cluster-autoscaler"
name: "{{ magnum_repository }}/cluster-autoscaler"
tag: "v{{ item.version }}"
buildargs:
AUTOSCALER_VERSION: "cluster-autoscaler-{{ item.version }}"
build:
path: "{{ magnum_src_dir }}/dockerfiles/cluster-autoscaler"
args:
AUTOSCALER_VERSION: "cluster-autoscaler-{{ item.version }}"
push: no
source: build
with_items: "{{ cluster_autoscaler_versions }}"
retries: 10

Loading…
Cancel
Save