Merge pull request #4 from Aguafrommars/user/ole

User/ole
Aguafrommars · Mar 21, 2022 · df2e3b5 · df2e3b5
2 parents 21a56a8 + 15e1a7d
commit df2e3b5
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -14,10 +14,10 @@ You can follow the [Create an HTTPS ingress controller on Azure Kubernetes Servi
 
 The module setup ingresses for [TheIdServer](https://github.com/Aguafrommars/TheIdServer) and [Seq](https://datalust.co/) using the **host** input variable.
 
-```
+``` hcl
 provider "helm" {
   kubernetes {
-    config_path = "C:/Users/LefebvreO/.kube/config"
+    config_path = var.kubeconfig_path
   }
 }
 
@@ -40,7 +40,7 @@ By default resouces are created in the *theidserver* namespace.
 By default the [TheIdServer helm chart](https://artifacthub.io/packages/helm/aguafrommars/theidserver) install the [IdentityServer4](https://github.com/Aguafrommars/TheIdServer/blob/master/src/Aguacongas.TheIdServer.IS4/README.md) version.  
 If you prefer to use the [Duende IdentityServer](https://github.com/Aguafrommars/TheIdServer/blob/master/src/Aguacongas.TheIdServer.Duende/README.md) version configure the **image** input to override the default docker image configuration.
 
-```
+``` hcl
 module "theidserver" {
   source = "Aguafrommars/theidserver/helm"
 
@@ -74,7 +74,7 @@ SE!OfFGOm}(5v3wF
 [TheIdServer](https://github.com/Aguafrommars/TheIdServer) needs to send email to verify users emails or for CIBA. The default Email service implementation use [SendGrid](https://sendgrid.com/) and read user and API key from configuration.  
 The **env_settings** input can be use to pass environments variables to containers, so we can ovveride the configuration using environment variables. 
 
-```
+``` hcl
 module "theidserver" {
   source = "Aguafrommars/theidserver/helm"
 
@@ -92,7 +92,7 @@ This sample setup [SendGrid](https://sendgrid.com/) environment variables used b
 
 If you want to use your Email sender, you need to implement a web api and setup its url. [Read the doc](https://github.com/Aguafrommars/TheIdServer/blob/master/src/Aguacongas.TheIdServer.Duende/README.md#use-your-api). 
 
-```
+``` hcl
 module "theidserver" {
   source = "Aguafrommars/theidserver/helm"
 
@@ -112,7 +112,7 @@ This sampel setup the Email Sender url using environment variable.
 
 You can use the **override_setting** input to override the [TheIdServer helm chart](https://artifacthub.io/packages/helm/aguafrommars/theidserver).
 
-```
+``` hcl
 module "theidserver" {
   source = "Aguafrommars/theidserver/helm"
 
@@ -135,8 +135,8 @@ This sample setup the Email Sender url using the appsettings.json file.
 
 ## Inputs
 
-|Name|Description|Type|Default|
-|-|-|-|-|
+|Name|Description|Type|Default|  
+|----|-----------|----|-------|  
 |host|The host|string||
 |tls_issuer_name|The name of the certificat issuer to use|string||
 |tls_issuer_kind|The kind of the certificat issuer to use (Issuer or ClusterIssuer)|string||
@@ -154,8 +154,8 @@ This sample setup the Email Sender url using the appsettings.json file.
 
 ## Outputs
 
-|Name|Description|Type|Sensitive|
-|-|-|-|-|
+|Name|Description|Type|Sensitive|  
+|----|-----------|----|---------|  
 |admin_name|The generated admin user name|string|false|
 |admin_password|The generated admin user password|string|true|
 

diff --git a/examples/basic usage/README.nd → examples/basic-usage/README.md b/examples/basic usage/README.nd → examples/basic-usage/README.md
@@ -1,6 +1,6 @@
 # Basic usage
 
-```
+``` hcl
 provider "helm" {
   kubernetes {
     config_path = "C:/Users/LefebvreO/.kube/config"

diff --git a/examples/basic usage/main.tf → examples/basic-usage/main.tf b/examples/basic usage/main.tf → examples/basic-usage/main.tf
diff --git a/examples/basic usage/variables.tf → examples/basic-usage/variables.tf b/examples/basic usage/variables.tf → examples/basic-usage/variables.tf
diff --git a/examples/override settings/README.nd → examples/override-settings/README.md b/examples/override settings/README.nd → examples/override-settings/README.md
@@ -2,7 +2,7 @@
 
 This sample override the Email sender API url with the url passed in input.
 
-```
+``` hcl
 provider "helm" {
   kubernetes {
     config_path = var.kubeconfig_path

diff --git a/examples/override settings/main.tf → examples/override-settings/main.tf b/examples/override settings/main.tf → examples/override-settings/main.tf
diff --git a/examples/override settings/variables.tf → examples/override-settings/variables.tf b/examples/override settings/variables.tf → examples/override-settings/variables.tf
diff --git a/examples/set docker image/README.nd → examples/set-docker-image/README.md b/examples/set docker image/README.nd → examples/set-docker-image/README.md
@@ -2,7 +2,7 @@
 
 This sample use the lastest built Duende version.
 
-```
+``` hcl
 provider "helm" {
   kubernetes {
     config_path = var.kubeconfig_path

diff --git a/examples/set docker image/main.tf → examples/set-docker-image/main.tf b/examples/set docker image/main.tf → examples/set-docker-image/main.tf
diff --git a/examples/set docker image/variables.tf → examples/set-docker-image/variables.tf b/examples/set docker image/variables.tf → examples/set-docker-image/variables.tf
diff --git a/examples/set env vars/README.nd → examples/set-env-vars/README.md b/examples/set env vars/README.nd → examples/set-env-vars/README.md
@@ -2,7 +2,7 @@
 
 This sample set SendGrid credentials from input through env vars.
 
-```
+``` hcl
 provider "helm" {
   kubernetes {
     config_path = "C:/Users/LefebvreO/.kube/config"

diff --git a/examples/set env vars/main.tf → examples/set-env-vars/main.tf b/examples/set env vars/main.tf → examples/set-env-vars/main.tf
diff --git a/examples/set env vars/variables.tf → examples/set-env-vars/variables.tf b/examples/set env vars/variables.tf → examples/set-env-vars/variables.tf
diff --git a/main.tf b/main.tf
@@ -180,9 +180,6 @@ locals {
       welcomeContenUrl = format("https://www.%s/api/welcomefragment", var.host)
     }
     replicaCount = var.replica_count
-    podAnnotations = {
-      deployment-date = timestamp()
-    }
     ingress = {
       enabled = true
       annotations = {
@@ -271,7 +268,7 @@ locals {
 resource "helm_release" "theidserver" {
   name       = var.release_name
   repository = "https://aguafrommars.github.io/helm"
-  chart      = "theidserver"
+  chart      = "C:\\Projects\\Perso\\helm\\charts\\theidserver"
   version    = var.chart_version
   namespace  = var.namespace
   create_namespace = var.create_namespace