feat: updates for 1.80.4, update PER DCs and update deprecated apis #546

prb112 · 2025-03-20T12:14:02Z

1.80.4 is needed due to CIS changes which cause a NIL pointer and are addressed in this release.

ppc64le-cloud-bot · 2025-03-20T12:14:06Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: prb112
Once this PR has been reviewed and has the lgtm label, please assign yussufsh for approval. For more information see the Kubernetes Code Review Process.

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

Details

Needs approval from an approver in each of these files:

OWNERS

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

ppc64le-cloud-bot · 2025-03-20T12:14:11Z

@prb112: PR is not mergeable.

Details

The PR state is: blocked

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

ocp.tf

modules/1_prepare/versions.tf

prb112 · 2025-03-20T12:16:45Z

modules/1_prepare/prepare.tf

 }

-resource "ibm_pi_network_port" "bastion_vip" {
+resource "ibm_pi_network_interface" "bastion_vip" {


ibm_pi_network_port was replaced with ibm_pi_network_interface

yussufsh · 2025-03-20T16:08:36Z

modules/1_prepare/outputs.tf

 output "bastion_external_vip" {
  depends_on = [null_resource.bastion_init]
-  value      = local.bastion_count > 1 ? ibm_pi_network_port.bastion_internal_vip[0].public_ip : ""
+  value      = local.bastion_count > 1 ? ibm_pi_network_interface.bastion_internal_vip[0].ip_address : ""


This will be a problem in ssh command output, DNS host entries, wildcard DNS. Somehow can we get the public IP from network?

Hey @yussufsh

I looked at the terraform-provider-ibm, it's unclear if this is the public IP address. Further looking into the api, it's not clear the API network, instance et cetra is suitable for returning the public ip (I anticipate they built it for VPC entry into the PowerVS workspace).

I'll have to experiment it a bit. I'll do that on Monday.

Thanks,

Paul

Hey Yussuf, still not clear on the replacement.

Could we loop over the public interface IPs to fetch the public VIP? Prefetch the IPs in the order and replace the ip_address at that index.

prb112 · 2025-04-23T15:34:21Z

CI picked this branch up and built a cluster successfully - https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs/periodic-ci-openshift-multiarch-master-nightly-4.18-ocp-e2e-powervs-ovn-multi-p-px/1914914717416034304/artifacts/ocp-e2e-powervs-ovn-multi-p-px/upi-install-powervs-cluster/build-log.txt

added the case where the image is pulled from the catalog Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

prb112 · 2025-12-23T17:34:37Z

modules/1_prepare/prepare.tf

+  }
+  provisioner "remote-exec" {
+    inline = [
+      "sudo timedatectl set-timezone UTC",


In certain circumstances, the images used are not configured with UTC, however the coreos nodes default to UTC. If Sydney, Chennai or other locations before UTC are used the certificates are evaluated as After when they should be in sync.

Looks like this should be set by default for every install.
We can directly set it during bastion setup without a variable or new resource.

modules/1_prepare/prepare.tf

prb112 · 2025-12-23T17:36:00Z

modules/1_prepare/prepare.tf

+  pi_volume_type       = local.bastion_storage_type == "" && local.bastion_storage_pool == "" ? "tier3" : local.bastion_storage_type
  pi_volume_shareable  = var.volume_shareable
  pi_cloud_instance_id = var.service_instance_id
 }

 resource "ibm_pi_instance" "bastion" {
  count = local.bastion_count

  pi_memory            = var.bastion["memory"]
  pi_processors        = var.bastion["processors"]
  pi_instance_name     = "${var.name_prefix}bastion-${count.index}"
  pi_proc_type         = var.processor_type
  pi_image_id          = local.bastion_image_id
  pi_key_pair_name     = ibm_pi_key.key.name
  pi_sys_type          = var.system_type
  pi_cloud_instance_id = var.service_instance_id
  pi_health_status     = var.bastion_health_status
  pi_volume_ids        = var.storage_type == "nfs" ? ibm_pi_volume.volume.*.volume_id : null
  pi_storage_pool      = local.bastion_storage_pool
-  pi_storage_type      = local.bastion_storage_type
+  pi_storage_type      = local.bastion_storage_type == "" && local.bastion_storage_pool == "" ? "tier3" : local.bastion_storage_type


Sets the default when using the catalog image.

Can we set it above in locals instead of here?

ppc64le-cloud-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 20, 2025

ppc64le-cloud-bot requested review from sajauddin and yussufsh March 20, 2025 12:14

ppc64le-cloud-bot added the do-not-merge/non-mergeable label Mar 20, 2025

ppc64le-cloud-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 20, 2025

prb112 commented Mar 20, 2025

View reviewed changes

ocp.tf Outdated Show resolved Hide resolved

prb112 commented Mar 20, 2025

View reviewed changes

ocp.tf Show resolved Hide resolved

prb112 commented Mar 20, 2025

View reviewed changes

modules/1_prepare/versions.tf Outdated Show resolved Hide resolved

prb112 commented Mar 20, 2025

View reviewed changes

yussufsh reviewed Mar 20, 2025

View reviewed changes

prb112 changed the title ~~WIP: feat: updates for 1.76.2, update PER DCs and update deprecated apis~~ WIP: feat: updates for 1.76.3, update PER DCs and update deprecated apis Mar 26, 2025

prb112 force-pushed the terraform-1.76.2-updates branch from 2c6f428 to 785c435 Compare March 26, 2025 12:57

ppc64le-cloud-bot added the do-not-merge/contains-merge-commits label Apr 23, 2025

prb112 force-pushed the terraform-1.76.2-updates branch 2 times, most recently from 77bb098 to 4f2abf4 Compare April 23, 2025 15:42

ppc64le-cloud-bot removed the do-not-merge/contains-merge-commits label Apr 23, 2025

prb112 force-pushed the terraform-1.76.2-updates branch from 4f2abf4 to 1c7cd76 Compare April 23, 2025 15:43

ppc64le-cloud-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 4, 2025

prb112 changed the title ~~WIP: feat: updates for 1.76.3, update PER DCs and update deprecated apis~~ feat: updates for 1.76.3, update PER DCs and update deprecated apis Nov 24, 2025

ppc64le-cloud-bot added do-not-merge/contains-merge-commits and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Nov 24, 2025

prb112 force-pushed the terraform-1.76.2-updates branch from 0712718 to 043463a Compare November 24, 2025 19:11

ppc64le-cloud-bot removed the do-not-merge/contains-merge-commits label Nov 24, 2025

prb112 force-pushed the terraform-1.76.2-updates branch from 043463a to 599b04b Compare November 24, 2025 19:11

prb112 changed the title ~~feat: updates for 1.76.3, update PER DCs and update deprecated apis~~ feat: updates for 1.80.4, update PER DCs and update deprecated apis Nov 24, 2025

prb112 force-pushed the terraform-1.76.2-updates branch from 599b04b to 0ff846b Compare November 24, 2025 19:16

prb112 force-pushed the terraform-1.76.2-updates branch 2 times, most recently from cbbfb14 to 08cfbd9 Compare November 27, 2025 11:28

prb112 force-pushed the terraform-1.76.2-updates branch 2 times, most recently from 499d606 to b1fe4eb Compare December 10, 2025 20:45

feat: updates for 1.80.4, update PER DCs and update deprecated apis

39c68d8

added the case where the image is pulled from the catalog Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

prb112 force-pushed the terraform-1.76.2-updates branch from b1fe4eb to 39c68d8 Compare December 22, 2025 15:43

prb112 commented Dec 23, 2025

View reviewed changes

modules/1_prepare/prepare.tf Show resolved Hide resolved

prb112 commented Dec 23, 2025

View reviewed changes

feat: updates for 1.80.4, update PER DCs and update deprecated apis #546

Are you sure you want to change the base?

feat: updates for 1.80.4, update PER DCs and update deprecated apis #546

Uh oh!

Conversation

prb112 commented Mar 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ppc64le-cloud-bot commented Mar 20, 2025

Uh oh!

ppc64le-cloud-bot commented Mar 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

prb112 commented Apr 23, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

prb112 commented Mar 20, 2025 •

edited

Loading

ppc64le-cloud-bot commented Mar 20, 2025 •

edited

Loading