Merge pull request #17 from RohitSquareops/fix-addons-bug

Removed the unwanted links from the affected files
squareops · Aug 1, 2023 · d9b3e72 · d9b3e72
2 parents b881be3 + f33ac21
commit d9b3e72
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/EKS-Blueprint/modules/kubernetes-addons/main.tf b/EKS-Blueprint/modules/kubernetes-addons/main.tf
@@ -372,13 +372,14 @@ module "kube_prometheus_stack" {
   addon_context = local.addon_context
 }
 
-module "portworx" {
-  count         = var.enable_portworx ? 1 : 0
-  source        = "portworx/portworx-addon/eksblueprints"
-  version       = "0.0.6"
-  helm_config   = var.portworx_helm_config
-  addon_context = local.addon_context
-}
+# module "portworx" {
+#   count         = var.enable_portworx ? 1 : 0
+#   source        = "portworx/portworx-addon/eksblueprints"
+#   version       = "0.0.6"
+#   helm_config   = var.portworx_helm_config
+#   addon_context = local.addon_context
+# }
+
 module "prometheus" {
   count       = var.enable_prometheus ? 1 : 0
   source      = "./prometheus"
@@ -424,14 +425,14 @@ module "strimzi_kafka_operator" {
   addon_context     = local.addon_context
 }
 
-module "sysdig_agent" {
-  source  = "sysdiglabs/sysdig-addon/eksblueprints"
-  version = "0.0.1"
+# module "sysdig_agent" {
+#   source  = "sysdiglabs/sysdig-addon/eksblueprints"
+#   version = "0.0.1"
 
-  count         = var.enable_sysdig_agent ? 1 : 0
-  helm_config   = var.sysdig_agent_helm_config
-  addon_context = local.addon_context
-}
+#   count         = var.enable_sysdig_agent ? 1 : 0
+#   helm_config   = var.sysdig_agent_helm_config
+#   addon_context = local.addon_context
+# }
 
 module "tetrate_istio" {
   # source  = "tetratelabs/tetrate-istio-addon/eksblueprints"

diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -24,22 +24,22 @@ module "eks_bootstrap" {
   karpenter_enabled                   = true
   private_subnet_ids                  = [""]
   single_az_sc_config                 = [{ name = "infra-service-sc", zone = "us-east-2a" }]
-  kubeclarity_enabled                 = false
+  kubeclarity_enabled                 = true
   kubeclarity_hostname                = ""
-  kubecost_enabled                    = false
+  kubecost_enabled                    = true
   kubecost_hostname                   = ""
   cert_manager_enabled                = true
   worker_iam_role_name                = ""
   worker_iam_role_arn                 = ""
   ingress_nginx_enabled               = true
-  metrics_server_enabled              = false
+  metrics_server_enabled              = true
   external_secrets_enabled            = true
   amazon_eks_vpc_cni_enabled          = true
   cluster_autoscaler_enabled          = true
   service_monitor_crd_enabled         = true
-  karpenter_provisioner_enabled       = false
+  karpenter_provisioner_enabled       = true
   enable_aws_load_balancer_controller = true
-  istio_enabled                       = false
+  istio_enabled                       = true
   istio_config = {
     ingress_gateway_enabled             = true
     ingress_gateway_namespace           = "istio-ingressgateway"
@@ -64,7 +64,7 @@ module "eks_bootstrap" {
   cluster_propotional_autoscaler_enabled        = true
   single_az_ebs_gp3_storage_class_enabled       = true
   cert_manager_install_letsencrypt_http_issuers = true
-  velero_enabled                                = false
+  velero_enabled                                = true
   velero_config = {
     namespaces                      = "" ## If you want full cluster backup, leave it blank else provide namespace.
     slack_notification_token        = "xoxb-EuvmxrYxRatsM8R"

diff --git a/main.tf b/main.tf
@@ -49,6 +49,9 @@ module "k8s_addons" {
 
   #keda
   enable_keda = var.keda_enabled
+  keda_helm_config = {
+    version = "2.10.2"
+  }
 
   #Ingress Nginx Controller
   enable_ingress_nginx = var.ingress_nginx_enabled