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

fix: Pin module version used for addon #49

Closed
wants to merge 2 commits into from
Closed

fix: Pin module version used for addon #49

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e941d2
fix: Temporarily re-add internal cyclical dependencies
bryantbiggs Jun 5, 2023
ec6da83
Apply suggestions from code review
bryantbiggs Jun 6, 2023
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
9 changes: 4 additions & 5 deletions blueprints/getting-started/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ locals {

tags = {
Blueprint = local.name
GithubRepo = "github.com/aws-ia/terraform-aws-eks-blueprints"
GithubRepo = "github.com/sysdiglabs/terraform-eksblueprints-sysdig-addon"
}
}

Expand Down Expand Up @@ -48,7 +48,7 @@ data "aws_availability_zones" "available" {}

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 3.0"
version = "~> 5.0"

name = local.name
cidr = local.vpc_cidr
Expand Down Expand Up @@ -87,7 +87,7 @@ module "vpc" {
#---------------------------------------------------------------

module "eks_blueprints" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints"
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.32.0"

cluster_name = local.cluster_name
cluster_version = "1.23"
Expand Down Expand Up @@ -126,7 +126,7 @@ module "eks_blueprints" {
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.32.0"

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
Expand All @@ -147,7 +147,6 @@ module "eks_blueprints_kubernetes_addons" {
enable_sysdig_agent = true

sysdig_agent_helm_config = {

namespace = "sysdig-agent"

values = [templatefile("${path.module}/values-sysdig.yaml", {
Expand Down
8 changes: 4 additions & 4 deletions blueprints/lab-security/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ locals {

tags = {
Blueprint = local.name
GithubRepo = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.21.0"
GithubRepo = "github.com/sysdiglabs/terraform-eksblueprints-sysdig-addon"
}
}

Expand Down Expand Up @@ -48,7 +48,7 @@ data "aws_availability_zones" "available" {}

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 3.0"
version = "~> 5.0"

name = local.name
cidr = local.vpc_cidr
Expand Down Expand Up @@ -87,7 +87,7 @@ module "vpc" {
#---------------------------------------------------------------

module "eks_blueprints" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.21.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.32.0"

cluster_name = local.cluster_name
cluster_version = "1.23"
Expand Down Expand Up @@ -126,7 +126,7 @@ module "eks_blueprints" {
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.21.0//modules/kubernetes-addons"
source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons?ref=v4.32.0"
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
Expand Down
8 changes: 4 additions & 4 deletions blueprints/monitor-alerts/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ locals {

tags = {
Blueprint = local.name
GithubRepo = "github.com/aws-ia/terraform-aws-eks-blueprint?ref=v4.21.0"
GithubRepo = "github.com/sysdiglabs/terraform-eksblueprints-sysdig-addon"
}
}

Expand Down Expand Up @@ -54,7 +54,7 @@ data "aws_availability_zones" "available" {}

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 3.0"
version = "~> 5.0"

name = local.name
cidr = local.vpc_cidr
Expand Down Expand Up @@ -93,7 +93,7 @@ module "vpc" {
#---------------------------------------------------------------

module "eks_blueprints" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.21.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.32.0"

cluster_name = local.cluster_name
cluster_version = "1.23"
Expand Down Expand Up @@ -132,7 +132,7 @@ module "eks_blueprints" {
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.21.0//modules/kubernetes-addons"
source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons?ref=v4.32.0"
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
Expand Down
2 changes: 1 addition & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Helm addon
module "helm_addon" {
#Change before publishing
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.0"

addon_context = var.addon_context
set_values = local.set_values
Expand Down