Skip to content

Commit

Permalink
Remove discontinued sub module for shared manifests (#1617)
Browse files Browse the repository at this point in the history
  • Loading branch information
avnes authored Nov 11, 2024
1 parent 6062f69 commit 2d139c4
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 271 deletions.
56 changes: 0 additions & 56 deletions _sub/compute/k8s-shared-manifests/main.tf

This file was deleted.

60 changes: 0 additions & 60 deletions _sub/compute/k8s-shared-manifests/values/shared-manifests.yaml

This file was deleted.

53 changes: 0 additions & 53 deletions _sub/compute/k8s-shared-manifests/vars.tf

This file was deleted.

18 changes: 0 additions & 18 deletions _sub/compute/k8s-shared-manifests/versions.tf

This file was deleted.

18 changes: 0 additions & 18 deletions _sub/compute/k8s-shared-manifests/versions.tofu

This file was deleted.

3 changes: 1 addition & 2 deletions compute/k8s-services/dependencies.tf
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,5 @@ locals {
# --------------------------------------------------

locals {
fluxcd_apps_repo_url = "${var.fluxcd_apps_git_provider_url}${var.fluxcd_apps_repo_owner}/${var.fluxcd_apps_repo_name}"
shared_manifests_repo_url = "ssh://git@github.com/${var.shared_manifests_repo_owner}/${var.shared_manifests_repo_name}.git"
fluxcd_apps_repo_url = "${var.fluxcd_apps_git_provider_url}${var.fluxcd_apps_repo_owner}/${var.fluxcd_apps_repo_name}"
}
27 changes: 0 additions & 27 deletions compute/k8s-services/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -1005,30 +1005,3 @@ module "trivy_operator" {
module.platform_fluxcd
]
}

# --------------------------------------------------
# Flux CD in a shared responsibility model with
# other platform teams
# --------------------------------------------------

module "shared_manifests" {
source = "../../_sub/compute/k8s-shared-manifests"
count = var.shared_manifests_deploy ? 1 : 0
cluster_name = var.eks_cluster_name
overlay_folder = var.shared_manifests_overlay_folder
repo_owner = var.fluxcd_bootstrap_repo_owner
repo_name = var.fluxcd_bootstrap_repo_name
repo_branch = var.fluxcd_bootstrap_repo_branch
overwrite_on_create = var.fluxcd_bootstrap_overwrite_on_create
shared_manifests_repo_url = local.shared_manifests_repo_url
shared_manifests_repo_branch = var.shared_manifests_repo_branch
shared_manifests_repo_name = var.shared_manifests_repo_name

providers = {
github = github.fluxcd
}

depends_on = [
module.platform_fluxcd
]
}
39 changes: 2 additions & 37 deletions compute/k8s-services/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -449,12 +449,12 @@ variable "fluxcd_tenants" {
type = list(object({
namespace = string
repositories = list(object({
url = string
url = string
branch = string
}))
}))
description = "List of tenants' namespaces and repository URLs"
default = []
default = []
}

# --------------------------------------------------
Expand Down Expand Up @@ -1265,41 +1265,6 @@ variable "ssm_param_createdby" {
default = null
}

# --------------------------------------------------
# Flux CD in a shared responsibility model with
# other platform teams
# --------------------------------------------------

variable "shared_manifests_repo_name" {
type = string
default = ""
description = "The repo name for your GitOps manifests"
}

variable "shared_manifests_repo_branch" {
type = string
default = "main"
description = "The default branch for your GitOps manifests"
}

variable "shared_manifests_repo_owner" {
type = string
default = "main"
description = "The repo owner for your GitOps manifests"
}

variable "shared_manifests_deploy" {
type = bool
description = "Deploy Flux manifests from a shared responsibily repo"
default = false
}

variable "shared_manifests_overlay_folder" {
type = string
description = "Which overlay folder to deploy"
default = "production"
}

# --------------------------------------------------
# Apache Druid Operator
# --------------------------------------------------
Expand Down

0 comments on commit 2d139c4

Please sign in to comment.