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

fix: remove terraform version constraints from the agents DA variation #200

Merged
merged 3 commits into from
Sep 29, 2024
Merged

fix: remove terraform version constraints from the agents DA variation #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb5c669
chore(deps): update terraform github.com/terraform-ibm-modules/terraf…
terraform-ibm-modules-ops Sep 29, 2024
82b85ca
updates
ocofaigh Sep 29, 2024
4dabf4f
fix test
ocofaigh Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion solutions/agents/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.3.0, <1.7.0"
required_version = ">= 1.3.0"

required_providers {
# Lock DA into an exact provider version - renovate automation will keep it updated
Expand Down
5 changes: 4 additions & 1 deletion tests/resources/existing-resources/agents/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@ module "resource_group" {
##############################################################################

module "landing_zone" {
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks//module?ref=v5.33.0"
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks//module?ref=v6.0.3"
region = var.region
prefix = var.prefix
tags = var.resource_tags
add_atracker_route = false
enable_transit_gateway = false
# GHA runtime has no access to private
verify_cluster_network_readiness = false
use_ibm_cloud_private_api_endpoints = false
}

##############################################################################
Expand Down
6 changes: 3 additions & 3 deletions tests/resources/existing-resources/agents/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ output "cluster_data" {
}

output "workload_cluster_id" {
value = lookup([for cluster in module.landing_zone.cluster_data : cluster if strcontains(cluster.resource_group_name, "workload")][0], "id", "")
value = module.landing_zone.workload_cluster_id
description = "ID of the workload cluster."
}

output "workload_cluster_name" {
value = [for cluster_name in module.landing_zone.cluster_names : cluster_name if strcontains(cluster_name, "workload")][0]
value = module.landing_zone.workload_cluster_name
description = "Name of the workload cluster."
}

output "cluster_resource_group_id" {
value = lookup([for cluster in module.landing_zone.cluster_data : cluster if strcontains(cluster.resource_group_name, "workload")][0], "resource_group_id", "")
value = module.landing_zone.cluster_data["${var.prefix}-workload-cluster"].resource_group_id
description = "Resource group ID of the workload cluster."
}