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 docs templates #581

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Fix docs templates #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions docs/guides/mongodb_cluster_okta_idp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ locals {
# Set to true if you want a sidecar deployed with an
# internet-facing load balancer (requires a public subnet).
public_sidecar = false
# Set the desired sidecar version.
sidecar_version = "v4.7.0"

# Set the AWS region that the sidecar will be deployed to
region = ""
Expand Down Expand Up @@ -245,8 +243,6 @@ module "cyral_sidecar" {
# Use the module version that is compatible with your sidecar.
version = "~> 5.0"

sidecar_version = local.sidecar.sidecar_version

sidecar_id = cyral_sidecar.sidecar.id

control_plane = local.control_plane_host
Expand Down
5 changes: 0 additions & 5 deletions docs/guides/setup_cp_and_deploy_sidecar.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ locals {
# internet-facing load balancer (requires a public subnet).
public_sidecar = false

# Set the desired sidecar version.
sidecar_version = "v4.7.0"

# Set the AWS region that the sidecar will be deployed to
region = ""
# Set the ID of VPC that the sidecar will be deployed to
Expand Down Expand Up @@ -150,8 +147,6 @@ module "cyral_sidecar" {
# Use the module version that is compatible with your sidecar.
version = "~> 5.0"

sidecar_version = local.sidecar.sidecar_version

sidecar_id = cyral_sidecar.sidecar.id

control_plane = local.control_plane_host
Expand Down
10 changes: 0 additions & 10 deletions docs/guides/smart_ports.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ locals {
# internet-facing load balancer (requires a public subnet).
public_sidecar = false

# Set the desired sidecar version.
sidecar_version = "v4.7.0"

# Set the AWS region that the sidecar will be deployed to
region = ""
# Set the ID of VPC that the sidecar will be deployed to
Expand Down Expand Up @@ -307,8 +304,6 @@ module "cyral_sidecar" {
# Use the module version that is compatible with your sidecar.
version = "~> 5.0"

sidecar_version = local.sidecar.sidecar_version

sidecar_id = cyral_sidecar.sidecar.id

control_plane = local.control_plane_host
Expand Down Expand Up @@ -391,9 +386,6 @@ locals {
# internet-facing load balancer (requires a public subnet).
public_sidecar = false

# Set the desired sidecar version.
sidecar_version = "v4.7.0"

# Set the AWS region that the sidecar will be deployed to
region = ""
# Set the ID of VPC that the sidecar will be deployed to
Expand Down Expand Up @@ -561,8 +553,6 @@ module "cyral_sidecar" {
# Use the module version that is compatible with your sidecar.
version = "~> 5.0"

sidecar_version = local.sidecar.sidecar_version

sidecar_id = cyral_sidecar.sidecar.id

control_plane = local.control_plane_host
Expand Down
8 changes: 4 additions & 4 deletions examples/guides/iam_auth_rds_pg.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ module "cyral_sidecar" {
source = "cyralinc/sidecar-ec2/aws"

# Use the module version that is compatible with your sidecar.
version = "~> 4.3"
version = "~> 5.0"

sidecar_id = cyral_sidecar.sidecar.id
control_plane = local.control_plane_host
Expand All @@ -236,10 +236,10 @@ module "cyral_sidecar" {
load_balancer_scheme = local.sidecar.public_sidecar ? "internet-facing" : "internal"
associate_public_ip_address = local.sidecar.public_sidecar

sidecar_dns_hosted_zone_id = local.sidecar.dns_hosted_zone_id
sidecar_dns_name = local.sidecar.dns_name
dns_hosted_zone_id = local.sidecar.dns_hosted_zone_id
dns_name = local.sidecar.dns_name
}

output "sidecar_load_balancer_dns" {
value = module.cyral_sidecar.sidecar_load_balancer_dns
value = module.cyral_sidecar.load_balancer_dns
}
27 changes: 3 additions & 24 deletions examples/guides/mongodb_cluster/okta_idp_sidecar.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ locals {
# Set to true if you want a sidecar deployed with an
# internet-facing load balancer (requires a public subnet).
public_sidecar = false
# Set the desired sidecar version.
sidecar_version = "v4.7.0"

# Set the AWS region that the sidecar will be deployed to
region = ""
Expand All @@ -24,17 +22,6 @@ locals {
# Name of the CloudWatch log group used to push logs
cloudwatch_log_group_name = "cyral-example-loggroup"

# Set the parameters to access the private Cyral container
# registry. These parameters can be found in the sidecar
# Terraform template downloaded from the UI. Use the
# commented values to locate the variables and copy the
# values from the downloaded template.
container_registry = {
name = "" # container_registry
username = "" # container_registry_username
registry_key = "" # container_registry_key
}

# Specify the maximum number of nodes you expect this cluster to
# have, taking into consideration future growth. This number must be
# at least equal to the number of nodes currently in your
Expand Down Expand Up @@ -180,9 +167,7 @@ module "cyral_sidecar" {
source = "cyralinc/sidecar-ec2/aws"

# Use the module version that is compatible with your sidecar.
version = "~> 4.0"

sidecar_version = local.sidecar.sidecar_version
version = "~> 5.0"

sidecar_id = cyral_sidecar.sidecar.id

Expand All @@ -206,20 +191,14 @@ module "cyral_sidecar" {
load_balancer_scheme = local.sidecar.public_sidecar ? "internet-facing" : "internal"
associate_public_ip_address = local.sidecar.public_sidecar

deploy_secrets = true
secrets_location = "/cyral/sidecars/${cyral_sidecar.sidecar.id}/secrets"

container_registry = local.sidecar.container_registry.name
container_registry_username = local.sidecar.container_registry.username
container_registry_key = local.sidecar.container_registry.registry_key
client_id = cyral_sidecar_credentials.sidecar_credentials.client_id
client_secret = cyral_sidecar_credentials.sidecar_credentials.client_secret
}

output "sidecar_dns" {
value = module.cyral_sidecar.sidecar_dns
value = module.cyral_sidecar.dns
}

output "sidecar_load_balancer_dns" {
value = module.cyral_sidecar.sidecar_load_balancer_dns
value = module.cyral_sidecar.load_balancer_dns
}
9 changes: 4 additions & 5 deletions examples/guides/s3_browser_and_aws_cli.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ module "cyral_sidecar" {
source = "cyralinc/sidecar-ec2/aws"

# Use the module version that is compatible with your sidecar.
version = "~> 4.3"
version = "~> 5.0"

sidecar_id = cyral_sidecar.sidecar.id
control_plane = local.control_plane_host
Expand All @@ -251,16 +251,15 @@ module "cyral_sidecar" {
load_balancer_scheme = local.sidecar.public_sidecar ? "internet-facing" : "internal"
associate_public_ip_address = local.sidecar.public_sidecar


load_balancer_certificate_arn = local.sidecar.load_balancer_certificate_arn
load_balancer_tls_ports = [
local.repos.s3.browser_port
]

sidecar_dns_hosted_zone_id = local.sidecar.dns_hosted_zone_id
sidecar_dns_name = local.sidecar.dns_name
dns_hosted_zone_id = local.sidecar.dns_hosted_zone_id
dns_name = local.sidecar.dns_name
}

output "sidecar_load_balancer_dns" {
value = module.cyral_sidecar.sidecar_load_balancer_dns
value = module.cyral_sidecar.load_balancer_dns
}
29 changes: 3 additions & 26 deletions examples/guides/setup_cp_and_deploy_sidecar.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ locals {
# internet-facing load balancer (requires a public subnet).
public_sidecar = false

# Set the desired sidecar version.
sidecar_version = "v4.7.0"

# Set the AWS region that the sidecar will be deployed to
region = ""
# Set the ID of VPC that the sidecar will be deployed to
Expand All @@ -55,17 +52,6 @@ locals {
# Set the allowed CIDR block for monitoring requests to the
# sidecar
monitoring_inbound_cidr = ["0.0.0.0/0"]

# Set the parameters to access the private Cyral container
# registry. These parameters can be found in the sidecar
# Terraform template downloaded from the UI. Use the
# commented values to locate the variables and copy the
# values from the downloaded template.
container_registry = {
name = "" # container_registry
username = "" # container_registry_username
registry_key = "" # container_registry_key
}
}
}

Expand Down Expand Up @@ -144,9 +130,7 @@ module "cyral_sidecar" {
source = "cyralinc/sidecar-ec2/aws"

# Use the module version that is compatible with your sidecar.
version = "~> 4.0"

sidecar_version = local.sidecar.sidecar_version
version = "~> 5.0"

sidecar_id = cyral_sidecar.sidecar.id

Expand All @@ -166,21 +150,14 @@ module "cyral_sidecar" {
load_balancer_scheme = local.sidecar.public_sidecar ? "internet-facing" : "internal"
associate_public_ip_address = local.sidecar.public_sidecar

deploy_secrets = true
secrets_location = "/cyral/sidecars/${cyral_sidecar.sidecar.id}/secrets"

container_registry = local.sidecar.container_registry.name
container_registry_username = local.sidecar.container_registry.username
container_registry_key = local.sidecar.container_registry.registry_key

client_id = cyral_sidecar_credentials.sidecar_credentials.client_id
client_secret = cyral_sidecar_credentials.sidecar_credentials.client_secret
}

output "sidecar_dns" {
value = module.cyral_sidecar.sidecar_dns
value = module.cyral_sidecar.dns
}

output "sidecar_load_balancer_dns" {
value = module.cyral_sidecar.sidecar_load_balancer_dns
value = module.cyral_sidecar.load_balancer_dns
}
27 changes: 2 additions & 25 deletions examples/guides/smart_ports_1.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ locals {
# internet-facing load balancer (requires a public subnet).
public_sidecar = false

# Set the desired sidecar version.
sidecar_version = "v4.7.0"

# Set the AWS region that the sidecar will be deployed to
region = ""
# Set the ID of VPC that the sidecar will be deployed to
Expand All @@ -66,17 +63,6 @@ locals {
# Set the allowed CIDR block for monitoring requests to the
# sidecar
monitoring_inbound_cidr = ["0.0.0.0/0"]

# Set the parameters to access the private Cyral container
# registry. These parameters can be found in the sidecar
# Terraform template downloaded from the UI. Use the
# commented values to locate the variables and copy the
# values from the downloaded template.
container_registry = {
name = "" # container_registry
username = "" # container_registry_username
registry_key = "" # container_registry_key
}
}
}

Expand Down Expand Up @@ -289,9 +275,7 @@ module "cyral_sidecar" {
source = "cyralinc/sidecar-ec2/aws"

# Use the module version that is compatible with your sidecar.
version = "~> 4.0"

sidecar_version = local.sidecar.sidecar_version
version = "~> 5.0"

sidecar_id = cyral_sidecar.sidecar.id

Expand All @@ -309,17 +293,10 @@ module "cyral_sidecar" {
load_balancer_scheme = local.sidecar.public_sidecar ? "internet-facing" : "internal"
associate_public_ip_address = local.sidecar.public_sidecar

deploy_secrets = true
secrets_location = "/cyral/sidecars/${cyral_sidecar.sidecar.id}/secrets"

container_registry = local.sidecar.container_registry.name
container_registry_username = local.sidecar.container_registry.username
container_registry_key = local.sidecar.container_registry.registry_key

client_id = cyral_sidecar_credentials.sidecar_credentials.client_id
client_secret = cyral_sidecar_credentials.sidecar_credentials.client_secret
}

output "sidecar_load_balancer_dns" {
value = module.cyral_sidecar.sidecar_load_balancer_dns
value = module.cyral_sidecar.load_balancer_dns
}
27 changes: 2 additions & 25 deletions examples/guides/smart_ports_2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ locals {
# internet-facing load balancer (requires a public subnet).
public_sidecar = false

# Set the desired sidecar version.
sidecar_version = "v4.7.0"

# Set the AWS region that the sidecar will be deployed to
region = ""
# Set the ID of VPC that the sidecar will be deployed to
Expand All @@ -72,17 +69,6 @@ locals {
# Set the allowed CIDR block for monitoring requests to the
# sidecar
monitoring_inbound_cidr = ["0.0.0.0/0"]

# Set the parameters to access the private Cyral container
# registry. These parameters can be found in the sidecar
# Terraform template downloaded from the UI. Use the
# commented values to locate the variables and copy the
# values from the downloaded template.
container_registry = {
name = "" # container_registry
username = "" # container_registry_username
registry_key = "" # container_registry_key
}
}
}

Expand Down Expand Up @@ -231,9 +217,7 @@ module "cyral_sidecar" {
source = "cyralinc/sidecar-ec2/aws"

# Use the module version that is compatible with your sidecar.
version = "~> 4.0"

sidecar_version = local.sidecar.sidecar_version
version = "~> 5.0"

sidecar_id = cyral_sidecar.sidecar.id

Expand All @@ -251,17 +235,10 @@ module "cyral_sidecar" {
load_balancer_scheme = local.sidecar.public_sidecar ? "internet-facing" : "internal"
associate_public_ip_address = local.sidecar.public_sidecar

deploy_secrets = true
secrets_location = "/cyral/sidecars/${cyral_sidecar.sidecar.id}/secrets"

container_registry = local.sidecar.container_registry.name
container_registry_username = local.sidecar.container_registry.username
container_registry_key = local.sidecar.container_registry.registry_key

client_id = cyral_sidecar_credentials.sidecar_credentials.client_id
client_secret = cyral_sidecar_credentials.sidecar_credentials.client_secret
}

output "sidecar_load_balancer_dns" {
value = module.cyral_sidecar.sidecar_load_balancer_dns
value = module.cyral_sidecar.load_balancer_dns
}
2 changes: 1 addition & 1 deletion examples/resources/cyral_integration_logging/cloudwatch.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ resource "cyral_sidecar_credentials" "creds" {

module "cyral_sidecar" {
source = "cyralinc/sidecar-ec2/aws"
version = "~> 4.0"
version = "~> 5.0"

sidecar_id = cyral_sidecar.sidecar.id

Expand Down
2 changes: 1 addition & 1 deletion templates/index.md.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ terraform {
required_providers {
cyral = {
source = "cyralinc/cyral"
version = "~> 4.1"
version = "~> 4.0"
}
}
}
Expand Down
Loading