Skip to content

Adopt v1beta2 conditions for IBM VPC cluster #2429

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
Merged
merged 1 commit into from
Aug 8, 2025
Merged

Adopt v1beta2 conditions for IBM VPC cluster #2429

merged 1 commit into from
Aug 8, 2025

Conversation

Amulyam24
Copy link
Contributor

@Amulyam24 Amulyam24 commented Jul 16, 2025 •
edited
Loading

What this PR does / why we need it:
This PR includes changes for

  1. Adding v1beta2 status for IBM VPC cluster
  2. Streamline controller changes using CAPI helper functions
  3. Derive parent context while logging

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 part of #2389

Special notes for your reviewer:

/area provider/ibmcloud

  1. Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

Adopt v1beta2 conditions for IBM VPC cluster

@k8s-ci-robot k8s-ci-robot added the area/provider/ibmcloud Issues or PRs related to ibmcloud provider label Jul 16, 2025
@netlify Netlify
Copy link

netlify bot commented Jul 16, 2025 •
edited
Loading

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

Name Link
🔨 Latest commit 2798ca8
🔍 Latest deploy log https://app.netlify.com/projects/kubernetes-sigs-cluster-api-ibmcloud/deploys/6880bc87d5513300087e516d
😎 Deploy Preview https://deploy-preview-2429.cluster-api-ibmcloud.sigs.k8s.io
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 16, 2025
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jul 16, 2025
@Amulyam24
Copy link
Contributor Author 

v1beta2:
    Conditions:
      Last Transition Time:  2025-07-16T05:06:57Z
      Message:               * LoadBalancerReady: VPC load balancer is in creating state
      Observed Generation:   2
      Reason:                NotReady
      Status:                False
      Type:                  Ready
      Last Transition Time:  2025-07-16T05:06:57Z
      Message:               VPC load balancer is in creating state
      Observed Generation:   2
      Reason:                NotReady
      Status:                False
      Type:                  LoadBalancerReady
      Last Transition Time:  2025-07-16T05:06:43Z
      Message:
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  VPCReady
      Last Transition Time:  2025-07-16T05:06:47Z
      Message:
      Observed Generation:   1
      Reason:                Ready
      Status:                True
      Type:                  VPCSubnetReady
      Last Transition Time:  2025-07-16T05:06:34Z
      Message:
      Observed Generation:   1
      Reason:                NotPaused
      Status:                False
      Type:                  Paused


---
v1beta2:
    Conditions:
      Last Transition Time:  2025-07-16T05:17:10Z
      Message:               * LoadBalancerReady: VPC load balancer is in active state
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  Ready
      Last Transition Time:  2025-07-16T05:17:08Z
      Message:               VPC load balancer is in active state
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  LoadBalancerReady
      Last Transition Time:  2025-07-16T05:06:43Z
      Message:
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  VPCReady
      Last Transition Time:  2025-07-16T05:06:47Z
      Message:
      Observed Generation:   1
      Reason:                Ready
      Status:                True
      Type:                  VPCSubnetReady
      Last Transition Time:  2025-07-16T05:06:34Z
      Message:
      Observed Generation:   1
      Reason:                NotPaused
      Status:                False
      Type:                  Paused
---
v1beta2:
    Conditions:
      Last Transition Time:  2025-07-16T06:00:52Z
      Message:               * LoadBalancerReady: Deleting
      Observed Generation:   3
      Reason:                NotReady
      Status:                False
      Type:                  Ready
      Last Transition Time:  2025-07-16T06:00:47Z
      Message:
      Observed Generation:   3
      Reason:                Deleting
      Status:                False
      Type:                  LoadBalancerReady
      Last Transition Time:  2025-07-16T05:06:43Z
      Message:
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  VPCReady
      Last Transition Time:  2025-07-16T05:06:47Z
      Message:
      Observed Generation:   1
      Reason:                Ready
      Status:                True
      Type:                  VPCSubnetReady
      Last Transition Time:  2025-07-16T05:06:34Z
      Message:
      Observed Generation:   1
      Reason:                NotPaused
      Status:                False
      Type:                  Paused

 % kubectl get clusters -A
NAMESPACE   NAME        CLUSTERCLASS   PHASE         AGE   VERSION
default     ibm-vpc-0                  Provisioned   10m

---

% kubectl get machines -A
NAMESPACE   NAME                            CLUSTER     NODENAME                        PROVIDERID                                                                                     PHASE     AGE   VERSION
default     ibm-vpc-0-control-plane-7fdvk   ibm-vpc-0   ibm-vpc-0-control-plane-7fdvk   ibm://c265c8cefda241ca9c107adcbbacaa84///ibm-vpc-0/0717_3290b563-b248-458d-8e14-358d23dd79b7   Running   16m   v1.32.3
default     ibm-vpc-0-control-plane-hlrjn   ibm-vpc-0   ibm-vpc-0-control-plane-hlrjn   ibm://c265c8cefda241ca9c107adcbbacaa84///ibm-vpc-0/0717_6ccf5e25-e040-471f-aa79-ac6635561e4d   Running   19m   v1.32.3
default     ibm-vpc-0-control-plane-xcgrg   ibm-vpc-0   ibm-vpc-0-control-plane-xcgrg   ibm://c265c8cefda241ca9c107adcbbacaa84///ibm-vpc-0/0717_3fbffa33-0d6e-4d6d-a522-eb439c1f758d   Running   14m   v1.32.3
default     ibm-vpc-0-md-0-chhvk-s8gfx      ibm-vpc-0   ibm-vpc-0-md-0-chhvk-s8gfx      ibm://c265c8cefda241ca9c107adcbbacaa84///ibm-vpc-0/0717_89a294f4-34b7-45f3-86d4-8f4cef515469   Running   19m   v1.32.3

@Amulyam24 Amulyam24 force-pushed the vpc-v1beta2 branch 2 times, most recently from c95b5e8 to 405c2cc Compare July 16, 2025 10:49
@Amulyam24
Copy link
Contributor Author

/hold for testing V2 flow

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 18, 2025
@Amulyam24
Copy link
Contributor Author

Amulyam24 commented Jul 21, 2025 •
edited
Loading

reconcile v2 output:

% kubectl describe ibmvpccluster
Name:         ibm-vpc-0
Namespace:    default
Labels:       cluster.x-k8s.io/cluster-name=ibm-vpc-0
Annotations:  <none>
API Version:  infrastructure.cluster.x-k8s.io/v1beta2
Kind:         IBMVPCCluster
Metadata:
  Creation Timestamp:  2025-07-21T08:08:33Z
  Finalizers:
    ibmvpccluster.infrastructure.cluster.x-k8s.io
  Generation:  2
  Owner References:
    API Version:           cluster.x-k8s.io/v1beta2
    Block Owner Deletion:  true
    Controller:            true
    Kind:                  Cluster
    Name:                  ibm-vpc-0
    UID:                   7c204a59-fa23-456f-926d-63ef8077a91d
  Resource Version:        11339
  UID:                     a30c762f-0ec6-422a-93ed-3b507aa5b09d
Spec:
  Control Plane Endpoint:
    Host:  46af173d-us-south.lb.appdomain.cloud
    Port:  6443
  Control Plane Load Balancer:
    Name:    ibm-vpc-0-load-balancer
    Public:  true
  Network:
    Control Plane Subnets:
      Name:  ibm-vpc-0-cp-subnet-0
      Zone:  us-south-1
      Name:  ibm-vpc-0-cp-subnet-1
      Zone:  us-south-2
    Load Balancers:
      Name:    ibm-vpc-0-lb-0
      Public:  true
      Name:    ibm-vpc-0-lb-subnet-1
      Public:  true
    Worker Subnets:
      Name:        ibm-vpc-0-worker-subnet-0
      Zone:        us-south-1
      Name:        ibm-vpc-0-worker-subnet-1
      Zone:        us-south-2
  Region:          us-south
  Resource Group:  ibm-hypershift-dev
  Vpc:             ibm-vpc-0
  Zone:            us-south-1
Status:
  Conditions:
    Last Transition Time:  2025-07-21T08:08:46Z
    Status:                True
    Type:                  ImageReady
    Last Transition Time:  2025-07-21T08:17:27Z
    Status:                True
    Type:                  LoadBalancerReady
    Last Transition Time:  2025-07-21T08:08:46Z
    Status:                True
    Type:                  VPCReady
    Last Transition Time:  2025-07-21T08:09:20Z
    Status:                True
    Type:                  VPCSecurityGroupReady
    Last Transition Time:  2025-07-21T08:09:20Z
    Status:                True
    Type:                  VPCSubnetReady
  Network:
    Control Plane Subnets:
      ibm-vpc-0-cp-subnet-0:
        Id:     0717-ae1c2bb8-4bfb-4de0-9761-8c7f7c5d340f
        Name:   ibm-vpc-0-cp-subnet-0
        Ready:  true
      ibm-vpc-0-cp-subnet-1:
        Id:     0727-79bce94e-45bd-4ca9-89f5-d1a2919e5613
        Name:   ibm-vpc-0-cp-subnet-1
        Ready:  true
    Load Balancers:
      r006-46af173d-6add-4a30-b731-2521891e3a90:
        Controller Created:  true
        Hostname:            46af173d-us-south.lb.appdomain.cloud
        Id:                  r006-46af173d-6add-4a30-b731-2521891e3a90
        State:               active
      r006-e865f2ce-652d-4a95-b60a-80b29f36432c:
        Controller Created:  true
        Hostname:            e865f2ce-us-south.lb.appdomain.cloud
        Id:                  r006-e865f2ce-652d-4a95-b60a-80b29f36432c
        State:               active
    Vpc:
      Id:     r006-947205f6-69dc-41a6-8240-8e52378bb1af
      Name:   ibm-vpc-0-vpc
      Ready:  true
    Worker Subnets:
      ibm-vpc-0-worker-subnet-0:
        Id:     0717-1644e90a-9914-4e29-a77c-42f0a659bf2b
        Name:   ibm-vpc-0-worker-subnet-0
        Ready:  true
      ibm-vpc-0-worker-subnet-1:
        Id:     0727-65b2dc68-61e4-4045-966b-99718cc2fe36
        Name:   ibm-vpc-0-worker-subnet-1
        Ready:  true
  Ready:        true
  Resource Group:
    Id:     08fe0ad0ec9b45aab2cb6d7a4d6817ba
    Name:   ibm-hypershift-dev
    Ready:  true
  v1beta2:
    Conditions:
      Last Transition Time:  2025-07-21T08:17:28Z
      Message:
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  Ready
      Last Transition Time:  2025-07-21T08:17:27Z
      Message:
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  LoadBalancerReady
      Last Transition Time:  2025-07-21T08:08:46Z
      Message:
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  VPCImageReady
      Last Transition Time:  2025-07-21T08:08:46Z
      Message:
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  VPCReady
      Last Transition Time:  2025-07-21T08:09:20Z
      Message:
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  VPCSecurityGroupReady
      Last Transition Time:  2025-07-21T08:09:20Z
      Message:
      Observed Generation:   2
      Reason:                Ready
      Status:                True
      Type:                  VPCSubnetReady
      Last Transition Time:  2025-07-21T08:08:33Z
      Message:
      Observed Generation:   1
      Reason:                NotPaused
      Status:                False
      Type:                  Paused
Events:                      <none>

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 21, 2025
@Amulyam24 Amulyam24 force-pushed the vpc-v1beta2 branch 2 times, most recently from 6f1c5a3 to 4461050 Compare July 22, 2025 07:19
Karthik-K-N
Karthik-K-N reviewed Jul 22, 2025
View reviewed changes
@Amulyam24 Amulyam24 requested a review from Karthik-K-N July 23, 2025 10:42
Karthik-K-N
Karthik-K-N reviewed Aug 5, 2025
View reviewed changes
Copy link
Contributor

@Karthik-K-N Karthik-K-N left a comment

Choose a reason for hiding this comment

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

Thank you.
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 5, 2025
Prajyot-Parab
Prajyot-Parab approved these changes Aug 8, 2025
View reviewed changes
Copy link
Contributor

@Prajyot-Parab Prajyot-Parab left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Amulyam24, Prajyot-Parab

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 8, 2025
@k8s-ci-robot k8s-ci-robot merged commit e46c661 into kubernetes-sigs:main Aug 8, 2025
14 checks passed
@Karthik-K-N Karthik-K-N mentioned this pull request Aug 22, 2025
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Prajyot-Parab Prajyot-Parab Prajyot-Parab approved these changes

@mkumatag mkumatag Awaiting requested review from mkumatag

+1 more reviewer

@Karthik-K-N Karthik-K-N Karthik-K-N left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@Karthik-K-N Karthik-K-N

@Prajyot-Parab Prajyot-Parab

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/ibmcloud Issues or PRs related to ibmcloud provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Amulyam24 @k8s-ci-robot @Karthik-K-N @Prajyot-Parab