Merge pull request #245 from junior/mushop_oke_autoscaler_support

Mushop oke autoscaler support

deploy/complete/helm-chart/setup/requirements.yaml

@@ -10,7 +10,7 @@ dependencies:
     repository: https://prometheus-community.github.io/helm-charts
   # Grafana
   - name: grafana
-    version: 6.6.3
+    version: 6.7.3
     condition: grafana.enabled
     repository: https://grafana.github.io/helm-charts
   # HPA Metrics
@@ -20,7 +20,7 @@ dependencies:
     repository: https://charts.helm.sh/stable
   # Ingress Controller
   - name: ingress-nginx
-    version: 3.24.0
+    version: 3.29.0
     condition: ingress-nginx.enabled
     repository: https://kubernetes.github.io/ingress-nginx
   # Service Catalog
@@ -30,7 +30,7 @@ dependencies:
     repository: https://kubernetes-sigs.github.io/service-catalog 
   # cert-manager
   - name: cert-manager
-    version: 1.2.0
+    version: 1.3.0
     condition: cert-manager.enabled
     repository: https://charts.jetstack.io
   # jenkins

deploy/complete/terraform/mushop-utilities.tf

@@ -37,7 +37,7 @@ resource "helm_release" "grafana" {
   name       = "mushop-utils-grafana" # mushop-utils included to be backwards compatible to the docs and setup chart install
   repository = local.helm_repository.grafana
   chart      = "grafana"
-  version    = "6.7.1"
+  version    = "6.7.3"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = false
 
@@ -109,7 +109,7 @@ resource "helm_release" "ingress_nginx" {
   name       = "mushop-utils-ingress-nginx" # mushop-utils included to be backwards compatible to the docs and setup chart install
   repository = local.helm_repository.ingress_nginx
   chart      = "ingress-nginx"
-  version    = "3.26.0"
+  version    = "3.29.0"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = true
 
@@ -125,6 +125,9 @@ resource "helm_release" "ingress_nginx" {
 
   timeout = 1800 # workaround to wait the node be active for other charts
 
+  depends_on = [kubernetes_deployment.cluster_autoscaler_deployment]
+
+  count = var.ingress_nginx_enabled ? 1 : 0
 }
 
 ## https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog/README.md
@@ -147,7 +150,7 @@ resource "helm_release" "cert_manager" {
   name       = "cert-manager"
   repository = local.helm_repository.jetstack
   chart      = "cert-manager"
-  version    = "1.2.0"
+  version    = "1.3.0"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = false
 

deploy/complete/terraform/mushop-variables.tf

@@ -25,15 +25,15 @@ variable "prometheus_enabled" {
 }
 variable "metrics_server_enabled" {
   default     = true
-  description = "Enable Metrics Server for Metrics, HPA, VPA and Cluster Auto Scaling"
+  description = "Enable Metrics Server for Metrics, HPA, VPA and Cluster Auto Scaler"
 }
 variable "catalog_enabled" {
   default     = false
   description = "Enable Service Catalog to use with OCI Service Broker"
 }
 variable "ingress_nginx_enabled" {
   default     = true
-  description = "Enable Ingress Nginx for Services (Provision a Load Balancer)"
+  description = "Enable Ingress Nginx for Kubernetes Services (This option provision a Load Balancer)"
 }
 variable "cert_manager_enabled" {
   default     = true

deploy/complete/terraform/oke-variables.tf

@@ -14,7 +14,7 @@ variable "create_new_oke_cluster" {
 }
 variable "existent_oke_cluster_id" {
   default     = ""
-  description = "Cluster Id of the existent OKE"
+  description = "Using existent OKE Cluster. Only the application and services will be provisioned. If select cluster autoscaler feature, you need to get the node pool id and enter when required"
 }
 variable "create_new_compartment_for_oke" {
   default     = false

deploy/complete/terraform/schema.yaml

@@ -175,7 +175,7 @@ variables:
 
   existent_oke_cluster_id:
     type: oci:container:cluster:id
-    title: "Existent OKE Cluster id"
+    title: "Existent OKE Cluster"
     required: true
     dependsOn:
       compartmentId: existent_oke_cluster_compartment_ocid