Skip to content
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.

Sign up for GitHub

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

Jump to bottom

magnum capi images & templates #13

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

magnum capi images & templates #13

wants to merge 17 commits into from

Conversation

scrungus
Copy link
Contributor

No description provided.

@scrungus scrungus requested a review from a team as a code owner July 13, 2023 13:13
JohnGarbutt
JohnGarbutt requested changes Jul 13, 2023
View reviewed changes
examples/capi-templates-images.yml Outdated Show resolved Hide resolved
examples/capi-templates-images.yml Outdated
# Configuration of Magnum container clusters.

kube-v1_25_11:
labels: "kube_tag=v1.25.11"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets remove this now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets go for these default labels:
"octavia_provider=amphora,monitoring_enabled=false,kube_dashboard_enabled=true,capi_helm_chart_version=xxx"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets add a note, where available, you should do this:
"octavia_provider=ovn,monitoring_enabled=false,kube_dashboard_enabled=true,capi_helm_chart_version=xxx"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, lets reverse this template, we should use ovn by default.

examples/capi-templates-images.yml Outdated Show resolved Hide resolved
examples/capi-templates-images.yml Outdated Show resolved Hide resolved
examples/capi-templates-images.yml Outdated Show resolved Hide resolved
examples/capi-templates-images.yml Outdated Show resolved Hide resolved
examples/capi-templates-images.yml Outdated Show resolved Hide resolved
@scrungus scrungus requested a review from JohnGarbutt July 17, 2023 12:34
JohnGarbutt
JohnGarbutt previously approved these changes Jul 20, 2023
View reviewed changes
Copy link
Member

@JohnGarbutt JohnGarbutt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. Things will evolve, but this looks good, thank you!

@scrungus
Copy link
Contributor Author

scrungus commented Jul 26, 2023 •
edited
Loading

an initial attempt at a template merging tool has been added.

put a clouds.yaml under ./tools/merge_config/. this app cred needs to have at least member and all the load balancer permissions
run ./tools/merge_config/bin/ensure_venv
run ./tools/merge_config/bin/run

it will take the current images and templates under /etc/openstack-config/container-clusters.yml and mark them as old, and generate new images + templates pulled from the manifest.json artifact released by latest azimuth-images

@scrungus scrungus force-pushed the capi-template-images branch 2 times, most recently from 302fb0e to e1673ba Compare August 11, 2023 14:07
capi-image-templates
a9224b1 
review changes

default to ovn

dns

unnecessary fields

label format change

dashes to underscores

unnecessary

underscores

update requirements for new coe template ansible role

default dns

underscores

init version of automated template generation

init version of automated template generation

init version of automated template generation

make operation no-op when no new images are defined and stop new images being included in old image list

list concat for images
@scrungus scrungus force-pushed the capi-template-images branch from e1673ba to a9224b1 Compare August 11, 2023 15:18
@scrungus scrungus force-pushed the capi-template-images branch from c9ec3c5 to b46846c Compare November 27, 2023 17:33
scrungus added 3 commits November 28, 2023 10:58
removed auth token
e6f6526
Squashed commit of the following:
78726b7 
commit bcab111
Author: scrungus <[email protected]>
Date:   Wed Dec 6 17:32:04 2023 +0000

    role install no longer needed

commit 16aacaa
Author: scrungus <[email protected]>
Date:   Mon Dec 4 17:07:10 2023 +0000

    comments

commit 5d09004
Author: scrungus <[email protected]>
Date:   Mon Dec 4 17:02:35 2023 +0000

    change to official collection

commit 4a7350e
Author: scrungus <[email protected]>
Date:   Thu Nov 30 16:01:12 2023 +0000

    separate venv is unnecessary now as all roles updated to new sdk

commit f652f13
Author: scrungus <[email protected]>
Date:   Thu Nov 30 16:08:32 2023 +0000

    changes for ansible-collection-openstack

commit 8429a57
Merge: 961f102 8ea98a4
Author: Bartosz Bezak <[email protected]>
Date:   Tue Sep 5 14:18:13 2023 +0200

    Merge pull request #18 from stackhpc/domains

    add domains

commit 8ea98a4
Author: Bartosz Bezak <[email protected]>
Date:   Tue Sep 5 11:27:17 2023 +0200

    add domains

commit 961f102
Merge: 382918a 2f32964
Author: Mark Goddard <[email protected]>
Date:   Mon Sep 4 10:06:27 2023 +0100

    Merge pull request #16 from stackhpc/octavia-quotas

    Prevent load balancer creation errors

commit 382918a
Merge: ebab9f7 8c5c7c4
Author: Matt Crees <[email protected]>
Date:   Thu Aug 24 09:26:12 2023 +0100

    Merge pull request #17 from stackhpc/os-networks-rbac

    Add RBAC support into openstack-networks.yml

commit 8c5c7c4
Author: Matt Crees <[email protected]>
Date:   Wed Aug 23 17:31:59 2023 +0100

    Add RBAC support into openstack-networks.yml

commit 2f32964
Author: Pierre Riteau <[email protected]>
Date:   Wed Aug 16 15:39:36 2023 +0200

    Prevent load balancer creation errors

    Octavia load balancers are launched using the service project. With
    default quotas, load balancer creation can quickly fail:

        Quota exceeded for instances: Requested 1, but already used 10 of 10 instances (HTTP 403)

    Add a new example setting required service project quotas to unlimited
    to avoid these failures.

commit ebab9f7
Merge: 798f72a 4c23c55
Author: Mark Goddard <[email protected]>
Date:   Thu Aug 10 09:53:11 2023 +0100

    Merge pull request #15 from stackhpc/noeol

    Wrap lines and add missing new line at end of file

commit 4c23c55
Author: Pierre Riteau <[email protected]>
Date:   Thu Aug 10 09:06:54 2023 +0200

    Wrap lines and add missing new line at end of file
removed old hardcoded manifest.json
290d0ec
@scrungus scrungus requested a review from JohnGarbutt February 8, 2024 13:27
@sd109 sd109 mentioned this pull request Mar 5, 2024
Merged
@cityofships cityofships added the magnum All things OpenStack Magnum related label Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Alex-Welsh Alex-Welsh Alex-Welsh left review comments

@JohnGarbutt JohnGarbutt Awaiting requested review from JohnGarbutt

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
magnum All things OpenStack Magnum related
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@scrungus @JohnGarbutt @Alex-Welsh @cityofships