diff --git a/Makefile b/Makefile index 65031b6..125380b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ TF_CMD ?= terraform -OPERATOR_VERSION ?= latest +OPERATOR_VERSION ?= v0.4.3 CLUSTER_NAME ?= ls-k8s-demo usage: ## Show this help @@ -16,10 +16,10 @@ stop-cluster: kind delete cluster --name $(CLUSTER_NAME) deploy-operator: - kubectl apply --server-side -f https://github.com/localstack/localstack-operator/releases/${OPERATOR_VERSION}/download/controller.yaml + kubectl apply --server-side -f https://raw.githubusercontent.com/localstack/localstack-operator/${OPERATOR_VERSION}/controller.yaml destroy-operator: - kubectl delete -f https://github.com/localstack/localstack-operator/releases/${OPERATOR_VERSION}/download/controller.yaml + kubectl delete -f https://raw.githubusercontent.com/localstack/localstack-operator/${OPERATOR_VERSION}/controller.yaml deploy-localstack-instance: deploy-secret kubectl apply --server-side -f ./localstack-instance.yml diff --git a/main.tf b/main.tf index cbc8f0e..4b10fb9 100644 --- a/main.tf +++ b/main.tf @@ -14,11 +14,17 @@ variable "database_password" { } module "vpc" { - source = "terraform-aws-modules/vpc/aws" + source = "terraform-aws-modules/vpc/aws" + version = "~> 6.0" + + manage_default_network_acl = false + manage_default_route_table = false + manage_default_security_group = false } module "db" { - source = "terraform-aws-modules/rds/aws" + source = "terraform-aws-modules/rds/aws" + version = "~> 6.0" identifier = "k8sdb" engine = "mysql" @@ -37,7 +43,8 @@ module "db" { } module "lambda_function" { - source = "terraform-aws-modules/lambda/aws" + source = "terraform-aws-modules/lambda/aws" + version = "~> 8.0" function_name = "myfunction" handler = "index.handler"