Move controller to TF-service (hobbyfarm#438)

* Move controller to TF-service * Add RBAC rights
svalabs · Jul 11, 2024 · 24180b0 · 24180b0
1 parent a551ddf
commit 24180b0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/charts/hobbyfarm/templates/terraform-service/rbac.yaml b/charts/hobbyfarm/templates/terraform-service/rbac.yaml
@@ -33,6 +33,12 @@ rules:
   - apiGroups: ["terraformcontroller.cattle.io"]
     resources: ["*"]
     verbs: ["*"]
+  - apiGroups: ["hobbyfarm.io"]
+    resources: ["virtualmachines", "virtualmachines/status"]
+    verbs: ["*"]
+  - apiGroups: ["apps"]
+    resources: ["statefulsets"]
+    verbs: ["list", "get", "watch"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

diff --git a/...mplates/terraform-service/deployment.yaml → ...plates/terraform-service/statefulset.yaml b/...mplates/terraform-service/deployment.yaml → ...plates/terraform-service/statefulset.yaml
@@ -1,11 +1,12 @@
 {{ if .Values.terraform.enabled }}
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: terraform-service
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ $.Values.terraform.service.replicas }}
+  serviceName: terraform-service-grpc
   selector:
     matchLabels:
       component: terraform-service
@@ -32,6 +33,10 @@ spec:
               value: {{ .Release.Namespace | quote }}
             - name: GRPC_PORT
               value: "8080"
+            - name: STATEFULSET_NAME
+              value: "terraform-service"
+            - name: CONTROLLER_THREAD_COUNT
+              value: {{ .Values.terraform.service.controllerWorkerThreadCount | quote }}
           ports:
           - containerPort: 8080
           volumeMounts:

diff --git a/...arm/templates/vm-service/statefulset.yaml → ...farm/templates/vm-service/deployment.yaml b/...arm/templates/vm-service/statefulset.yaml → ...farm/templates/vm-service/deployment.yaml
@@ -1,11 +1,10 @@
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: vm-service
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ $.Values.vm.replicas }}
-  serviceName: "vm-service"
   selector:
     matchLabels:
       component: vm-service

diff --git a/charts/hobbyfarm/templates/vm-service/rbac.yaml b/charts/hobbyfarm/templates/vm-service/rbac.yaml
@@ -29,12 +29,6 @@ rules:
   - apiGroups: [""]
     resources: ["*"]
     verbs: ["*"]
-  - apiGroups: ["hobbyfarm.io"]
-    resources: ["virtualmachines", "virtualmachines/status"]
-    verbs: ["*"]
-  - apiGroups: ["apps"]
-    resources: ["statefulsets"]
-    verbs: ["list", "get", "watch"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

diff --git a/charts/hobbyfarm/values.yaml b/charts/hobbyfarm/values.yaml
@@ -123,6 +123,7 @@ terraform:
   service:
     image: hobbyfarm/terraform-service:v3.2.0
     replicas: 1
+    controllerWorkerThreadCount: 1
     logLevel: "0"
     serviceAccountName: "hobbyfarm-terraform"
 user:
@@ -135,7 +136,6 @@ user:
 vm:
   image: hobbyfarm/vm-service:v3.2.0
   replicas: 1
-  controllerWorkerThreadCount: 1
   logLevel: "0"
   apiPort: 80
   serviceAccountName: "hobbyfarm-vm"