fix(nubus): Remove superfluous variables

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:
+    seLinuxOptions:
-        {{ .Values.seLinuxOptions.umsPortalConsumer | toYaml | nindent 8 }}
+      {{ .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 }}

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

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

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: ~
 ...