Merge pull request #13 from clouddrove/feat/keda

feat: Modified keda addon
clouddrove · Jan 18, 2024 · ff9da57 · ff9da57
2 parents 504e457 + 6ad3018
commit ff9da57
Show file tree

Hide file tree

Showing 17 changed files with 939 additions and 51 deletions.
diff --git a/_examples/basic/main.tf b/_examples/basic/main.tf
@@ -188,8 +188,9 @@ module "addons" {
   environment      = local.environment
   region           = local.region
 
-  cluster_autoscaler    = true
-  reloader              = true
-  ingress_nginx         = true
-  certification_manager = true
+  cluster_autoscaler    = false
+  reloader              = false
+  ingress_nginx         = false
+  certification_manager = false
+  keda                  = true
 }
diff --git a/_examples/complete/config/keda/override-keda.yaml b/_examples/complete/config/keda/override-keda.yaml
@@ -0,0 +1,9 @@
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: "cloud.google.com/gke-nodepool"
+          operator: In
+          values:
+          - "critical"
diff --git a/_examples/complete/config/keda/strategy_example.yaml b/_examples/complete/config/keda/strategy_example.yaml
@@ -0,0 +1,36 @@
+apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+  name: nginx-deployment
+  namespace: nginx
+spec:
+  scaleTargetRef:
+    apiVersion:    apps/v1        # Optional. Default: apps/v1
+    kind:          Deployment     # Optional. Default: Deployment
+    name:          nginx      # Mandatory. Must be in the same namespace as the ScaledObject
+  pollingInterval:  5                    # Optional. Default: 5 seconds
+  cooldownPeriod:   20                  # Optional. Default: 300 seconds
+  minReplicaCount:  1                   # Optional. Default: 0
+  maxReplicaCount:  10                    # Optional. Default: 100
+  fallback:                                        # Optional. Section to specify fallback options
+    failureThreshold: 3                            # Mandatory if fallback section is included
+    replicas: 1                                    # Mandatory if fallback section is included
+  advanced:                                        # Optional. Section to specify advanced options
+    restoreToOriginalReplicaCount: true     # Optional. Default: false
+    horizontalPodAutoscalerConfig:          # Optional. Section to specify HPA related options
+      name: keda-hpa-nginx       # Optional. Default: keda-hpa-{scaled-object-name}
+      behavior:                             # Optional. Use to modify HPA's scaling behavior
+        scaleDown:
+          stabilizationWindowSeconds: 60
+          policies:
+            - type: Percent
+              value: 100
+              periodSeconds: 15
+  triggers:
+  - type: cron
+    metadata:
+      # Required
+      timezone: Asia/Kolkata  # The acceptable values would be a value from the IANA Time Zone Database.
+      start: "12 00 * * *"
+      end: "15 00 * * *"
+      desiredReplicas: "5"
diff --git a/_examples/complete/main.tf b/_examples/complete/main.tf
@@ -187,20 +187,23 @@ module "addons" {
   environment      = local.environment
   region           = local.region
 
-  cluster_autoscaler    = true
-  reloader              = true
-  ingress_nginx         = true
-  certification_manager = true
+  cluster_autoscaler    = false
+  reloader              = false
+  ingress_nginx         = false
+  certification_manager = false
+  keda                  = true
 
   # -- Path of override-values.yaml file
   cluster_autoscaler_helm_config    = { values = [file("./config/override-cluster-autoscaler.yaml")] }
   reloader_helm_config              = { values = [file("./config/reloader/override-reloader.yaml")] }
   ingress_nginx_helm_config         = { values = [file("./config/override-ingress-nginx.yaml")] }
   certification_manager_helm_config = { values = [file("./config/override-certification-manager.yaml")] }
+  keda_helm_config                  = { values = [file("./config/keda/override-keda.yaml")] }
 
   # -- Override Helm Release attributes
   cluster_autoscaler_extra_configs    = var.cluster_autoscaler_extra_configs
   reloader_extra_configs              = var.reloader_extra_configs
   ingress_nginx_extra_configs         = var.ingress_nginx_extra_configs
   certification_manager_extra_configs = var.certification_manager_extra_configs
+  keda_extra_configs                  = var.keda_extra_configs
 }
diff --git a/_examples/complete/variables.tf b/_examples/complete/variables.tf
@@ -25,3 +25,9 @@ variable "reloader_extra_configs" {
   type    = any
   default = {}
 }
+
+# ------------------ KEDA -----------------------------------------------------
+variable "keda_extra_configs" {
+  type    = any
+  default = {}
+}
diff --git a/addons/cert-manager/variables.tf b/addons/cert-manager/variables.tf
@@ -15,12 +15,6 @@ variable "certification_manager_extra_configs" {
   default     = {}
 }
 
-variable "iampolicy_json_content" {
-  description = "Custom IAM Policy for ClusterAutoscaler IRSA"
-  type        = string
-  default     = null
-}
-
 variable "addon_context" {
   description = "Input configuration for the addon"
   type = object({
@@ -30,7 +24,7 @@ variable "addon_context" {
   })
 }
 
-variable "irsa_config" {
+variable "workload_identity_config" {
   description = "Input configuration for IRSA module"
   type        = any
   default     = {}
@@ -55,11 +49,11 @@ variable "environment" {
 variable "GCP_GSA_NAME" {
   description = "Google Cloud Service Account name"
   type        = string
-  default     = "keda"
+  default     = "cert-manager"
 }
 
 variable "GCP_KSA_NAME" {
   description = "Google Kubernetes Service Account name"
   type        = string
-  default     = "keda-operator"
+  default     = "cert-manager"
 }