Sanketika-Obsrv · manjudr · Jan 29, 2024 · Jan 29, 2024
diff --git a/automation-scripts/infra-setup/setup.conf b/automation-scripts/infra-setup/setup.conf
@@ -17,7 +17,7 @@ BUILDING_BLOCK="" # obsrv
 ENV="" # dev
 REGION="" # eu-west-1
 TIMEZONE="UTC"
-ALLOW_VPC_CREATION=false # It will creates VPC, Subnets.
-ALLOW_VELERO_USER_CREATION=false # It will create velero user
-ALLOW_KONG_INGRESS_SETUP=false # It will setup kong ingress
+ALLOW_VPC_CREATION=true # It will creates VPC, Subnets.
+ALLOW_VELERO_USER_CREATION=true # It will create velero user
+ALLOW_KONG_INGRESS_SETUP=true # It will setup kong ingress
 # Add more variables as needed
diff --git a/automation-scripts/infra-setup/setup.sh b/automation-scripts/infra-setup/setup.sh
@@ -179,6 +179,7 @@ validate_tools
 
 # Script related to terraform and deployment will start from here
 cd ../../terraform/aws
+terrahelp decrypt  -simple-key=<decryption_key> -file=vars/dev.tfvars
 terragrunt init
 terragrunt apply -target module.eks -var "create_vpc=$ALLOW_VPC_CREATION" -var "create_velero_user=$ALLOW_VELERO_USER_CREATION"  -var-file=vars/dev.tfvars -var-file=vars/overrides.tfvars -auto-approve
 terragrunt apply -target module.get_kubeconfig -var "create_vpc=$ALLOW_VPC_CREATION" -var "create_velero_user=$ALLOW_VELERO_USER_CREATION"  -var-file=vars/dev.tfvars -var-file=vars/overrides.tfvars -auto-approve

diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf
@@ -79,6 +79,7 @@ module "monitoring" {
   source                           = "../modules/helm/monitoring"
   env                              = var.env
   building_block                   = var.building_block
+  service_type                     = var.service_type
   depends_on                       = [module.eks]
 }
 

diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf
@@ -54,12 +54,13 @@ variable "velero_aws_secret_access_key" {
 }
 variable "service_type" {
   type = string
-  description = "Kubernetes service type either NodePort or LoadBalancer. It is NodePort by default"
+  description = "Kubernetes service type either NodePort or LoadBalancer. It is LoadBalancer by default"
   default = "LoadBalancer"
 }
 variable "cluster_logs_enabled" {
   type = bool
   description = "Toggle to enable eks cluster logs"
+  default = true
 }
 variable "flink_checkpoint_store_type" {
   type        = string
@@ -140,7 +141,7 @@ variable "flink_release_names" {
     transformer     = "transformer"
     druid-router    = "druid-router"
     master-data-processor = "master-data-processor"
-    # kafka-connector = "kafka-connector"
+    kafka-connector = "kafka-connector"
   }
 }
 
@@ -150,7 +151,7 @@ variable "flink_merged_pipeline_release_names" {
   default = {
     merged-pipeline = "merged-pipeline"
     master-data-processor = "master-data-processor"
-    # kafka-connector = "kafka-connector"
+    kafka-connector = "kafka-connector"
   }
 }
 

diff --git a/terraform/modules/aws/eks/variables.tf b/terraform/modules/aws/eks/variables.tf
@@ -77,7 +77,7 @@ variable "eks_node_group_scaling_config" {
 variable "eks_version" {
   type        = string
   description = "EKS version."
-  default     = "1.27"
+  default     = "1.28"
 }
 
 variable "eks_addons" {

diff --git a/terraform/modules/helm/flink/flink-helm-chart/values.yaml b/terraform/modules/helm/flink/flink-helm-chart/values.yaml
@@ -419,7 +419,7 @@ kafka-connector:
     heartbeat.interval: 5000
     state.savepoints.dir: file:///tmp
 
-  job_classname: org.sunbird.obsrv.kafkaconnector.task.KafkaConnectorStreamTask
+  job_classname: org.sunbird.obsrv.connector.task.KafkaConnectorStreamTask
 
 master-data-processor:
   master-data-processor: |+

diff --git a/terraform/modules/helm/monitoring/main.tf b/terraform/modules/helm/monitoring/main.tf
@@ -15,6 +15,7 @@ resource "helm_release" "monitoring" {
         {
             prometheus_persistent_volume_size = var.prometheus_persistent_volume_size
             prometheus_metrics_retention      = var.prometheus_metrics_retention
+            service_type                      = var.service_type
         }
       )
     ]

diff --git a/terraform/modules/helm/monitoring/monitoring.yaml.tfpl b/terraform/modules/helm/monitoring/monitoring.yaml.tfpl
@@ -32,6 +32,9 @@ kube-state-metrics:
       cpu: "0.1"
       memory: 128Mi
 grafana:
+  service:
+    enabled: true
+    type: ${service_type}
   resources:
     limits:
       cpu: 0.2

diff --git a/terraform/modules/helm/monitoring/variables.tf b/terraform/modules/helm/monitoring/variables.tf
@@ -7,6 +7,10 @@ variable "building_block" {
   type        = string
   description = "Building block name. All resources will be prefixed with this value."
 }
+variable "service_type" {
+  type = string
+  default = "Kubernetes service type either LoadBalancer or NodePort. It is LoadBalancer by default"
+}
 
 variable "monitoring_release_name" {
   type        = string
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ resource "helm_release" "monitoring" { @@
             {
                 prometheus_persistent_volume_size = var.prometheus_persistent_volume_size
                 prometheus_metrics_retention      = var.prometheus_metrics_retention
+                service_type                      = var.service_type
             }
           )
         ]
@@ Expand Down @@