Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-container-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
with:
context: containers/python311_alpine/
file: containers/python311_alpine/Dockerfile.python311_alpine
file: containers/python311_alpine/Dockerfile
# push for all main branch commits
push: ${{ github.event_name != 'pull_request' }}
tags: ghcr.io/${{ github.repository }}/argo-python3.11.8-alpine3.19:latest,ghcr.io/${{ github.repository }}/argo-python3.11.8-alpine3.19:${{ env.VERSION_PYTHON311 }}
Expand All @@ -54,7 +54,7 @@ jobs:
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
with:
context: containers/python312_alpine/
file: containers/python312_alpine/Dockerfile.python312_alpine
file: containers/python312_alpine/Dockerfile
# push for all main branch commits
push: ${{ github.event_name != 'pull_request' }}
tags: ghcr.io/${{ github.repository }}/argo-python3.12.2-alpine3.19:latest,ghcr.io/${{ github.repository }}/argo-python3.12.2-alpine3.19:${{ env.VERSION_PYTHON312 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
matrix:
# if you add a container here, add it to the 'clean_containers' job below
project: [ironic, neutron, keystone, nova, openstack-client]
project: [ironic, neutron, keystone, nova, openstack-client, cinder]

steps:
- name: setup docker buildx
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
- name: build and deploy openstack container image to registry
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
with:
file: containers/${{ matrix.project }}/Dockerfile.${{ matrix.project }}
file: containers/${{ matrix.project }}/Dockerfile
build-args: OPENSTACK_VERSION=${{ env.OPENSTACK_VERSION }}
pull: true # ensure we always have an up to date source
push: true
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
with:
context: "{{defaultContext}}:containers/dnsmasq"
file: Dockerfile.dnsmasq
file: Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
- name: build and deploy container image to registry
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
with:
file: containers/${{ matrix.container.name }}/Dockerfile.${{ matrix.container.name }}
file: containers/${{ matrix.container.name }}/Dockerfile
pull: true # ensure we always have an up to date source
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
3 changes: 3 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ repos:
# uv version.
rev: 0.7.13
hooks:
- id: uv-lock
name: cinder-understack
args: ["-D", "python/cinder-understack"]
- id: uv-lock
name: diff-nautobot-understack
args: ["-D", "python/diff-nautobot-understack"]
Expand Down
11 changes: 11 additions & 0 deletions components/images-openstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,15 @@ images:
# skyline
skyline: "quay.io/airshipit/skyline:latest"
skyline_db_sync: "quay.io/airshipit/skyline:latest"

# cinder
cinder_api: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
cinder_db_sync: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
cinder_scheduler: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
cinder_volume: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
cinder_volume_usage_audit: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
cinder_db_purge: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
cinder_backup: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
...
File renamed without changes.
18 changes: 18 additions & 0 deletions containers/cinder/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# syntax=docker/dockerfile:1

ARG OPENSTACK_VERSION="required_argument"
FROM docker.io/openstackhelm/cinder:${OPENSTACK_VERSION}-ubuntu_jammy AS builder

COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/

COPY python/cinder-understack /tmp/cinder-understack

RUN --mount=type=cache,target=/root/.cache/uv \
cd /tmp/cinder-understack && \
uv build --wheel --out-dir /tmp/wheels/

FROM docker.io/openstackhelm/cinder:${OPENSTACK_VERSION}-ubuntu_jammy AS final

RUN --mount=type=cache,target=/root/.cache/pip \
--mount=from=builder,source=/tmp/wheels,target=/tmp/wheels \
/var/lib/openstack/bin/python -m pip install --no-input --find-links /tmp/wheels/ cinder-understack
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions python/cinder-understack/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UnderStack Cinder drivers
Empty file.
Empty file.
2 changes: 2 additions & 0 deletions python/cinder-understack/cinder_understack/tests/test_noop.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
def test_noop():
pass
50 changes: 50 additions & 0 deletions python/cinder-understack/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[build-system]
requires = ["hatchling"]
build-backend = "hatchling.build"

[project]
name = "cinder-understack"
version = "0.1.0"
description = "Cinder driver package for UnderStack"
authors = [{ name = "Understack Developers" }]
requires-python = "~=3.10"
readme = "README.rst"
license = "Apache-2.0"
classifiers = [
"Development Status :: 3 - Alpha",
"Environment :: OpenStack",
"Intended Audience :: System Administrators",
"Intended Audience :: Information Technology",
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
]
dependencies = [
]

[project.urls]
Source = "https://github.com/rackerlabs/understack"

[dependency-groups]
test = [
"pytest>=8.3.2,<9",
"pytest-cov>=5.0.0,<6",
"pytest-mock>=3.14.0,<4",
]

[tool.uv]
default-groups = ["test"]

[tool.pytest.ini_options]
minversion = "6.0"
addopts = "-ra"
filterwarnings = "ignore::DeprecationWarning"

[tool.ruff]
# use our default and override anything we need specifically
extend = "../pyproject.toml"
target-version = "py310"
Loading
Loading