✨ Change API for OpenStackMachine.Spec.Image by EmilienM · Pull Request #1796 · kubernetes-sigs/cluster-api-provider-openstack

EmilienM · 2023-12-18T18:30:55Z

What this PR does / why we need it:

Right now, the image for an OpenStackMachine can be defined either
its name via Spec.Image or via Spec.ImageUUID.

Now we will use a single parameter which would be of type ImageFilter.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1795

TODOs:

squashed commits
includes documentation
adds unit tests

netlify · 2023-12-18T18:31:00Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name	Link
🔨 Latest commit	`4368c4f`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/65a159d6359e2d00084ee56c
😎 Deploy Preview	https://deploy-preview-1796--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

EmilienM · 2023-12-18T20:48:12Z

/test pull-cluster-api-provider-openstack-e2e-full-test

EmilienM · 2023-12-19T01:51:44Z

/test pull-cluster-api-provider-openstack-e2e-test

EmilienM · 2023-12-19T01:51:49Z

/test pull-cluster-api-provider-openstack-e2e-full-test

EmilienM · 2023-12-19T13:49:04Z

/test pull-cluster-api-provider-openstack-e2e-full-test

EmilienM · 2023-12-19T16:21:36Z

/test pull-cluster-api-provider-openstack-e2e-full-test

EmilienM · 2023-12-19T19:25:49Z

the bastion instanceSpec gets wrong API:
https://storage.googleapis.com/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api-provider-openstack/1796/pull-cluster-api-provider-openstack-e2e-full-test/1737146179717697536/artifacts/clusters/clusterctl-upgrade-5awqmp/clusterctl-upgrade-7iukbs-cluster-template.yaml

---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha6
kind: OpenStackCluster
metadata:
  name: clusterctl-upgrade-7iukbs
  namespace: clusterctl-upgrade
spec:
  allowAllInClusterTraffic: true
  apiServerLoadBalancer:
    enabled: true
  bastion:
    enabled: true
    instance:
      flavor: m1.tiny
      image:
        name: cirros-0.6.1-x86_64-disk

EmilienM · 2023-12-19T21:00:44Z

I need to move test/e2e/data/kustomize/common-patches/cni/patch-cluster.yaml to versioned patches so it's not applied on v1alpha8.

EmilienM · 2023-12-20T16:01:12Z

/test pull-cluster-api-provider-openstack-e2e-full-test

EmilienM · 2023-12-20T20:56:07Z

/test pull-cluster-api-provider-openstack-e2e-full-test

jichenjc

the others lgtm

pkg/cloud/services/compute/instance.go

dulek

/lgtm

EmilienM · 2024-01-11T13:40:40Z

@lentzi90 @mdbooth I have a preference to address this via another PR, which I'm working on now.

EmilienM · 2024-01-11T13:52:25Z

/hold until I fix the bastion thing via #1822

EmilienM · 2024-01-11T14:16:50Z

/test pull-cluster-api-provider-openstack-e2e-full-test

EmilienM · 2024-01-11T14:17:06Z

/hold cancel

EmilienM · 2024-01-11T20:25:15Z

/test pull-cluster-api-provider-openstack-e2e-full-test

EmilienM · 2024-01-11T21:02:23Z

@lentzi90 @mdbooth ready for review again. Thanks!

test/e2e/shared/common.go

lentzi90

/approve
The kustomize patches could be optimized a bit but I don't want to hold this back just because of that 🙂

k8s-ci-robot · 2024-01-12T13:51:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dulek, EmilienM, lentzi90, stephenfin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [lentzi90]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

dulek · 2024-01-12T14:08:46Z

/lgtm

Right now, the image for an OpenStackMachine can be defined either its name via Spec.Image or via Spec.ImageUUID. Now we will use a single parameter which would be of type ImageFilter.

EmilienM · 2024-01-12T15:25:15Z

rebased

MaysaMacedo · 2024-01-12T20:21:09Z

/lgtm

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 18, 2023

k8s-ci-robot requested review from dulek and mdbooth December 18, 2023 18:31

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 18, 2023

EmilienM force-pushed the issue_1795 branch 4 times, most recently from f880446 to 46b1937 Compare December 18, 2023 19:53

EmilienM force-pushed the issue_1795 branch from 46b1937 to 784d2c6 Compare December 19, 2023 19:56

EmilienM force-pushed the issue_1795 branch from 784d2c6 to 44bd776 Compare December 20, 2023 16:01

EmilienM force-pushed the issue_1795 branch 3 times, most recently from af51881 to 4f7f45a Compare December 20, 2023 19:31

jichenjc reviewed Dec 21, 2023

View reviewed changes

pkg/cloud/services/compute/instance.go Outdated Show resolved Hide resolved

jichenjc reviewed Dec 21, 2023

View reviewed changes

pkg/cloud/services/compute/instance.go Show resolved Hide resolved

EmilienM force-pushed the issue_1795 branch from 4f7f45a to 525d476 Compare December 21, 2023 14:10

EmilienM requested a review from jichenjc December 22, 2023 14:02

dulek approved these changes Dec 22, 2023

View reviewed changes

k8s-ci-robot assigned dulek Dec 22, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 22, 2023

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 11, 2024

EmilienM force-pushed the issue_1795 branch from 76f2770 to 72146dc Compare January 11, 2024 14:16

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 11, 2024

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 11, 2024

EmilienM force-pushed the issue_1795 branch 3 times, most recently from 76346ab to 842679a Compare January 11, 2024 19:09

EmilienM mentioned this pull request Jan 11, 2024

✨ Update CI to use OpenStack Bobcat #1804

Merged

lentzi90 reviewed Jan 12, 2024

View reviewed changes

test/e2e/shared/common.go Outdated Show resolved Hide resolved

EmilienM force-pushed the issue_1795 branch from 842679a to 10c68f8 Compare January 12, 2024 13:30

lentzi90 reviewed Jan 12, 2024

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 12, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2024

Convert Image to use ImageFilfter instead of string

4368c4f

Right now, the image for an OpenStackMachine can be defined either its name via Spec.Image or via Spec.ImageUUID. Now we will use a single parameter which would be of type ImageFilter.

EmilienM force-pushed the issue_1795 branch from 10c68f8 to 4368c4f Compare January 12, 2024 15:25

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2024

k8s-ci-robot assigned MaysaMacedo Jan 12, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2024

k8s-ci-robot merged commit 86f78d6 into kubernetes-sigs:main Jan 12, 2024

stephenfin deleted the issue_1795 branch February 14, 2024 16:07

Conversation

EmilienM commented Dec 18, 2023

Uh oh!

netlify bot commented Dec 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Uh oh!

EmilienM commented Dec 18, 2023

Uh oh!

EmilienM commented Dec 19, 2023

Uh oh!

EmilienM commented Dec 19, 2023

Uh oh!

EmilienM commented Dec 19, 2023

Uh oh!

EmilienM commented Dec 19, 2023

Uh oh!

EmilienM commented Dec 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

EmilienM commented Dec 19, 2023

Uh oh!

EmilienM commented Dec 20, 2023

Uh oh!

EmilienM commented Dec 20, 2023

Uh oh!

jichenjc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dulek left a comment

Choose a reason for hiding this comment

Uh oh!

EmilienM commented Jan 11, 2024

Uh oh!

EmilienM commented Jan 11, 2024

Uh oh!

EmilienM commented Jan 11, 2024

Uh oh!

EmilienM commented Jan 11, 2024

Uh oh!

EmilienM commented Jan 11, 2024

Uh oh!

EmilienM commented Jan 11, 2024

Uh oh!

Uh oh!

lentzi90 left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Jan 12, 2024

Uh oh!

dulek commented Jan 12, 2024

Uh oh!

EmilienM commented Jan 12, 2024

Uh oh!

MaysaMacedo commented Jan 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

netlify bot commented Dec 18, 2023 •

edited

Loading

EmilienM commented Dec 19, 2023 •

edited

Loading