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

Jump to bottom

feat: Add Sysdig addon #1079

Merged
merged 15 commits into from
Oct 25, 2022
Merged

feat: Add Sysdig addon #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0ca42ea
Added sysdig-addon entry for testing purposes
manuelbcd Sep 8, 2022
816f3fa
Fixed main.tf enable_sysdig_agent var
manuelbcd Sep 9, 2022
cb7df7c
Added version 0.0.1 to the configuration
manuelbcd Sep 11, 2022
0f6fd31
Added entry to kubernetes-addons/variables.tf
manuelbcd Sep 14, 2022
3962a39
Merge branch 'aws-ia:main' into main
manuelbcd Oct 11, 2022
a03151a
Update main.tf
manuelbcd Oct 11, 2022
a761018
Update variables.tf
manuelbcd Oct 11, 2022
46ce89f
Merge branch 'aws-ia:main' into main
manuelbcd Oct 17, 2022
43966c1
Merge branch 'aws-ia:main' into main
manuelbcd Oct 20, 2022
a0881d1
Merge pull request #1 from cloudsecurelab/main
manuelbcd Oct 20, 2022
d99b18d
Update main.tf
manuelbcd Oct 20, 2022
4749d60
Update modules/kubernetes-addons/variables.tf
manuelbcd Oct 24, 2022
4e41f1a
Merge branch 'main' into main
manuelbcd Oct 24, 2022
523333c
Merge branch 'main' of github.com:aws-ia/terraform-aws-eks-blueprints
bryantbiggs Oct 25, 2022
94a5c3f
chore: Fix formatting
bryantbiggs Oct 25, 2022
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
3 changes: 3 additions & 0 deletions modules/kubernetes-addons/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
| <a name="module_smb_csi_driver"></a> [smb\_csi\_driver](#module\_smb\_csi\_driver) | ./smb-csi-driver | n/a |
| <a name="module_spark_history_server"></a> [spark\_history\_server](#module\_spark\_history\_server) | ./spark-history-server | n/a |
| <a name="module_spark_k8s_operator"></a> [spark\_k8s\_operator](#module\_spark\_k8s\_operator) | ./spark-k8s-operator | n/a |
| <a name="module_sysdig_agent"></a> [sysdig\_agent](#module\_sysdig\_agent) | sysdiglabs/sysdig-addon/eksblueprints | 0.0.1 |
| <a name="module_tetrate_istio"></a> [tetrate\_istio](#module\_tetrate\_istio) | ./tetrate-istio | n/a |
| <a name="module_traefik"></a> [traefik](#module\_traefik) | ./traefik | n/a |
| <a name="module_vault"></a> [vault](#module\_vault) | hashicorp/hashicorp-vault-eks-addon/aws | 1.0.0-rc2 |
Expand Down Expand Up @@ -220,6 +221,7 @@
| <a name="input_enable_smb_csi_driver"></a> [enable\_smb\_csi\_driver](#input\_enable\_smb\_csi\_driver) | Enable SMB CSI driver add-on | `bool` | `false` | no |
| <a name="input_enable_spark_history_server"></a> [enable\_spark\_history\_server](#input\_enable\_spark\_history\_server) | Enable Spark History Server add-on | `bool` | `false` | no |
| <a name="input_enable_spark_k8s_operator"></a> [enable\_spark\_k8s\_operator](#input\_enable\_spark\_k8s\_operator) | Enable Spark on K8s Operator add-on | `bool` | `false` | no |
| <a name="input_enable_sysdig_agent"></a> [enable\_sysdig\_agent](#input\_enable\_sysdig\_agent) | Enable Sysdig Agent add-on | `bool` | `false` | no |
| <a name="input_enable_tetrate_istio"></a> [enable\_tetrate\_istio](#input\_enable\_tetrate\_istio) | Enable Tetrate Istio add-on | `bool` | `false` | no |
| <a name="input_enable_traefik"></a> [enable\_traefik](#input\_enable\_traefik) | Enable Traefik add-on | `bool` | `false` | no |
| <a name="input_enable_vault"></a> [enable\_vault](#input\_enable\_vault) | Enable HashiCorp Vault add-on | `bool` | `false` | no |
Expand Down Expand Up @@ -279,6 +281,7 @@
| <a name="input_spark_history_server_irsa_policies"></a> [spark\_history\_server\_irsa\_policies](#input\_spark\_history\_server\_irsa\_policies) | Additional IAM policies for a IAM role for service accounts | `list(string)` | `[]` | no |
| <a name="input_spark_history_server_s3a_path"></a> [spark\_history\_server\_s3a\_path](#input\_spark\_history\_server\_s3a\_path) | s3a path with prefix for Spark history server e.g., s3a://<bucket\_name>/<spark\_event\_logs> | `string` | `""` | no |
| <a name="input_spark_k8s_operator_helm_config"></a> [spark\_k8s\_operator\_helm\_config](#input\_spark\_k8s\_operator\_helm\_config) | Spark on K8s Operator Helm Chart config | `any` | `{}` | no |
| <a name="input_sysdig_agent_helm_config"></a> [sysdig\_agent\_helm\_config](#input\_sysdig\_agent\_helm\_config) | Sysdig Helm Chart config | `any` | `{}` | no |
| <a name="input_tags"></a> [tags](#input\_tags) | Additional tags (e.g. `map('BusinessUnit`,`XYZ`) | `map(string)` | `{}` | no |
| <a name="input_tetrate_istio_base_helm_config"></a> [tetrate\_istio\_base\_helm\_config](#input\_tetrate\_istio\_base\_helm\_config) | Istio `base` Helm Chart config | `any` | `{}` | no |
| <a name="input_tetrate_istio_cni_helm_config"></a> [tetrate\_istio\_cni\_helm\_config](#input\_tetrate\_istio\_cni\_helm\_config) | Istio `cni` Helm Chart config | `any` | `{}` | no |
Expand Down
9 changes: 9 additions & 0 deletions modules/kubernetes-addons/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,15 @@ module "spark_k8s_operator" {
addon_context = local.addon_context
}

module "sysdig_agent" {
source = "sysdiglabs/sysdig-addon/eksblueprints"
version = "0.0.1"

count = var.enable_sysdig_agent ? 1 : 0
helm_config = var.sysdig_agent_helm_config
addon_context = local.addon_context
}

module "tetrate_istio" {
# source = "tetratelabs/tetrate-istio-addon/eksblueprints"
# version = "0.0.7"
Expand Down
13 changes: 13 additions & 0 deletions modules/kubernetes-addons/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,19 @@ variable "metrics_server_helm_config" {
default = {}
}

#-----------SYSDIG-------------
variable "enable_sysdig_agent" {
description = "Enable Sysdig Agent add-on"
type = bool
default = false
}

variable "sysdig_agent_helm_config" {
description = "Sysdig Helm Chart config"
type = any
default = {}
}

#-----------TETRATE ISTIO-------------
variable "enable_tetrate_istio" {
description = "Enable Tetrate Istio add-on"
Expand Down
4 changes: 2 additions & 2 deletions modules/launch-templates/templates/userdata-windows.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ $dockerdataredirect = @'
$daemon_file = "C:\ProgramData\docker\config\daemon.json"
$directory = "D:\ProgramData\docker"
New-Item $directory -ItemType Directory
New-Item $daemon_file -ItemType File
New-Item $daemon_file -ItemType File
Add-Content $daemon_file $dockerdataredirect

Start-Service -Name "docker"
Start-Service -Name "docker"

# Bootstrap and join the cluster
[string]$EKSBinDir = "$env:ProgramFiles\Amazon\EKS"
Expand Down