Merge pull request #328 from junior/autoscaler_versions_update

Autoscaler and Charts versions updated

Author: junior

.gitignore

@@ -2,6 +2,7 @@
 .DS_Store
 *.tgz
 *.zip
+.dccache
 
 ## Kubeconfig
 kubeconfig

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

@@ -5,12 +5,12 @@
 dependencies:
   # Prometheus
   - name: prometheus
-    version: 15.4.0
+    version: 15.10.5
     condition: prometheus.enabled
     repository: https://prometheus-community.github.io/helm-charts
   # Grafana
   - name: grafana
-    version: 6.22.0
+    version: 6.32.5
     condition: grafana.enabled
     repository: https://grafana.github.io/helm-charts
   # HPA Metrics
@@ -20,17 +20,12 @@ dependencies:
     repository: https://kubernetes-sigs.github.io/metrics-server
   # Ingress Controller
   - name: ingress-nginx
-    version: 4.0.17
+    version: 4.2.0
     condition: ingress-nginx.enabled
     repository: https://kubernetes.github.io/ingress-nginx
-  # Service Catalog
-  - name: catalog
-    version: 0.3.1
-    condition: catalog.enabled
-    repository: https://kubernetes-sigs.github.io/service-catalog 
   # cert-manager
   - name: cert-manager
-    version: 1.7.1
+    version: 1.8.2
     condition: cert-manager.enabled
     repository: https://charts.jetstack.io
   # jenkins

deploy/complete/terraform/.terraform.lock.hcl

@@ -1 +1 @@
-3.1.1
+3.1.2

deploy/complete/terraform/VERSION

@@ -18,7 +18,7 @@ resource "helm_release" "prometheus" {
   name       = "prometheus"
   repository = local.helm_repository.prometheus
   chart      = "prometheus"
-  version    = "15.4.0"
+  version    = "15.10.5"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = false
 
@@ -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.22.0"
+  version    = "6.32.5"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = false
 
@@ -116,7 +116,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    = "4.0.17"
+  version    = "4.2.0"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = true
 
@@ -148,26 +148,15 @@ resource "helm_release" "ingress_nginx" {
 }
 
 ## https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog/README.md
-resource "helm_release" "svc-cat" {
-  name       = "svc-cat"
-  repository = local.helm_repository.svc_catalog
-  chart      = "catalog"
-  version    = "0.3.1"
-  namespace  = kubernetes_namespace.cluster_utilities_namespace.id
-  wait       = false
-
-  depends_on = [helm_release.ingress_nginx] # Ugly workaround because of the oci pvc provisioner not be able to wait for the node be active and retry.
-
-  count = var.catalog_enabled ? 1 : 0
-}
+## *** Service Catalog removed. Project retired ***
 
 ## https://github.com/jetstack/cert-manager/blob/master/README.md
 ## https://artifacthub.io/packages/helm/cert-manager/cert-manager
 resource "helm_release" "cert_manager" {
   name       = "cert-manager"
   repository = local.helm_repository.jetstack
   chart      = "cert-manager"
-  version    = "1.7.1"
+  version    = "1.8.2"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = true # wait to allow the webhook be properly configured
 
@@ -213,7 +202,6 @@ locals {
   helm_repository = {
     ingress_nginx  = "https://kubernetes.github.io/ingress-nginx"
     jetstack       = "https://charts.jetstack.io"                        # cert-manager
-    svc_catalog    = "https://kubernetes-sigs.github.io/service-catalog" # Service Catalog
     grafana        = "https://grafana.github.io/helm-charts"
     prometheus     = "https://prometheus-community.github.io/helm-charts"
     metrics_server = "https://kubernetes-sigs.github.io/metrics-server"

deploy/complete/terraform/mushop-utilities.tf

@@ -3,7 +3,7 @@
 # 
 
 locals {
-  cluster_autoscaler_supported_k8s_versions           = { "1.18" = "1.18.3-4", "1.19" = "1.19.1-4", "1.20" = "1.20.0-4", "1.21" = "1.21.1-1" } # There's no API to get that list. Need to be updated manually
+  cluster_autoscaler_supported_k8s_versions           = { "1.21" = "1.21.1-3", "1.22" = "1.22.2-4", "1.23" = "1.23.0-4", "1.24" = "1.24.0-5" } # There's no API to get that list. Need to be updated manually
   cluster_autoscaler_image_version                    = lookup(local.cluster_autoscaler_supported_k8s_versions, local.k8s_major_minor_version, reverse(values(local.cluster_autoscaler_supported_k8s_versions))[0])
   cluster_autoscaler_image                            = "iad.ocir.io/oracle/oci-cluster-autoscaler:${local.cluster_autoscaler_image_version}"
   cluster_autoscaler_log_level_verbosity              = 4

deploy/complete/terraform/oke-autoscaler.tf

@@ -18,6 +18,9 @@ data "oci_containerengine_cluster_option" "oke" {
 data "oci_containerengine_node_pool_option" "oke" {
   node_pool_option_id = "all"
 }
+data "oci_containerengine_clusters" "oke" {
+    compartment_id = local.oke_compartment_ocid
+}
 
 # Gets a list of Availability Domains
 data "oci_identity_availability_domains" "ADs" {

deploy/complete/terraform/oke-datasources.tf

@@ -7,7 +7,7 @@ output "comments" {
 }
 
 output "deployed_oke_kubernetes_version" {
-  value = (var.k8s_version == "Latest") ? local.cluster_k8s_latest_version : var.k8s_version
+  value = local.deployed_k8s_version
 }
 output "kubeconfig_for_kubectl" {
   value       = "export KUBECONFIG=./generated/kubeconfig"

deploy/complete/terraform/oke-outputs.tf

@@ -108,6 +108,8 @@ resource "tls_private_key" "oke_worker_node_ssh_key" {
 locals {
   cluster_k8s_latest_version   = reverse(sort(data.oci_containerengine_cluster_option.oke.kubernetes_versions))[0]
   node_pool_k8s_latest_version = reverse(sort(data.oci_containerengine_node_pool_option.oke.kubernetes_versions))[0]
+  deployed_k8s_version = var.create_new_oke_cluster ? (var.k8s_version == "Latest") ? local.cluster_k8s_latest_version : var.k8s_version :[
+    for x in data.oci_containerengine_clusters.oke.clusters : x.kubernetes_version if x.id == var.existent_oke_cluster_id][0]
 }
 
 # Checks if is using Flexible Compute Shapes

deploy/complete/terraform/oke.tf

@@ -6,9 +6,9 @@ terraform {
   required_version = ">= 1.0"
   required_providers {
     oci = {
-      source  = "hashicorp/oci"
-      version = ">= 4.65.0"
-      # https://registry.terraform.io/providers/hashicorp/oci/4.65.0
+      source  = "oracle/oci"
+      version = ">= 4.85.0"
+      # https://registry.terraform.io/providers/hashicorp/oci/4.85.0
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"