feat: add configurable overrides for GitLab resource limits (#34)

fix: add missing gitlab redis istio injection * Add overrides for GitLab resource limits * Update uds-config/uds-core-swf/dev-cluster/uds-config.yaml * Update uds-config/uds-core-swf/test-cluster/uds-config.yaml --------- Co-authored-by: Opnauticus <[email protected]>
defenseunicorns · Mar 7, 2024 · 790194e · 790194e
1 parent af3dd7b
commit 790194e
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 6 deletions.
diff --git a/bundles/uds-core-swf/uds-bundle.yaml b/bundles/uds-core-swf/uds-bundle.yaml
@@ -136,6 +136,37 @@ packages:
   - name: gitlab
     repository: ghcr.io/defenseunicorns/packages/uds/gitlab
     ref: 16.8.1-uds.2-registry1
+    overrides:
+      gitlab:
+        gitlab:
+          variables:
+            - name: MIGRATIONS_RESOURCES
+              description: "Gitlab Migrations Resources"
+              path: "gitlab.migrations.resources"
+            - name: WEBSERVICE_REPLICAS
+              description: "Gitlab Webservice Min Replicas"
+              path: "gitlab.webservice.minReplicas"
+            - name: WEBSERVICE_RESOURCES
+              description: "Gitlab Webservice Resources"
+              path: "gitlab.webservice.resources"
+            - name: WORKHORSE_RESOURCES
+              description: "Gitlab Workhorse Resources"
+              path: "gitlab.workhorse.resources"
+            - name: SIDEKIQ_REPLICAS
+              description: "Gitlab Sidekiq Min Replicas"
+              path: "gitlab.sidekiq.minReplicas"
+            - name: SIDEKIQ_RESOURCES
+              description: "Gitlab Sidekiq Resources"
+              path: "gitlab.sidekiq.resources"
+            - name: GITALY_RESOURCES
+              description: "Gitlab Gitaly Resources"
+              path: "gitlab.gitaly.resources"
+            - name: REGISTRY_REPLICAS
+              description: "Gitlab Registry Min Replicas"
+              path: "registry.hpa.minReplicas"
+            - name: SHELL_REPLICAS
+              description: "Gitlab Shell Min Replicas"
+              path: "gitlab.gitlab-shell.minReplicas"
 
   # Gitlab Runner
   - name: gitlab-runner

diff --git a/packages/namespaces/values.yaml b/packages/namespaces/values.yaml
@@ -2,10 +2,7 @@ namespaces:
   - name: gitlab
     labels:
       istio-injection: enabled
-  - name: gitlab-redis
-    labels:
-      istio-injection: enabled
-  - name: gitlab-minio
+  - name: dev-redis
     labels:
       istio-injection: enabled
   - name: gitlab-runner-sandbox

diff --git a/tasks.yaml b/tasks.yaml
@@ -22,11 +22,11 @@ tasks:
   ################
   - name: deploy-bundle-to-dev
     actions:
-      - task: deploy:uds-core-bundle-to-dev
+      - task: deploy:bundle-to-dev
 
   - name: deploy-bundle-to-test
     actions:
-      - task: deploy:uds-core-bundle-test
+      - task: deploy:bundle-to-test
 
   #### Clean ####
   - name: clean

diff --git a/uds-config/uds-core-swf/dev-cluster/uds-config.yaml b/uds-config/uds-core-swf/dev-cluster/uds-config.yaml
@@ -39,6 +39,39 @@ variables:
     GITLAB_BACKUP_EXTRA_ARGS: "--skip artifiacts,registry"
     BUCKET_SUFFIX: "-dev"
     GITLAB_REDIS_ENDPOINT: "redis-master.dev-redis.svc.cluster.local"
+    WEBSERVICE_REPLICAS: 2
+    WEBSERVICE_RESOURCES:
+      limits:
+        cpu: 8000m
+        memory: 8G
+      requests:
+        cpu: 8000m
+        memory: 8G
+    MIGRATIONS_RESOURCES:
+      limits:
+        cpu: 500m
+        memory: 4G
+    WORKHORSE_RESOURCES:
+      limits:
+        memory: 100M
+      requests:
+        cpu: 10m
+        memory: 10M
+    SIDEKIQ_REPLICAS: 1
+    SIDEKIQ_RESOURCES:
+      limits:
+        cpu: 4000m
+        memory: 15G
+      requests:
+        cpu: 4000m
+        memory: 15G
+    GITALY_RESOURCES:
+      limits:
+        cpu: 4000m
+        memory: 15G
+      requests:
+        cpu: 4000m
+        memory: 15G
   sonarqube-database-secret:
     SONARQUBE_DB_PASSWORD: "replace-me-db-passwords"
   sonarqube:

diff --git a/uds-config/uds-core-swf/test-cluster/uds-config.yaml b/uds-config/uds-core-swf/test-cluster/uds-config.yaml
@@ -41,6 +41,39 @@ variables:
     GITLAB_BACKUP_EXTRA_ARGS: "--skip artifiacts,registry"
     BUCKET_SUFFIX: "-test"
     GITLAB_REDIS_ENDPOINT: "redis-master.dev-redis.svc.cluster.local"
+    WEBSERVICE_REPLICAS: 2
+    WEBSERVICE_RESOURCES:
+      limits:
+        cpu: 8000m
+        memory: 8G
+      requests:
+        cpu: 8000m
+        memory: 8G
+    MIGRATIONS_RESOURCES:
+      limits:
+        cpu: 500m
+        memory: 4G
+    WORKHORSE_RESOURCES:
+      limits:
+        memory: 100M
+      requests:
+        cpu: 10m
+        memory: 10M
+    SIDEKIQ_REPLICAS: 1
+    SIDEKIQ_RESOURCES:
+      limits:
+        cpu: 4000m
+        memory: 15G
+      requests:
+        cpu: 4000m
+        memory: 15G
+    GITALY_RESOURCES:
+      limits:
+        cpu: 4000m
+        memory: 15G
+      requests:
+        cpu: 4000m
+        memory: 15G
   sonarqube-database-secret:
     SONARQUBE_DB_PASSWORD: "replace-me-db-passwords"
   sonarqube: