Comment 3 for bug 1978409

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to integ (master)

Reviewed: https://review.opendev.org/c/starlingx/integ/+/845752
Committed: https://opendev.org/starlingx/integ/commit/0783ec950b424c980658765515a649c846dc5121
Submitter: "Zuul (22348)"
Branch: master

commit 0783ec950b424c980658765515a649c846dc5121
Author: Dan Voiculeasa <email address hidden>
Date: Tue Jun 14 16:10:32 2022 +0300

    Debian: Upversion armada sources for container build

    Currently, we use in the playbooks [1] an armada image built upstream
    [2]. We use armada from upstream helm2 branch.

    Armada needs to be patched to add support for k8s >=1.22.
    Proposed an upstream patch, but we don't know how long it takes until
    it is merged:
    https://review.opendev.org/c/airship/armada/+/845392

    Instead of waiting for upstream commit to merge, and an image be
    generated, we provide the code change here, so an armada image with
    k8s >=1.22 support can be generated. The k8s >=1.22 support is added
    by patch 0003.
    Necessary StarlingX build changes to support generating an container
    image and push to https://hub.docker.com/r/starlingx will be
    addressed in another commit.

    Note: since we always used an upstream built armada container, this
    package purpose was to provide helm chart overrides. We add a new
    purpose: to release to opensource the changes we are about to do to
    armada, since we'll be building a container image using these changes.

    To achieve this we do the following:
    - upversion sources from 7ef4b8643b5ec5216a8f6726841e156c0aa54a1a
    to ddbdd7256c20f138737f6cbd772312f7a19f58b8. This ensures we are
    patching the image used in the playbooks[2].
    - create patches 0001 and 0002 to ensure there are no helm chart
    changes between upversion. This reduces testing effort related to
    original purpose (provide helm chart overrides) of this package.
    - create patch 0003 to add k8s >=1.22 support.
    - old patches are not changed, but renamed from 0001->0005 to
    0004->0008 and regenerated.

    Other notes:
    We don't need to port this work to CentOS. This work is supposed to be
    temporary until the upstream airship/armada commit merges.

    Tests on Debian:
    PASS: build-pkgs -c -p armada
    PASS: make images
          Upload image to controller, use it.
          Using the new armada image do an apply,remove,apply,remove,apply
          chain for a custom StarlingX app.

    [1]: https://opendev.org/starlingx/ansible-playbooks/src/branch/
    master/playbookconfig/src/playbooks/roles/common/
    load-images-information/vars/k8s-v1.22.5/system-images.yml#L5
    [2] quay.io/airshipit/armada:
    ddbdd7256c20f138737f6cbd772312f7a19f58b8-ubuntu_bionic

    Partial-Bug: 1978409
    Signed-off-by: Dan Voiculeasa <email address hidden>
    Change-Id: Id51c241a3965ef462d325da4ffce37a81693a9f4