Browse Source

Merge "bug: Use configured heat-container-agent tag"

changes/64/659764/3
Zuul 2 weeks ago
parent
commit
a686720588
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
  2. +3
    -3
      magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh
  3. +1
    -1
      magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh

+ 1
- 1
magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh View File

@@ -66,7 +66,7 @@ ExecStartPre=mkdir -p /opt/stack/os-config-refresh
ExecStartPre=mkdir -p /srv/magnum
ExecStartPre=-/bin/podman kill heat-container-agent
ExecStartPre=-/bin/podman rm heat-container-agent
ExecStartPre=-/bin/podman pull docker.io/openstackmagnum/heat-container-agent:train-dev
ExecStartPre=-/bin/podman pull ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}heat-container-agent:${HEAT_CONTAINER_AGENT_TAG}
ExecStart=/bin/podman run \\
--name heat-container-agent \\
--net=host \\

+ 3
- 3
magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh View File

@@ -55,11 +55,11 @@ if [ "${new_kube_tag}" != "${KUBE_TAG}" ]; then
done

for service in ${SERVICE_LIST}; do
${ssh_cmd} atomic pull --storage ostree "docker.io/openstackmagnum/${service_image_mapping[${service}]}:${new_kube_tag}"
${ssh_cmd} atomic pull --storage ostree "${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}${service_image_mapping[${service}]}:${new_kube_tag}"
done

for service in ${SERVICE_LIST}; do
${ssh_cmd} atomic containers update --rebase docker.io/openstackmagnum/${service_image_mapping[${service}]}:${new_kube_tag} ${service}
${ssh_cmd} atomic containers update --rebase ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}${service_image_mapping[${service}]}:${new_kube_tag} ${service}
done

for service in ${SERVICE_LIST}; do
@@ -69,7 +69,7 @@ if [ "${new_kube_tag}" != "${KUBE_TAG}" ]; then
${ssh_cmd} /var/lib/containers/atomic/heat-container-agent.0/rootfs/usr/bin/kubectl --kubeconfig /etc/kubernetes/kubelet-config.yaml uncordon ${INSTANCE_NAME}

for service in ${SERVICE_LIST}; do
${ssh_cmd} atomic --assumeyes images "delete docker.io/openstackmagnum/${service_image_mapping[${service}]}:${KUBE_TAG}"
${ssh_cmd} atomic --assumeyes images "delete ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}${service_image_mapping[${service}]}:${KUBE_TAG}"
done

${ssh_cmd} atomic images prune

+ 1
- 1
magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh View File

@@ -54,7 +54,7 @@ spec:
serviceAccountName: tiller
containers:
- name: config-helm
image: docker.io/openstackmagnum/helm-client:dev
image: ${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}helm-client:dev
command:
- bash
args:

Loading…
Cancel
Save