Skip to content

enforce imsdv2 #21

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

enforce imsdv2 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aee49e5
enforce imsdv2
paulczar Aug 28, 2024
54e0896
fix indent on providers
paulczar Aug 28, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
init:
@terraform init
@terraform init -upgrade

plan:
@export TF_VAR_token="$$(bw get password ocm-api-key)" && terraform plan -out main.plan -var-file=main.tfvars
Expand Down
5 changes: 4 additions & 1 deletion bastion.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,10 @@ resource "aws_instance" "bastion_host" {
associate_public_ip_address = var.bastion_public_ip
key_name = aws_key_pair.bastion_host[0].key_name
vpc_security_group_ids = [aws_security_group.bastion_host[0].id]

metadata_options {
http_tokens = "required"
http_endpoint = "enabled"
}
tags = local.bastion_tags

user_data = <<EOF
Expand Down
12 changes: 6 additions & 6 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ resource "rhcs_cluster_rosa_classic" "rosa" {
cloud_region = var.region
aws_account_id = data.aws_caller_identity.current.account_id
tags = var.tags

ec2_metadata_http_tokens = "required"
# autoscaling and instance settings
compute_machine_type = var.compute_machine_type
autoscaling_enabled = local.autoscaling
Expand Down Expand Up @@ -98,11 +98,11 @@ resource "rhcs_cluster_rosa_hcp" "rosa" {
name = var.cluster_name

# aws
cloud_region = var.region
aws_account_id = data.aws_caller_identity.current.account_id
aws_billing_account_id = data.aws_caller_identity.current.account_id
tags = var.tags

cloud_region = var.region
aws_account_id = data.aws_caller_identity.current.account_id
aws_billing_account_id = data.aws_caller_identity.current.account_id
tags = var.tags
ec2_metadata_http_tokens = "required"
# autoscaling and instance settings
compute_machine_type = var.compute_machine_type
replicas = coalesce(var.replicas, local.replicas)
Expand Down
4 changes: 2 additions & 2 deletions provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
terraform {
required_providers {
rhcs = {
version = ">= 1.6.2"
source = "terraform-redhat/rhcs"
version = "1.6.3-prerelease.2"
}

aws = {
source = "hashicorp/aws"
version = ">= 4.20.0"
version = ">= 5.64.0"
}
validation = {
source = "tlkamp/validation"
Expand Down