Merge pull request #286 from junior/versions_update

Versions update

deploy/basic/terraform/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

deploy/basic/terraform/providers.tf

@@ -7,19 +7,23 @@ terraform {
   required_providers {
     oci = {
       source  = "hashicorp/oci"
-      version = ">= 4.31.0"
+      version = ">= 4.36.0"
+      # https://registry.terraform.io/providers/hashicorp/oci/4.36.0
     }
     local = {
       source  = "hashicorp/local"
       version = "2.1.0" # Latest version as June 2021 = 2.1.0.
+      # https://registry.terraform.io/providers/hashicorp/local/2.1.0
     }
     random = {
       source  = "hashicorp/random"
       version = "3.1.0" # Latest version as June 2021 = 3.1.0.
+      # https://registry.terraform.io/providers/hashicorp/random/3.1.0
     }
     tls = {
       source  = "hashicorp/tls"
       version = "3.1.0" # Latest version as June 2021 = 3.1.0.
+      # https://registry.terraform.io/providers/hashicorp/tls/3.1.0
     }
   }
 }

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

@@ -5,12 +5,12 @@
 dependencies:
   # Prometheus
   - name: prometheus
-    version: 14.1.1
+    version: 14.4.1
     condition: prometheus.enabled
     repository: https://prometheus-community.github.io/helm-charts
   # Grafana
   - name: grafana
-    version: 6.12.0
+    version: 6.14.1
     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.33.0
+    version: 3.34.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.3.1
+    version: 1.4.1
     condition: cert-manager.enabled
     repository: https://charts.jetstack.io
   # jenkins

deploy/complete/terraform/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

deploy/complete/terraform/mushop-utilities.tf

@@ -18,7 +18,7 @@ resource "helm_release" "prometheus" {
   name       = "prometheus"
   repository = local.helm_repository.prometheus
   chart      = "prometheus"
-  version    = "14.1.1"
+  version    = "14.4.1"
   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.12.0"
+  version    = "6.14.1"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = false
 
@@ -110,7 +110,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.33.0"
+  version    = "3.34.0"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = true
 
@@ -161,7 +161,7 @@ resource "helm_release" "cert_manager" {
   name       = "cert-manager"
   repository = local.helm_repository.jetstack
   chart      = "cert-manager"
-  version    = "1.3.1"
+  version    = "1.4.1"
   namespace  = kubernetes_namespace.cluster_utilities_namespace.id
   wait       = true # wait to allow the webhook be properly configured
 

deploy/complete/terraform/mushop-variables.tf

@@ -51,8 +51,8 @@ variable "create_oci_service_user" {
   description = "Creates OCI Service User. Service user is needed for Email Delivery (Newsletter feature) and Stream services."
 }
 variable "newsletter_subscription_enabled" {
-  default     = true
-  description = "Enables newsletter subscription feature. Deploys API Gateway, Newsletter Function and uses Email Sender service"
+  default     = false
+  description = "(Currently only supported on the US-Ashburn-1 region) Enables newsletter subscription feature. Deploys API Gateway, Newsletter Function and uses Email Sender service"
 }
 variable "newsletter_email_sender" {
   default     = "[email protected]"

deploy/complete/terraform/providers.tf

@@ -7,27 +7,33 @@ terraform {
   required_providers {
     oci = {
       source  = "hashicorp/oci"
-      version = ">= 4.32.0"
+      version = ">= 4.36.0"
+      # https://registry.terraform.io/providers/hashicorp/oci/4.36.0
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
       version = "2.2.0" # Latest version as June 2021 = 2.3.2. Using 2.2.0 (May, 2021) for ORM compatibility
+      # https://registry.terraform.io/providers/hashicorp/kubernetes/2.2.0
     }
     helm = {
       source  = "hashicorp/helm"
       version = "2.1.0" # Latest version as June 2021 = 2.2.0. Using 2.1.0 (March, 2021) for ORM compatibility
+      # https://registry.terraform.io/providers/hashicorp/helm/2.1.0
     }
     tls = {
       source  = "hashicorp/tls"
       version = "3.1.0" # Latest version as June 2021 = 3.1.0.
+      # https://registry.terraform.io/providers/hashicorp/tls/3.1.0
     }
     local = {
       source  = "hashicorp/local"
       version = "2.1.0" # Latest version as June 2021 = 2.1.0.
+      # https://registry.terraform.io/providers/hashicorp/local/2.1.0
     }
     random = {
       source  = "hashicorp/random"
       version = "3.1.0" # Latest version as June 2021 = 3.1.0.
+      # https://registry.terraform.io/providers/hashicorp/random/3.1.0
     }
   }
 }

deploy/complete/terraform/schema.yaml

@@ -217,10 +217,9 @@ variables:
     type: enum
     enum: # Necessary hardcoded supported versions, as ORM does not retrieve the versions from OKE.
     - "Latest"
-    - "v1.19.7"
+    - "v1.20.8"
+    - "v1.19.12"
     - "v1.18.10"
-    - "v1.17.13"
-    - "v1.16.15"
     title: "Kubernetes Version"
     required: true
     visible: