Cleanup terraform values

Adjust to new helm chart changes added with eclipse-theia/theia-cloud-helm#52.
Move values file into `terraform/values`.
Remove outdated `helm` directory.

Contributed on behalf of STMicroelectronics

CHANGELOG.md

@@ -13,6 +13,7 @@
   - Remove `timeout.strategy` from AppDefinition
     - `AppDefinition.v1beta9`: Removed `timeout.strategy` and `timeout.limit` is now just `timeout`. This was done, as there is only one Strategy left.
 - [java] Update io.fabric8.kubernetes-client to version 6.10.0. Also update Quarkus platform to 3.8.1. This provides kubernetes 1.29 support [#287](https://github.com/eclipsesource/theia-cloud/pull/287)
+- [terraform] Change terraform values to conform to helm chart changes [#289](https://github.com/eclipsesource/theia-cloud/pull/289) | [#52](https://github.com/eclipsesource/theia-cloud-helm/pull/52) - contributed on behalf of STMicroelectronics
 
 ## [0.9.0] - 2024-01-23
 
@@ -28,5 +29,5 @@
 - [All components] Clean up repository [#275](https://github.com/eclipsesource/theia-cloud/pull/275) - contributed on behalf of STMicroelectronics
 
 ## [0.8.1] - 2023-10-01
-  
+
 - Last Milestone based version. No changelog available due to alpha-phase.

documentation/Install.md

@@ -53,7 +53,7 @@ NAMESPACE       NAME                                 TYPE           CLUSTER-IP
 ingress-nginx   ingress-nginx-controller             LoadBalancer   10.52.4.129    34.141.62.32   80:32507/TCP,443:32114/TCP   11m
 ```
 
-Open `./helm/theia.cloud/valuesGKETryNow.yaml` and update the host section to use `subdomain.34.141.62.32.nip.io`:
+Open `./terraform/values/valuesDemo.yaml` and update the host section to use `subdomain.34.141.62.32.nip.io`:
 
 ```yaml
 hosts:

terraform/modules/helm/theia-cloud.yaml

@@ -4,12 +4,14 @@ app:
   id: asdfghjkl
   name: Theia Cloud
 
-image:
+demoApplication:
   name: theiacloud/theia-cloud-demo:0.10.0-next
   pullSecret: ""
   timeoutStrategy: "FIXEDTIME"
   timeoutLimit: "30"
   imagePullPolicy: IfNotPresent
+  # This overrides the default value and does not write the default values to the app definition
+  monitor: null
 
 hosts:
   usePaths: true
@@ -43,6 +45,3 @@ ingress:
 
 monitor:
   enable: false
-  activityTracker:
-    enable: true
-    interval: 1

terraform/test-configurations/2-01_try-now/theia_cloud.tf

@@ -30,7 +30,7 @@ resource "helm_release" "theia-cloud" {
   create_namespace = true
 
   values = [
-    "${file("${path.module}/../../../helm/theia.cloud/valuesGKETryNow.yaml")}"
+    "${file("${path.module}/../../values/valuesDemo.yaml")}"
   ]
 
   set {
@@ -100,11 +100,6 @@ resource "kubectl_manifest" "cdt-cloud-demo" {
     uid: 101
     uplinkLimit: 30000
     mountPath: /home/project/persisted
-    monitor:
-      port: 8081
-      activityTracker:
-        timeoutAfter: 30
-        notifyAfter: 25
   EOF
 }
 
@@ -134,10 +129,5 @@ resource "kubectl_manifest" "coffee-editor" {
     uid: 1001
     uplinkLimit: 30000
     mountPath: /home/project/persisted
-    monitor:
-      port: 8081
-      activityTracker:
-        timeoutAfter: 30
-        notifyAfter: 25
   EOF
 }

terraform/test-configurations/2-02_monitor/theia_cloud.tf

@@ -32,7 +32,7 @@ resource "helm_release" "theia-cloud" {
   create_namespace = true
 
   values = [
-    "${file("${path.module}/../../../helm/theia.cloud/valuesMonitor.yaml")}"
+    "${file("${path.module}/../../values/valuesMonitor.yaml")}"
   ]
 
   set {
@@ -76,12 +76,12 @@ resource "helm_release" "theia-cloud" {
   }
 
   set {
-    name  = "image.name"
+    name  = "demoApplication.name"
     value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.10.0-next" : "theiacloud/theia-cloud-activity-demo-theia:0.10.0-next"
   }
 
   set {
-    name  = "monitor.port"
+    name  = "demoApplication.monitor.port"
     value = var.use_vscode_extension ? 8081 : 3000
   }