Skip to content

Commit

Permalink
testing
Browse files Browse the repository at this point in the history
  • Loading branch information
morga471 committed Feb 12, 2025
1 parent aabf1a5 commit 39de87a
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions lab/_envcommon/default-versions.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ locals {
#####################
cluster_version = "1.31"
custom_service_eks_account = "${local.release_version}"
eks_module_version = "20.31.1"
eks_module_version = "20.33.1"
istio_ingress_version = "${local.release_version}"
release_version = "0.1.1"
release_version = "main"

#####################
# TF Providers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include "root" {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=no-kubectl"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include "root" {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=main"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include "root" {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=main"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ include "root" {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=${include.root.inputs.release_version}"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=taints"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
}
}

inputs = {
cluster_endpoint_public_access = include.root.inputs.cluster_endpoint_public_access
cluster_name = include.root.inputs.cluster_name
cluster_version = include.root.inputs.cluster_version
creator = include.root.inputs.creator
eks_instance_disk_size = include.root.inputs.eks_instance_disk_size
eks_ng_desired_size = include.root.inputs.eks_ng_desired_size
eks_ng_max_size = include.root.inputs.eks_ng_max_size
eks_ng_min_size = include.root.inputs.eks_ng_min_size
eks_vpc_name = include.root.inputs.vpc_name
enable_cluster_creator_admin_permissions = include.root.inputs.enable_cluster_creator_admin_permissions
environment_abbr = include.root.inputs.environment_abbr
tags = include.root.inputs.tags
vpc_name = include.root.inputs.vpc_name
}
# inputs = {
# cluster_endpoint_public_access = include.root.inputs.cluster_endpoint_public_access
# cluster_name = include.root.inputs.cluster_name
# cluster_version = include.root.inputs.cluster_version
# creator = include.root.inputs.creator
# eks_instance_disk_size = include.root.inputs.eks_instance_disk_size
# eks_ng_desired_size = include.root.inputs.eks_ng_desired_size
# eks_ng_max_size = include.root.inputs.eks_ng_max_size
# eks_ng_min_size = include.root.inputs.eks_ng_min_size
# eks_vpc_name = include.root.inputs.vpc_name
# enable_cluster_creator_admin_permissions = include.root.inputs.enable_cluster_creator_admin_permissions
# environment_abbr = include.root.inputs.environment_abbr
# tags = include.root.inputs.tags
# vpc_name = include.root.inputs.vpc_name
# }

0 comments on commit 39de87a

Please sign in to comment.