-
Notifications
You must be signed in to change notification settings - Fork 48
WIP: feat: updates for 1.76.3, update PER DCs and update deprecated apis #546
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.
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
base: main
Are you sure you want to change the base?
WIP: feat: updates for 1.76.3, update PER DCs and update deprecated apis #546
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: prb112 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@prb112: PR is not mergeable. The PR state is: behind 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
Outdated
| # PER doc reference: https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-per | ||
| is_per = contains(["dal10", "dal12", "fra04", "fra05", "wdc06", "wdc07", "mad02", "mad04", "sao01", "sao04"], var.ibmcloud_zone) | ||
| # PER doc reference: https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-per#dcs-per | ||
| is_per = contains(["dal10", "dal12", "dal13", "dal14", "fra04", "fra05", "lon04", "lon06", "mad02", "mad04", "osa21", "sao01", "sao04", "syd04", "syd05", "tok04", "tor01", "wdc04", "wdc06", "wdc07"], var.ibmcloud_zone) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update the Zones to match the latest ones
| is_per = contains(["dal10", "dal12", "dal13", "dal14", "fra04", "fra05", "lon04", "lon06", "mad02", "mad04", "osa21", "sao01", "sao04", "syd04", "syd05", "tok04", "tor01", "wdc04", "wdc06", "wdc07"], var.ibmcloud_zone) | ||
| create_cloud_connection = var.use_ibm_cloud_services && var.ibm_cloud_connection_name == "" && !local.is_per | ||
| tgw_network = module.prepare.cloud_connection_name == "" ? data.ibm_pi_workspace.workspace.pi_workspace_details.crn : module.prepare.cloud_connection_name | ||
| tgw_network = module.prepare.cloud_connection_name == "" ? data.ibm_pi_workspace.workspace.pi_workspace_details[0].crn : module.prepare.cloud_connection_name |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pi_workspace_details is returned as a list, so we pick the first one.
modules/1_prepare/versions.tf
Outdated
| ibm = { | ||
| source = "IBM-Cloud/ibm" | ||
| version = "1.60.0" | ||
| version = "1.76.2" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update versions to v1.76.2
| } | ||
|
|
||
| resource "ibm_pi_network_port" "bastion_vip" { | ||
| resource "ibm_pi_network_interface" "bastion_vip" { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ibm_pi_network_port was replaced with ibm_pi_network_interface
| 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 : "" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will be a problem in ssh command output, DNS host entries, wildcard DNS. Somehow can we get the public IP from network?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
2c6f428 to
785c435
Compare
77bb098 to
4f2abf4
Compare
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
…Cloud/terraform-provider-ibm [v1.76.3] Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
…ublic network Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
4f2abf4 to
1c7cd76
Compare
…he internal dns Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
1.76.2 is needed due to CIS changes which cause a NIL pointer and are addressed in this release.