From 6308bba68c06c6d6263c8c713c2fb78c6eae06e9 Mon Sep 17 00:00:00 2001 From: Adao Junior Date: Thu, 8 Apr 2021 23:21:36 -0500 Subject: [PATCH 1/2] ingress nginx version bump to prevent 1/100 issue --- deploy/complete/helm-chart/setup/requirements.yaml | 6 +++--- deploy/complete/terraform/mushop-utilities.tf | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/deploy/complete/helm-chart/setup/requirements.yaml b/deploy/complete/helm-chart/setup/requirements.yaml index 21a7772ae..5b3b9bb03 100644 --- a/deploy/complete/helm-chart/setup/requirements.yaml +++ b/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 diff --git a/deploy/complete/terraform/mushop-utilities.tf b/deploy/complete/terraform/mushop-utilities.tf index c2920f89a..d6653b77c 100644 --- a/deploy/complete/terraform/mushop-utilities.tf +++ b/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 From 931c1c0dc4a8af726c1e9cd1e1db9fd3effc577d Mon Sep 17 00:00:00 2001 From: Adao Junior Date: Fri, 9 Apr 2021 00:10:19 -0500 Subject: [PATCH 2/2] typos --- deploy/complete/terraform/mushop-variables.tf | 4 ++-- deploy/complete/terraform/oke-variables.tf | 2 +- deploy/complete/terraform/schema.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/complete/terraform/mushop-variables.tf b/deploy/complete/terraform/mushop-variables.tf index 114c5f084..42fea2edb 100644 --- a/deploy/complete/terraform/mushop-variables.tf +++ b/deploy/complete/terraform/mushop-variables.tf @@ -25,7 +25,7 @@ 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 @@ -33,7 +33,7 @@ variable "catalog_enabled" { } 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 diff --git a/deploy/complete/terraform/oke-variables.tf b/deploy/complete/terraform/oke-variables.tf index bd9a51bb2..c9cdcfb05 100644 --- a/deploy/complete/terraform/oke-variables.tf +++ b/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 diff --git a/deploy/complete/terraform/schema.yaml b/deploy/complete/terraform/schema.yaml index f6dfe5ce5..d75f7fd88 100644 --- a/deploy/complete/terraform/schema.yaml +++ b/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