Skip to content

Commit

Permalink
initial
Browse files Browse the repository at this point in the history
  • Loading branch information
morga471 committed Jul 30, 2024
1 parent 4e17c06 commit a052a06
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 10 deletions.
7 changes: 5 additions & 2 deletions copy_images.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ locals {
}

module "images" {
source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=2.0.2"
source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=tf-upgrade"

profile = var.profile
application_name = var.cluster_name
Expand All @@ -42,5 +42,8 @@ module "images" {
## region = ""
## source_password = ""
## source_username = ""
}

enable_lifecycle_policy = true
lifecycle_policy_all = true
force_delete = true
}
11 changes: 5 additions & 6 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,13 @@ data "kubernetes_namespace" "keycloak" {
}

module "service_account" {
#source = "git@github.it.census.gov:SOA/tfmod-config-job.git//service-account?ref=1.0.0"
source = "git@github.it.census.gov:SOA/tfmod-config-job.git//service-account"
source = "git@github.it.census.gov:SCT-Engineering/tfmod-config-job.git//service-account"

namespace = local.ns
}

module "preinstall" {
#source = "git@github.it.census.gov:SOA/tfmod-config-job.git//config-job?ref=1.0.0"
source = "git@github.it.census.gov:SOA/tfmod-config-job.git//config-job"
source = "git@github.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job"

namespace = local.ns
service_account_name = module.service_account.service_account_name
Expand All @@ -88,6 +86,7 @@ module "preinstall" {
}

resource "helm_release" "kiali-operator" {
depends_on = [module.image]
chart = "kiali-operator"
version = var.kiali_operator_version
name = "kiali-operator"
Expand Down Expand Up @@ -118,6 +117,7 @@ resource "helm_release" "kiali-operator" {

resource "helm_release" "kiali" {
depends_on = [
module.image,
helm_release.kiali-operator,
module.preinstall,
]
Expand Down Expand Up @@ -209,8 +209,7 @@ resource "helm_release" "kiali" {
module "kiali_ingress" {
depends_on = [helm_release.kiali]

#source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//>ref=1.0.0"
source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//"
source = "git@github.it.census.gov:SCT-Engineering/tfmod-gogatekeeper.git//"

certificate_issuer = var.certificate_issuer

Expand Down
14 changes: 14 additions & 0 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,17 @@ output "internal_endpoint" {
url = local.internal_url
}
}

################################################################################
# Module information
################################################################################

output "module_name" {
description = "The name of this module."
value = local._module_name
}

output "module_version" {
description = "The version of this module."
value = local._module_version
}
3 changes: 1 addition & 2 deletions version.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
locals {
_module_name = "tfmod-kiali"
_module_version = "0.0.1"
_module_providers = ["helm", "kubernetes"]
_module_version = "0.0.2"
}

0 comments on commit a052a06

Please sign in to comment.