restructure terraform for oke

Author: paliwalparitosh

logan/terraform/inputs.tf

@@ -1,12 +1,11 @@
 
-resource "helm_release" "la-release" {
-  name  = "my-la-release"
-  chart = "${path.module}/../helm-chart"
-  #repository = "https://github.com/oracle-quickstart/oci-kubernetes-monitoring"
+resource "helm_release" "oci-kubernetes-monitoring" {
+  name  = "oci-kubernetes-monitoring"
+  chart = "${path.module}/../../helm-chart"
 
   set {
     name  = "image.url"
-    value = var.oke_containerImage_url
+    value = var.container_image_url
   }
 
   set {
@@ -21,17 +20,17 @@ resource "helm_release" "la-release" {
 
   set {
     name  = "namespace"
-    value = var.oke_namespace
+    value = var.kubernetes_namespace
   }
 
   set {
     name  = "ociLANamespace"
-    value = var.la_namespace
+    value = var.oci_la_namespace
   }
 
   set {
     name  = "ociLALogGroupID"
-    value = var.la_logGroup_id
+    value = var.oci_la_logGroup_id
   }
 
   set {
@@ -43,6 +42,4 @@ resource "helm_release" "la-release" {
     name  = "fluentd.baseDir"
     value = var.fluentd_baseDir_path
   }
-
-
 }

logan/terraform/helm.tf renamed to logan/terraform/oke/helm.tf

@@ -0,0 +1,59 @@
+# When defined in the Terraform configuration, the following variables automatically prepopulate with values on the Console pages used to create and edit the stack. 
+# The stack's values are used when you select the Terraform actions Plan, Apply, and Destroy.
+# - tenancy_ocid (tenancy OCID)
+# - region (region)
+#
+# Ref - https://docs.oracle.com/en-us/iaas/Content/ResourceManager/Concepts/terraformconfigresourcemanager_topic-schema.htm#console-howto__prepop
+
+
+variable "tenancy_ocid" {
+  type = string
+}
+
+variable "region" {
+  type = string
+}
+
+####
+##  Inputs for deploying helm-chart
+####
+
+# OKE Cluster Compartment
+variable "oke_cluster_compartment" {
+  type = string
+}
+
+# OKE Cluster OCID
+variable "oke_cluster_ocid" {
+  type = string
+}
+
+# OKE Cluster Name
+variable "oke_cluster_name" {
+  type = string
+}
+
+# OCI LA Fluentd Container Image
+variable "container_image_url" {
+  type = string
+}
+
+# Kubernetes Namespace
+variable "kubernetes_namespace" {
+  type = string
+}
+
+# Fluentd Base Directory
+variable "fluentd_baseDir_path" {
+  type = string
+}
+
+# OCI Logging Analytics Namespace
+variable "oci_la_namespace" {
+  type = string
+}
+
+# OCI Logging Analytics LogGroup OCID
+variable "oci_la_logGroup_id" {
+  type = string
+}

logan/terraform/oke/inputs.tf

@@ -2,12 +2,8 @@ data "oci_containerengine_cluster_kube_config" "oke" {
   cluster_id = var.oke_cluster_ocid
 }
 
-# Local kubeconfig for when using Terraform locally. Not used by Oracle Resource Manager
+# kubeconfig when using Terraform locally. Not used by Oracle Resource Manager
 resource "local_file" "oke_kubeconfig" {
   content  = data.oci_containerengine_cluster_kube_config.oke.content
   filename = "${path.module}/kubeconfig"
-}
-
-# data "local_file" "oke_kubeconfig" {
-#     filename = "${path.module}/kubeconfig"
-# }
+}

logan/terraform/oke.tf renamed to logan/terraform/oke/oke.tf

@@ -1,3 +1,5 @@
+# Update this oci provider when using terraform locally to have all other relevent fields set
+# https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm
 provider "oci" {
   tenancy_ocid = var.tenancy_ocid
   region       = var.region

logan/terraform/providers.tf renamed to logan/terraform/oke/providers.tf

@@ -0,0 +1,106 @@
+title: OCI Kubernetes Monitoring Solution
+description: Monitoring Solution for Kubernetes offered by OCI Logging Analytics
+informationalText: Monitoring Solution for Kubernetes offered by OCI Logging Analytics
+schemaVersion: 1.1.0
+version: "20221004"
+
+# URL of Logo Icon used on Application Information tab. Logo must be 130x130 pixels.
+# (Optional)
+#logoUrl: https://cloudmarketplace.oracle.com/marketplace/content?contentId=53066708
+
+source:
+  type: quickstart
+
+locale: "en"
+
+variableGroups:
+  - title: "Defualt inputs"
+    variables:
+      - tenancy_ocid
+      - region
+    visible: false
+
+  - title: "OKE Cluster Information"
+    variables:
+      - oke_cluster_compartment
+      - oke_cluster_ocid
+      - oke_cluster_name
+      - container_image_url
+      - kubernetes_namespace
+
+  - title: "OCI Logging Analytics Information"
+    variables:
+    - oci_la_namespace
+    - oci_la_logGroup_id
+
+  - title: "Fluentd Configuration"
+    variables:
+      - fluentd_baseDir_path
+
+variables:
+  oke_cluster_compartment:
+    type: oci:identity:compartment:id
+    required: true    
+    title: OKE Cluster Compartment
+    default: compartment_ocid
+
+  oke_cluster_ocid:
+    type: oci:container:cluster:id
+    dependsOn:
+      compartmentId: ${oke_cluster_compartment}
+    title: OKE Cluster
+    required: true
+
+  # string field
+  oke_cluster_name:
+    type: string
+    minLength: 1
+    maxLength: 255
+    title: OKE Cluster Name
+    required: true
+
+  # string field
+  container_image_url:
+    type: string
+    minLength: 1
+    maxLength: 255
+    title: OCI LA Fluentd Container Image
+    description: Image URL of OCI LA Fluentd Container
+    required: true
+
+  # string field
+  kubernetes_namespace:
+    type: string
+    minLength: 1
+    maxLength: 255
+    title: Kubernetes Namespace
+    description: Kubernetes Namespace in which the monitoring solution to be deployed
+    default: kube-system
+    required: true
+
+  # string field
+  fluentd_baseDir_path:
+    type: string
+    maxLength: 255
+    minLength: 1
+    title: Fluentd Base Directory
+    description: Base directory on the node (with read write permission) to store fluentd plugin's related data
+    default: /var/log
+    required: true
+
+  # string field
+  oci_la_namespace:
+    type: string
+    maxLength: 40
+    minLength: 1
+    title: OCI Logging Analytics Namespace
+    required: true
+
+  # string field
+  oci_la_logGroup_id:
+    type: string
+    maxLength: 255
+    minLength: 1
+    title: OCI Logging Analytics LogGroup OCID
+    description: The LogGroup in which the collected log data to be stored
+    required: true