From a7d3d2585ca73543902d5240f3629bc4e1bc4fe8 Mon Sep 17 00:00:00 2001
From: Dominik Kaminski <dominik.kaminski.extern@zendis.de>
Date: Thu, 26 Sep 2024 10:21:24 +0200
Subject: [PATCH] fix(nubus): Remove superfluous variables

---
 .../values-opendesk-customization.yaml.gotmpl | 18 ++---
 helmfile/environments/default/replicas.yaml   |  2 -
 helmfile/environments/default/resources.yaml  | 81 +++----------------
 helmfile/environments/default/selinux.yaml    |  8 --
 4 files changed, 21 insertions(+), 88 deletions(-)

diff --git a/helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl b/helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl
index 816a322e..f198a976 100644
--- a/helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl
@@ -242,7 +242,7 @@ nubusPortalConsumer:
   portalConsumer:
     image:
       pullSecrets:
-        {{ .Values.global.imagePullSecrets | toYaml | nindent 6 }}
+        {{ .Values.global.imagePullSecrets | toYaml | nindent 8 }}
   podAnnotations:
     intents.otterize.com/service-name: "ums-portal-consumer"
   replicaCount: {{ .Values.replicas.umsPortalConsumer }}
@@ -256,8 +256,8 @@ nubusPortalConsumer:
   securityContext:
     seccompProfile:
       type: "RuntimeDefault"
-      seLinuxOptions:
-        {{ .Values.seLinuxOptions.umsPortalConsumer | toYaml | nindent 8 }}
+    seLinuxOptions:
+      {{ .Values.seLinuxOptions.umsPortalConsumer | toYaml | nindent 6 }}
 
 nubusUdmListener:
   containerSecurityContext:
@@ -593,24 +593,24 @@ nubusProvisioning:
     imagePullSecrets:
       {{ .Values.global.imagePullSecrets | toYaml | nindent 6 }}
     resources:
-      {{ .Values.resources.nubusProvisioning.nats | toYaml | nindent 6 }}
+      {{ .Values.resources.umsProvisioningNats | toYaml | nindent 6 }}
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-nats"
     serviceAccount:
       create: true
   api:
     resources:
-      {{ .Values.resources.nubusProvisioning.api | toYaml | nindent 6 }}
+      {{ .Values.resources.umsProvisioningApi | toYaml | nindent 6 }}
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-api"
   dispatcher:
     resources:
-      {{ .Values.resources.nubusProvisioning.dispatcher | toYaml | nindent 6 }}
+      {{ .Values.resources.umsProvisioningDispatcher | toYaml | nindent 6 }}
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-dispatcher"
   prefill:
     resources:
-      {{ .Values.resources.nubusProvisioning.prefill | toYaml | nindent 6 }}
+      {{ .Values.resources.umsProvisioningPrefill | toYaml | nindent 6 }}
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-prefill"
   registerConsumers:
@@ -618,9 +618,9 @@ nubusProvisioning:
       intents.otterize.com/service-name: "ums-provisioning-register-consumers"
   udmTransformer:
     resources:
-      {{ .Values.resources.nubusProvisioning.udmTransformer | toYaml | nindent 6 }}
+      {{ .Values.resources.umsProvisioningUdmTransformer | toYaml | nindent 6 }}
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-udm-transformer"
   resources:
     registerConsumers:
-      {{ .Values.resources.nubusProvisioning.registerConsumers | toYaml | nindent 6 }}
+      {{ .Values.resources.umsProvisioningRegisterConsumers | toYaml | nindent 6 }}
diff --git a/helmfile/environments/default/replicas.yaml b/helmfile/environments/default/replicas.yaml
index aa23c87b..eb75d2c6 100644
--- a/helmfile/environments/default/replicas.yaml
+++ b/helmfile/environments/default/replicas.yaml
@@ -111,8 +111,6 @@ replicas:
   umsProvisioningUdmTransformer: 1
   # -- scalable: tbd
   umsSelfserviceConsumer: 1
-  # -- scalable: tbd
-  umsStackGateway: 1
   # -- scalable: true
   umsUdmListener: 1
   # -- scalable: tbd
diff --git a/helmfile/environments/default/resources.yaml b/helmfile/environments/default/resources.yaml
index 7520dee8..3d5c7d16 100644
--- a/helmfile/environments/default/resources.yaml
+++ b/helmfile/environments/default/resources.yaml
@@ -225,49 +225,6 @@ resources:
     requests:
       cpu: 0.1
       memory: "512Mi"
-  nubusProvisioning:
-    nats:
-      limits:
-        cpu: 288
-        memory: "1Gi"
-      requests:
-        cpu: 0.1
-        memory: "128Mi"
-    dispatcher:
-      limits:
-        cpu: 1
-        memory: "1Gi"
-      requests:
-        cpu: 0.1
-        memory: "64Mi"
-    registerConsumers:
-      limits:
-        cpu: 1
-        memory: "1Gi"
-      requests:
-        cpu: 0.1
-        memory: "64Mi"
-    udmTransformer:
-      limits:
-        cpu: 1
-        memory: "1Gi"
-      requests:
-        cpu: 0.1
-        memory: "64Mi"
-    prefill:
-      limits:
-        cpu: 1
-        memory: "1Gi"
-      requests:
-        cpu: 0.1
-        memory: "64Mi"
-    api:
-      limits:
-        cpu: 1
-        memory: "1Gi"
-      requests:
-        cpu: 0.1
-        memory: "100Mi"
   openproject:
     limits:
       cpu: 99
@@ -478,13 +435,6 @@ resources:
     requests:
       cpu: 0.1
       memory: "256Mi"
-  umsLdapServerInit:
-    limits:
-      cpu: 99
-      memory: "1Gi"
-    requests:
-      cpu: 0.1
-      memory: "256Mi"
   umsNotificationsApi:
     limits:
       cpu: 99
@@ -520,13 +470,13 @@ resources:
     requests:
       cpu: 0.1
       memory: "256Mi"
-  umsProvisioningEventsAndConsumerApi:
+  umsProvisioningApi:
     limits:
       cpu: 99
       memory: "1Gi"
     requests:
       cpu: 0.1
-      memory: "256Mi"
+      memory: "100Mi"
   umsProvisioningDispatcher:
     limits:
       cpu: 99
@@ -541,20 +491,27 @@ resources:
     requests:
       cpu: 0.1
       memory: "256Mi"
-  umsProvisioningUdmListener:
+  umsProvisioningRegisterConsumers:
     limits:
       cpu: 99
       memory: "1Gi"
     requests:
       cpu: 0.1
-      memory: "256Mi"
+      memory: "64Mi"
+  umsProvisioningUdmTransformer:
+    limits:
+      cpu: 99
+      memory: "1Gi"
+    requests:
+      cpu: 0.1
+      memory: "64Mi"
   umsProvisioningNats:
     limits:
       cpu: 99
       memory: "1Gi"
     requests:
       cpu: 0.1
-      memory: "256Mi"
+      memory: "128Mi"
   umsSelfserviceConsumer:
     limits:
       cpu: 99
@@ -562,13 +519,6 @@ resources:
     requests:
       cpu: 0.1
       memory: "256Mi"
-  umsSelfserviceListenerDependencies:
-    limits:
-      cpu: 99
-      memory: "1Gi"
-    requests:
-      cpu: 0.1
-      memory: "256Mi"
   umsStackDataUms:
     limits:
       cpu: 99
@@ -576,13 +526,6 @@ resources:
     requests:
       cpu: 0.1
       memory: "256Mi"
-  umsStackGateway:
-    limits:
-      cpu: 99
-      memory: "64Mi"
-    requests:
-      cpu: 0.1
-      memory: "16Mi"
   umsUdmListener:
     limits:
       cpu: 99
diff --git a/helmfile/environments/default/selinux.yaml b/helmfile/environments/default/selinux.yaml
index 097eb6a8..bcc02f3f 100644
--- a/helmfile/environments/default/selinux.yaml
+++ b/helmfile/environments/default/selinux.yaml
@@ -60,11 +60,7 @@ seLinuxOptions:
   prosody: ~
   redis: ~
   synapse: ~
-  synapseCreateUser: ~
-  synapseGuestModule: ~
   synapseWeb: ~
-  umsConfigHtpasswd: ~
-  umsDataLoader: ~
   umsGuardianAuthorizationApi: ~
   umsGuardianManagementApi: ~
   umsGuardianManagementUi: ~
@@ -81,16 +77,12 @@ seLinuxOptions:
   umsPortalServer: ~
   umsProvisioning: ~
   umsProvisioningNats: ~
-  umsSelfserviceInvitation: ~
   umsSelfserviceConsumer: ~
   umsStackDataUms: ~
-  umsStackGateway: ~
-  umsStoreDav: ~
   umsUdmListener: ~
   umsUdmRestApi: ~
   umsUmcGateway: ~
   umsUmcServer: ~
-  umsWaitForDependency: ~
   wellKnown: ~
   xwiki: ~
 ...