Merge branch 'main' into renovate/go-golang.org-x-oauth2-vulnerability

Author: abhimanyu003

.github/workflows/code-test.yaml

@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6
       - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
         with:
           python-version-file: python/${{ matrix.project }}/pyproject.toml

.github/workflows/containers.yaml

@@ -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, cinder]
+        project: [ironic, neutron, keystone, nova, openstack-client, cinder, octavia]
 
     steps:
       - name: setup docker buildx
@@ -182,6 +182,7 @@ jobs:
           - neutron
           - keystone
           - nova
+          - octavia
           - openstack-client
           - dnsmasq
           - ironic-nautobot-client

ansible/requirements.yml

@@ -1,6 +1,6 @@
 collections:
   - name: community.general
-    version: "==10.7.1"
+    version: "==10.7.2"
   - name: openstack.cloud
     version: "==2.4.1"
   - name: networktocode.nautobot

apps/appsets/appset-understack-global.yaml

@@ -12,7 +12,7 @@ spec:
     - jsonPointers:
       # Allow temporarily disabling auto-sync for troubleshooting
       # https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync
-      - /spec/syncPolicy
+      - /spec/syncPolicy/automated
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
   generators:
@@ -33,6 +33,13 @@ spec:
                           values:
                             - "global"
                             - "aio"
+                    values:
+                      # these should always be replaced by further rules below but provide
+                      # a default for the merge operations below
+                      understack_url: 'https://github.com/rackerlabs/understack.git'
+                      understack_ref: 'main'
+                      deploy_url: 'https://github.com/rackerlabs/understack.git'
+                      deploy_ref: 'main'
                 # dev clusters allow some overrides
                 - clusters:
                     selector:

apps/appsets/appset-understack-infra.yaml

@@ -12,7 +12,7 @@ spec:
     - jsonPointers:
       # Allow temporarily disabling auto-sync for troubleshooting
       # https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync
-      - /spec/syncPolicy
+      - /spec/syncPolicy/automated
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
   generators:
@@ -34,6 +34,13 @@ spec:
                             - "global"
                             - "site"
                             - "aio"
+                    values:
+                      # these should always be replaced by further rules below but provide
+                      # a default for the merge operations below
+                      understack_url: 'https://github.com/rackerlabs/understack.git'
+                      understack_ref: 'main'
+                      deploy_url: 'https://github.com/rackerlabs/understack.git'
+                      deploy_ref: 'main'
                 # dev clusters allow some overrides
                 - clusters:
                     selector:

apps/appsets/appset-understack-openstack.yaml

@@ -12,7 +12,7 @@ spec:
     - jsonPointers:
       # Allow temporarily disabling auto-sync for troubleshooting
       # https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync
-      - /spec/syncPolicy
+      - /spec/syncPolicy/automated
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
   generators:
@@ -35,6 +35,13 @@ spec:
                             # openstack is deployed at the site level
                             - "site"
                             - "aio"
+                    values:
+                      # these should always be replaced by further rules below but provide
+                      # a default for the merge operations below
+                      understack_url: 'https://github.com/rackerlabs/understack.git'
+                      understack_ref: 'main'
+                      deploy_url: 'https://github.com/rackerlabs/understack.git'
+                      deploy_ref: 'main'
                 # dev clusters allow some overrides
                 - clusters:
                     selector:

apps/appsets/appset-understack-operators.yaml

@@ -12,7 +12,7 @@ spec:
     - jsonPointers:
       # Allow temporarily disabling auto-sync for troubleshooting
       # https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync
-      - /spec/syncPolicy
+      - /spec/syncPolicy/automated
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
   generators:
@@ -34,6 +34,13 @@ spec:
                             - "global"
                             - "site"
                             - "aio"
+                    values:
+                      # these should always be replaced by further rules below but provide
+                      # a default for the merge operations below
+                      understack_url: 'https://github.com/rackerlabs/understack.git'
+                      understack_ref: 'main'
+                      deploy_url: 'https://github.com/rackerlabs/understack.git'
+                      deploy_ref: 'main'
                 # dev clusters allow some overrides
                 - clusters:
                     selector:

apps/appsets/appset-understack-site.yaml

@@ -12,7 +12,7 @@ spec:
     - jsonPointers:
       # Allow temporarily disabling auto-sync for troubleshooting
       # https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync
-      - /spec/syncPolicy
+      - /spec/syncPolicy/automated
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
   generators:
@@ -33,6 +33,13 @@ spec:
                           values:
                             - "site"
                             - "aio"
+                    values:
+                      # these should always be replaced by further rules below but provide
+                      # a default for the merge operations below
+                      understack_url: 'https://github.com/rackerlabs/understack.git'
+                      understack_ref: 'main'
+                      deploy_url: 'https://github.com/rackerlabs/understack.git'
+                      deploy_ref: 'main'
                 # dev clusters allow some overrides
                 - clusters:
                     selector:

apps/infra/sealed-secrets.yaml

@@ -0,0 +1,6 @@
+---
+component: sealed-secrets
+componentNamespace: kube-system
+sources:
+  - ref: understack
+    path: 'bootstrap/sealed-secrets'

apps/openstack/octavia.yaml

@@ -0,0 +1,4 @@
+---
+component: octavia
+repoURL: https://tarballs.opendev.org/openstack/openstack-helm
+chartVersion: 2025.1.12+80041dfbb