-
Notifications
You must be signed in to change notification settings - Fork 8
feat(ironic): make updating ironic easier by following our branch #1628
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ccb9fcd to
20b7c4f
Compare
skrobul
requested changes
Jan 26, 2026
20b7c4f to
df93a4f
Compare
skrobul
reviewed
Jan 26, 2026
Collaborator
skrobul
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The entrypoints don't seem right:
❯ git rev-parse HEAD
df93a4f9024d450f0b8f717d4b30259e01a89191
understack on ironic-from-branch [$] ☸ uc_iad3_dev (openstack) in
❯ docker build -t ironic-patched --build-arg OPENSTACK_VERSION=2025.2 -f containers/ironic/Dockerfile .
[+] Building 1.1s (26/26) FINISHED docker:default
=> [internal] load build definition from Dockerfile 0.0s
=> => transferring dockerfile: 2.93kB 0.0s
=> resolve image config for docker-image://docker.io/docker/dockerfile:1 0.2s
=> CACHED docker-image://docker.io/docker/dockerfile:1@sha256:b6afd42430b15f2d2a4c5a02b919e98a525b785b1aaff16747d2f623364e39b6 0.0s
=> [internal] load metadata for ghcr.io/astral-sh/uv:latest 0.0s
=> [internal] load metadata for quay.io/airshipit/ironic:2025.2-ubuntu_noble 0.2s
=> [internal] load .dockerignore 0.0s
=> => transferring context: 46B 0.0s
=> [internal] load build context 0.4s
=> => transferring context: 2.74MB 0.3s
=> FROM ghcr.io/astral-sh/uv:latest 0.0s
=> [build 1/12] FROM quay.io/airshipit/ironic:2025.2-ubuntu_noble@sha256:a1111123d1d116f666c7024b37fe54dfc38cb6df7138de9ec464d898f595b 0.0s
=> [build 4/12] ADD --keep-git-dir=true https://github.com/openstack/ironic.git#3856f2183a4e568eb4f05aa561c8626eb80241c0 /src/ironic 0.0s
=> CACHED [final 2/5] RUN wget -qO- https://pkgs.k8s.io/core:/stable:/v1.35/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubern 0.0s
=> CACHED [final 3/5] RUN apt-get update && apt-get install -y --no-install-recommends genisoimage isolinux 0.0s
=> CACHED [build 2/12] COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ 0.0s
=> CACHED [build 3/12] RUN apt-get update && apt-get install -y --no-install-recommends git patch && apt-get c 0.0s
=> CACHED [build 4/12] ADD --keep-git-dir=true https://github.com/openstack/ironic.git#3856f2183a4e568eb4f05aa561c8626eb80241c0 /src/i 0.0s
=> CACHED [build 5/12] RUN git -C /src/ironic fetch --unshallow 0.0s
=> CACHED [build 6/12] COPY python/ironic-understack /src/understack/ironic-understack 0.0s
=> CACHED [build 7/12] COPY python/understack-flavor-matcher /src/understack/understack-flavor-matcher 0.0s
=> CACHED [build 8/12] RUN --mount=type=cache,target=/root/.cache/uv uv pip install --upgrade --constraint https://rel 0.0s
=> CACHED [build 9/12] COPY containers/ironic/patches /tmp/patches/ 0.0s
=> CACHED [build 10/12] RUN cd /var/lib/openstack/lib/python3.12/site-packages && patch -p1 < /tmp/patches/0001-Solve-IPMI-call-iss 0.0s
=> CACHED [build 11/12] RUN export URL=https://github.com/novnc/noVNC/archive/refs/tags/v1.6.0.tar.gz && export DEST_FILE=novnc-1 0.0s
=> CACHED [build 12/12] COPY containers/ironic/ironic-console-pod.yaml.template /var/lib/openstack/lib/python3.12/site-packages/ironic/ 0.0s
=> CACHED [final 4/5] COPY --from=build --link /var/lib/openstack /var/lib/openstack 0.0s
=> CACHED [final 5/5] COPY --from=build /usr/share/novnc /usr/share/novnc 0.0s
=> exporting to image 0.0s
=> => exporting layers 0.0s
=> => writing image sha256:f4c910eb843ac2f8f560c9f2611da542bf3e23409dbaa9ef934f23b8d08254f9 0.0s
=> => naming to docker.io/library/ironic-patched 0.0s
understack on ironic-from-branch [$] ☸ uc_iad3_dev (openstack) in
❯ docker run --rm -it docker.io/library/ironic-patched bash
root@a8b4308ffe6f:/# grep KubernetesConsoleContainer /var/lib/openstack/lib/python3.12/site-packages/ironic
ironic/ ironic-32.0.1.dev66.dist-info/ ironic_understack-0.0.0.dist-info/
ironic-32.0.1.dev61.dist-info/ ironic_understack/
root@a8b4308ffe6f:/# grep KubernetesConsoleContainer /var/lib/openstack/lib/python3.12/site-packages/ironic-32.0.1.dev61.dist-info/entry_points.txt
root@a8b4308ffe6f:/# grep KubernetesConsoleContainer /var/lib/openstack/lib/python3.12/site-packages/ironic-32.0.1.dev66.dist-info/entry_points.txt
kubernetes = ironic.console.container.kubernetes:KubernetesConsoleContainer
root@a8b4308ffe6f:/# pip list | grep ironic
ironic 32.0.1.dev61
ironic-understack 0.0.0
root@a8b4308ffe6f:/#
root@a8b4308ffe6f:/# ls -ld /var/lib/openstack/lib/python3.12/site-packages/ironic-*
drwxr-xr-x 1 root root 194 Jan 26 03:28 /var/lib/openstack/lib/python3.12/site-packages/ironic-32.0.1.dev61.dist-info
drwxr-xr-x 1 root root 246 Jan 26 16:31 /var/lib/openstack/lib/python3.12/site-packages/ironic-32.0.1.dev66.dist-info
root@a8b4308ffe6f:/#
8cf657b to
3a04974
Compare
We have a stable branch that we push patches into. This makes it easier for us to follow our patch series by installing Ironic from our branch.
3a04974 to
37fa4cd
Compare
skrobul
approved these changes
Jan 26, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We have a stable branch that we push patches into. This makes it easier for us to follow our patch series by installing Ironic from our branch.