Skip to content

Commit d488071

Browse files
abhimanyu003abhimanyu003
authored
Merge branch 'main' into renovate/golang-1.x
2 parents 7fd762d + 01d5194 commit d488071

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+10023
-10356
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.venv

‎.github/workflows/build-container-images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3232
- name: Set up Docker Buildx
33-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
33+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
3434

3535
- name: Login to ghcr.io
3636
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3

‎.github/workflows/build-dexop.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2020
- name: Set up Docker Buildx
21-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
21+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
2222

2323
- name: Login to ghcr.io
2424
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3

‎.github/workflows/code-test.yaml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ jobs:
2626
projects: ${{ steps.set-projects.outputs.projects }}
2727
steps:
2828
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
29-
- name: Find all Python projects with pyproject.toml
29+
- name: Find all projects with pyproject.toml
3030
id: set-projects
3131
run: |
3232
# grabs all paths with pyproject.toml, snips the 2nd dir, grabs only unique ones, makes a JSON list
33-
projects=$(find python -mindepth 2 -name pyproject.toml | awk -F/ '{print $2}' | sort -u | jq -R -s -c 'split("\n")[:-1]')
33+
projects=$(find python -mindepth 2 ! -wholename 'python/understack-tests/*' -name pyproject.toml | awk -F/ '{print $2}' | sort -u | jq -R -s -c 'split("\n")[:-1]')
3434
echo "projects=$projects" >> "$GITHUB_OUTPUT"
35-
python:
35+
36+
uv:
3637
needs: [discover]
3738
runs-on: ubuntu-latest
3839

@@ -46,22 +47,22 @@ jobs:
4647

4748
steps:
4849
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
49-
- run: pipx install poetry==1.7.1 && poetry self add 'poetry-dynamic-versioning[plugin]'
50-
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
50+
- uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6
51+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
5152
with:
5253
python-version-file: python/${{ matrix.project }}/pyproject.toml
53-
cache: "poetry"
54-
- run: poetry install --sync --with test
55-
- run: poetry build
56-
- run: "poetry run pytest --cov --cov-report xml:coverage.xml"
57-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
54+
- run: uv sync
55+
- run: uv build --wheel
56+
- run: "uv run pytest --cov --cov-report xml:coverage.xml"
57+
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
5858
with:
5959
name: coverage-${{ matrix.project }}
6060
path: python/${{ matrix.project }}/coverage.xml
6161
retention-days: 1
6262

63+
6364
coverage-upload:
64-
needs: python
65+
needs: [uv]
6566
runs-on: ubuntu-latest
6667
steps:
6768
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4

‎.github/workflows/containers.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: setup docker buildx
40-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
40+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
4141
- name: login to ghcr.io
4242
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
4343
with:
@@ -80,7 +80,7 @@ jobs:
8080

8181
steps:
8282
- name: setup docker buildx
83-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
83+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
8484
- name: login to ghcr.io
8585
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
8686
with:
@@ -126,10 +126,11 @@ jobs:
126126
- name: ironic-nautobot-client
127127
- name: nova-flavors
128128
- name: ansible
129+
- name: understack-tests
129130

130131
steps:
131132
- name: setup docker buildx
132-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
133+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
133134
- name: login to ghcr.io
134135
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
135136
with:
@@ -186,6 +187,7 @@ jobs:
186187
- ironic-nautobot-client
187188
- nova-flavors
188189
- ansible
190+
- understack-tests
189191

190192
steps:
191193
- name: clean up PR container

‎.github/workflows/yamllint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
22-
- uses: azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4
22+
- uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4
2323
- uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
2424
- uses: bmuschko/setup-kubeconform@5ccaecbbf012bcb1eeeab66e649db64a477ade8f # v1
2525
- name: validate kustomize with kubeconform

‎.pre-commit-config.yaml‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,31 @@ repos:
5353
hooks:
5454
- id: ansible-lint
5555
entry: "sh -c 'cd ansible && python3 -m ansiblelint -v --force-color'"
56+
verbose: true
57+
always_run: false
5658
additional_dependencies:
5759
- ansible
5860
- jmespath
59-
files: '^ansible/.*$'
60-
- repo: https://github.com/python-poetry/poetry
61-
rev: '2.1.3'
61+
files: '^ansible/.*'
62+
- repo: https://github.com/astral-sh/uv-pre-commit
63+
# uv version.
64+
rev: 0.7.13
6265
hooks:
63-
- id: poetry-check
64-
language_version: "3.11"
65-
name: "poetry-check (understack-workflows)"
66-
files: '^python/understack-workflows/'
67-
args: ["-C", "python/understack-workflows"]
68-
- id: poetry-lock
69-
language_version: "3.11"
70-
name: "poetry-lock (understack-workflows)"
71-
files: '^python/understack-workflows/'
72-
args: ["-C", "python/understack-workflows"]
66+
- id: uv-lock
67+
name: diff-nautobot-understack
68+
args: ["-D", "python/diff-nautobot-understack"]
69+
- id: uv-lock
70+
name: ironic-understack
71+
args: ["-D", "python/ironic-understack"]
72+
- id: uv-lock
73+
name: neutron-understack
74+
args: ["-D", "python/neutron-understack"]
75+
- id: uv-lock
76+
name: understack-flavor-matcher
77+
args: ["-D", "python/understack-flavor-matcher"]
78+
- id: uv-lock
79+
name: understack-workflows
80+
args: ["-D", "python/understack-workflows"]
7381
- repo: https://github.com/renovatebot/pre-commit-hooks
7482
rev: 40.8.1
7583
hooks:

‎apps/openstack/neutron.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
component: neutron
33
repoURL: https://tarballs.opendev.org/openstack/openstack-helm
4-
chartVersion: 2025.1.1+1fa537cf1
4+
chartVersion: 2025.1.9+3225ad74a

‎components/glance/glance-rabbitmq-queue.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,20 @@ spec:
5757
rabbitmqClusterReference:
5858
name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
5959
namespace: openstack
60+
---
61+
apiVersion: rabbitmq.com/v1beta1
62+
kind: Policy
63+
metadata:
64+
name: glance-notifications-ttl
65+
namespace: openstack
66+
spec:
67+
name: glance-notifications-ttl # name of the policy
68+
vhost: "glance" # default to '/' if not provided
69+
pattern: "^notifications.*" # regex used to match queues and exchanges
70+
applyTo: "queues" # set to 'queues', 'exchanges', or 'all'
71+
priority: 1 # defaults to 0
72+
definition: # policy definition
73+
message-ttl: 86400000
74+
rabbitmqClusterReference:
75+
name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
76+
namespace: openstack

‎components/ironic/ironic-rabbitmq-queue.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,20 @@ spec:
5757
rabbitmqClusterReference:
5858
name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
5959
namespace: openstack
60+
---
61+
apiVersion: rabbitmq.com/v1beta1
62+
kind: Policy
63+
metadata:
64+
name: ironic-notifications-ttl
65+
namespace: openstack
66+
spec:
67+
name: ironic-notifications-ttl # name of the policy
68+
vhost: "ironic" # default to '/' if not provided
69+
pattern: "^notifications.*" # regex used to match queues and exchanges
70+
applyTo: "queues" # set to 'queues', 'exchanges', or 'all'
71+
priority: 1 # defaults to 0
72+
definition: # policy definition
73+
message-ttl: 86400000
74+
rabbitmqClusterReference:
75+
name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
76+
namespace: openstack

0 commit comments

Comments
 (0)