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.

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

Automation of CORS for backup bucket #195

Merged
merged 13 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
251 changes: 0 additions & 251 deletions terraform/aws/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,6 @@ variable "eks_master_subnet_ids" {
default = [""]
}

variable "velero_aws_access_key_id" {
type = string
description = "AWS Access key to access bucket"
default = ""
}
variable "velero_aws_secret_access_key" {
type = string
description = "AWS Secret access key to access bucket"
default = ""
}
variable "service_type" {
type = string
description = "Kubernetes service type either NodePort or LoadBalancer. It is LoadBalancer by default"
Expand All @@ -73,54 +63,12 @@ variable "cluster_logs_enabled" {
description = "Toggle to enable eks cluster logs"
default = true
}
variable "flink_checkpoint_store_type" {
type = string
description = "Flink checkpoint store type."
default = "s3"
}

variable "druid_deepstorage_type" {
type = string
description = "Druid deep strorage type."
default = "s3"
}

variable "kubernetes_storage_class" {
type = string
description = "Storage class name for the Kubernetes cluster"
default = "gp2"
}

variable "dataset_api_container_registry" {
type = string
description = "Container registry. For example docker.io/obsrv"
default = "sanketikahub"
}

variable "dataset_api_image_name" {
type = string
description = "Dataset api image name."
default = "config-service-ext"
}

variable "dataset_api_image_tag" {
type = string
description = "Dataset api image tag."
default = "1.0.2-GA"
}

variable "flink_container_registry" {
type = string
description = "Container registry. For example docker.io/obsrv"
default = "sanketikahub"
}

variable "flink_image_tag" {
type = string
description = "Flink kubernetes service name."
default = "1.0.2-GA"
}

variable "monitoring_grafana_oauth_configs" {
type = map(any)
description = "Grafana oauth related variables. See below commented code for values that need to be passed"
Expand All @@ -138,13 +86,6 @@ variable "web_console_image_repository" {
default = "sanketikahub/obsrv-web-console"
}

variable "web_console_image_tag" {
type = string
description = "web console image tag."
default = "1.0.2-GA"
}
# web console variables end.

variable "docker_registry_secret_dockerconfigjson" {
type = string
description = "The dockerconfigjson encoded in base64 format."
Expand All @@ -156,12 +97,6 @@ variable "docker_registry_secret_name" {
default = "docker-registry-secret"
}

variable "command_service_image_tag" {
type = string
description = "CommandService image tag."
default = "1.0.2-GA"
}

variable "oauth_configs" {
type = map(any)
description = "Superset config variables. See the below commented code to know values to be passed "
Expand All @@ -184,34 +119,6 @@ variable "flowlogs_retention_in_days" {
default = 7
}

variable "flink_release_names" {
description = "Create release names"
type = map(string)
default = {
extractor = "extractor"
preprocessor = "preprocessor"
denormalizer = "denormalizer"
transformer-ext = "transformer-ext"
druid-router = "druid-router"
master-data-processor-ext = "master-data-processor-ext"
}
}

variable "flink_unified_pipeline_release_names" {
description = "Create release names"
type = map(string)
default = {
unified-pipeline = "unified-pipeline"
master-data-processor-ext = "master-data-processor-ext"
}
}

variable "unified_pipeline_enabled" {
description = "Toggle to deploy unified pipeline"
type = bool
default = true
}

variable "kong_loadbalancer_annotations" {
type = string
description = "Kong ingress loadbalancer annotations."
Expand All @@ -226,79 +133,6 @@ variable "kong_ingress_domain" {
description = "Kong ingress domain. Leave it empty if you dont have a domain name. If you have a domain, provide value such as obsrv.ai"
default = ""
}

variable "letsencrypt_ssl_admin_email" {
type = string
description = "Letsencrypt ssl domain admin email."
default = "[email protected]"
}
variable "grafana_secret_name" {
type = string
description = "The name of the secret. This will be sent back as an output which can be used in other modules"
default = "grafana-secret"
}


variable "system_rules_ingestor_container_registry" {
type = string
description = "Container registry. For example docker.io/obsrv"
default = "sanketikahub"
}

variable "system_rules_ingestor_image_name" {
type = string
description = "Dataset api image name."
default = "system-rules-ingestor"
}

variable "system_rules_ingestor_image_tag" {
type = string
description = "Dataset api image tag."
default = "1.0.2-GA"
}

variable "grafana_url" {
type = string
description = "grafana url"
default = "http://monitoring-grafana.monitoring.svc:80"
}

variable "spark_image_repository" {
type = string
description = "spark image repository."
default = "sanketikahub/spark"
}

variable "spark_image_tag" {
type = string
description = "spark image tag."
default = "3.3.0-debian-11-r26_1.0.3-GA"
}

variable "secor_image_tag" {
type = string
description = "secor image version"
default = "1.0.0-GA"
}

variable "superset_image_tag" {
type = string
description = "Superset image tag."
default = "3.0.2"
}

variable "redis_backup_image_tag" {
type = string
description = "Redis backup image tag."
default = "1.0.0"
}

variable "postgresql_backup_image_tag" {
type = string
description = "Postgresql backup image tag."
default = "0.5"
}

variable "eks_node_group_scaling_config" {
type = map(number)
description = "EKS node group auto scaling configuration."
Expand All @@ -319,33 +153,7 @@ variable "eks_node_group_capacity_type" {
description = "EKS node group type. Either SPOT or ON_DEMAND can be used"
}

variable "redirection_auth_path" {
type = string
description = "Either obsrv or keycloak"
}

variable "smtp_enabled" {
type = bool
description = "enable the smtp server"
default = false
}

variable "smtp_config" {
type = map(string)
description = "smtp server configuration"
default = {
host = ""
user = ""
password = ""
from_address = ""
cert_file = ""
key_file = ""
ehlo_identity = ""
startTLS_policy = ""
skip_verify = "true"
from_name = "obsrv"
}
}

variable "eks_endpoint_private_access" {
type = bool
Expand Down Expand Up @@ -375,62 +183,3 @@ variable "storage_provider" {
default = "aws"
}

variable "hudi_namespace" {
type = string
default = "hudi"
description = "Apache Hudi namespace"
}

variable "hudi_prefix_path" {
type = string
description = "Hudi prefix path"
default = "hudi"
}

variable "enable_lakehouse" {
type = bool
description = "Toggle to install hudi components (hms, trino and flink job)"
}

variable "lakehouse_host" {
type = string
description = "Lakehouse Host"
default = "http://trino.hudi.svc.cluster.local"
}

variable "lakehouse_port" {
type = string
description = "Trino port"
default = "8080"
}

variable "lakehouse_catalog" {
type = string
description = "Lakehouse Catalog name"
default = "lakehouse"
}

variable "lakehouse_schema" {
type = string
description = "Lakehouse Schema name"
default = "hms"
}

variable "lakehouse_default_user" {
type = string
description = "Lakehouse default user"
default = "admin"
}


variable "flink_image_name" {
type = string
description = "Flink image name."
default = "lakehouse-connector"
}

variable "flink_lakehouse_image_tag" {
type = string
description = "Flink lakehouse image tag."
default = "1.0.0-GA"
}
44 changes: 4 additions & 40 deletions terraform/aws/vars/cluster_overrides.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,19 @@ create_velero_user = "true"
vpc_id = ""
eks_nodes_subnet_ids = [""]
eks_master_subnet_ids = [""]
velero_aws_access_key_id = ""
velero_aws_secret_access_key = ""
enable_lakehouse = false


# cluster sizing
eks_endpoint_private_access = false
eks_node_group_instance_type = ["t2.2xlarge"]
eks_node_group_capacity_type = "ON_DEMAND"
eks_node_group_scaling_config = {
desired_size = 2
max_size = 2
desired_size = 3
max_size = 3
min_size = 1
}
# Disk node size in gb
eks_node_disk_size = 30
eks_node_disk_size = 100

create_s3_buckets = true
s3_buckets = {
Expand All @@ -32,37 +30,3 @@ s3_buckets = {
"checkpoint_storage_bucket" = "",
"s3_backups_bucket" = ""
}

# Image Tags
command_service_image_tag = "1.0.6-GA"
web_console_image_tag = "1.0.6-GA"
system_rules_ingestor_image_tag = "1.0.2-GA"
spark_image_tag = "3.3.0-debian-11-r26"
dataset_api_image_tag = "1.0.6-GA"
flink_image_tag = "1.0.6-GA"
flink_lakehouse_image_tag = "1.0.1"
secor_image_tag = "1.0.0-GA"
superset_image_tag = "3.0.2"


# Backup image tags
redis_backup_image_tag = "1.0.5-GA"
postgresql_backup_image_tag = "1.0.5-GA"

redirection_auth_path = "keycloak"

#smtp server confuration
smtp_enabled = "false"
smtp_config = {
host = ""
user = ""
password = ""
from_address = ""
cert_file = ""
key_file = ""
ehlo_identity = ""
startTLS_policy = ""
skip_verify = "true"
from_name = "obsrv"

}
Loading