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.

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

rename oidc outputs #170

Merged
merged 5 commits into from
Feb 9, 2021
Merged

rename oidc outputs #170

merged 5 commits into from
Feb 9, 2021

Conversation

ettiee
Copy link
Contributor

@ettiee ettiee commented Dec 8, 2020

Replaces #169

@github-actions
Copy link

github-actions bot commented Dec 8, 2020

terraform fmt Failed

./modules/asg_node_group/main.tf
     }
 
     instances_distribution {
-      on_demand_base_capacity                  = 0
-      on_demand_percentage_above_base_capacity = (var.instance_lifecycle == "on_demand" ? 100 : 0)
-      spot_allocation_strategy                 = var.spot_allocation_strategy
-      spot_instance_pools                      = max(floor(length(local.instance_types) / 2), 2)
+      on_demand_base_capacity = 0
+      on_demand_percentage_above_base_capacity = (var.instance_lifecycle == "on_demand" ? 100 : 0
+      ) spot_allocation_strategy = var.spot_allocation_strategy
+      spot_instance_pools        = max(floor(length(local.instance_types) / 2), 2)
     }
   }
 
./modules/cluster/addons.tf
 }
 
 locals {
-  dns_cluster_ip = length(var.dns_cluster_ip) > 0 ? var.dns_cluster_ip : (split(".", data.aws_vpc.network.cidr_block)[0] == "10" ? "172.20.0.10" : "10.100.0.10")
-}
+  dns_cluster_ip = length(var.dns_cluster_ip) > 0 ? var.dns_cluster_ip : (split(".", data.aws_vpc.network.cidr_block)[0] == "10" ? "172.20.0.10" : "10.100.0.10"
+) }
 
 module "coredns" {
   source = "./kubectl"

Workflow: .github/workflows/ci.yml, Action: hashicorpterraform-github-actions1, Working Directory: ., Workspace: default

@ettiee ettiee mentioned this pull request Dec 8, 2020
@errm
Copy link
Member

errm commented Dec 10, 2020

I should have fixed the linting issue on master ... if you rebase everything should be green!

@ettiee
Copy link
Contributor Author

ettiee commented Feb 8, 2021

@dan-slinky-ckpd @aidy can you take a 👀 on this check you're happy for the stable 1.18 cut - it's a breaking configuration change (very minor) for teams upgrading

Copy link
Contributor

@aidy aidy left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@dan-slinky-ckpd dan-slinky-ckpd left a comment

Choose a reason for hiding this comment

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

LGTM. Lets get an update to https://github.com/cookpad/terraform-aws-eks/blob/master/UPGRADING.md asap though, so we don't forget.

@ettiee ettiee merged commit cf551e0 into master Feb 9, 2021
@errm errm deleted the fix-oidc-output-name branch August 16, 2021 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants