fix config

bundles/dev/uds-bundle.yaml

@@ -164,6 +164,15 @@ packages:
                 requests:
                   cpu: 50m
                   memory: 625M
+            - name: PAGES_RESOURCES
+              description: "GitLab Pages Resources"
+              path: "gitlab.gitlab-pages.resources"
+              default:
+                limits:
+                  memory: 1.5G
+                requests:
+                  cpu: 50m
+                  memory: 625M
             - name: REGISTRY_REPLICAS
               description: "Gitlab Registry Min Replicas"
               path: "registry.hpa.minReplicas"

bundles/dev/uds-config.yaml

@@ -1,75 +1 @@
-variables:
-  postgres-operator:
-    postgresql:
-      enabled: true  # Set to false to not create the PostgreSQL resource
-      teamId: "uds"
-      volume:
-        size: "10Gi"
-      numberOfInstances: 2
-      users:
-        gitlab.gitlab: []  # database owner
-        sonarqube.sonarqube: []  # database owner
-        mattermost.mattermost: []  # database owner
-      databases:
-        gitlabdb: gitlab.gitlab
-        mattermost: mattermost.mattermost
-        sonarqubedb: sonarqube.sonarqube
-      version: "13"
-      ingress:
-        remoteGenerated: Anywhere
-  dev-minio:
-    buckets: |
-      - name: uds-gitlab-artifacts
-      - name: uds-gitlab-backups
-      - name: uds-gitlab-ci-secure-files
-      - name: uds-gitlab-dependency-proxy
-      - name: uds-gitlab-lfs
-      - name: uds-gitlab-mr-diffs
-      - name: uds-gitlab-packages
-      - name: uds-gitlab-pages
-      - name: uds-gitlab-terraform-state
-      - name: uds-gitlab-uploads
-      - name: uds-gitlab-registry
-      - name: uds-gitlab-tmp
-      - name: uds-mattermost-dev
-  sonarqube:
-    sonarqube_db_endpoint: "pg-cluster.postgres.svc.cluster.local"
-  gitlab:
-    GITLAB_SSO_ENABLED: false
-    gitlab_redis_endpoint: "redis-master.dev-redis.svc.cluster.local"
-    gitlab_db_endpoint: "pg-cluster.postgres.svc.cluster.local"
-    DISABLE_REGISTRY_REDIRECT: "true"
-    # # Overrides for scaled down cluster for local dev and CI
-    webservice_replicas: 1
-    toolbox_resources:
-      limits:
-        cpu: 2000m
-        memory: 3584M
-      requests:
-        cpu: 500m
-        memory: 1000M
-    webservice_resources:
-      limits:
-        memory: 2.5G
-      requests:
-        cpu: 300m
-        memory: 2.5G
-    migrations_resources:
-      limits:
-        cpu: 500m
-        memory: 4G
-    workhorse_resources:
-      limits:
-        memory: 100M
-      requests:
-        cpu: 10m
-        memory: 10M
-    sidekiq_replicas: 1
-    sidekiq_resources:
-      limits:
-        memory: 1.5G
-      requests:
-        cpu: 50m
-        memory: 625M
-    registry_replicas: 1
-    shell_replicas: 1
+# Add your own configuration here - see overrides in the uds-bundle.yaml for some common configuration options.

bundles/k3d-demo/uds-bundle.yaml

@@ -154,6 +154,15 @@ packages:
                 requests:
                   cpu: 50m
                   memory: 625M
+            - name: PAGES_RESOURCES
+              description: "GitLab Pages Resources"
+              path: "gitlab.gitlab-pages.resources"
+              default:
+                limits:
+                  memory: 1.5G
+                requests:
+                  cpu: 50m
+                  memory: 625M
             - name: REGISTRY_REPLICAS
               description: "Gitlab Registry Min Replicas"
               path: "registry.hpa.minReplicas"

bundles/k3d-demo/uds-config.yaml

@@ -1,75 +1 @@
-variables:
-  postgres-operator:
-    postgresql:
-      enabled: true  # Set to false to not create the PostgreSQL resource
-      teamId: "uds"
-      volume:
-        size: "10Gi"
-      numberOfInstances: 2
-      users:
-        gitlab.gitlab: []  # database owner
-        sonarqube.sonarqube: []  # database owner
-        mattermost.mattermost: []  # database owner
-      databases:
-        gitlabdb: gitlab.gitlab
-        mattermost: mattermost.mattermost
-        sonarqubedb: sonarqube.sonarqube
-      version: "13"
-      ingress:
-        remoteGenerated: Anywhere
-  dev-minio:
-    buckets: |
-      - name: uds-gitlab-artifacts
-      - name: uds-gitlab-backups
-      - name: uds-gitlab-ci-secure-files
-      - name: uds-gitlab-dependency-proxy
-      - name: uds-gitlab-lfs
-      - name: uds-gitlab-mr-diffs
-      - name: uds-gitlab-packages
-      - name: uds-gitlab-pages
-      - name: uds-gitlab-terraform-state
-      - name: uds-gitlab-uploads
-      - name: uds-gitlab-registry
-      - name: uds-gitlab-tmp
-      - name: uds-mattermost-dev
-  sonarqube:
-    sonarqube_db_endpoint: "pg-cluster.postgres.svc.cluster.local"
-  gitlab:
-    GITLAB_SSO_ENABLED: false
-    gitlab_redis_endpoint: "redis-master.dev-redis.svc.cluster.local"
-    gitlab_db_endpoint: "pg-cluster.postgres.svc.cluster.local"
-    DISABLE_REGISTRY_REDIRECT: "true"
-    # # Overrides for scaled down cluster for local dev and CI
-    webservice_replicas: 1
-    webservice_resources:
-      limits:
-        memory: 2.5G
-      requests:
-        cpu: 300m
-        memory: 2.5G
-    toolbox_resources:
-      limits:
-        cpu: 2000m
-        memory: 3584M
-      requests:
-        cpu: 500m
-        memory: 1000M
-    migrations_resources:
-      limits:
-        cpu: 500m
-        memory: 4G
-    workhorse_resources:
-      limits:
-        memory: 100M
-      requests:
-        cpu: 10m
-        memory: 10M
-    sidekiq_replicas: 1
-    sidekiq_resources:
-      limits:
-        memory: 1.5G
-      requests:
-        cpu: 50m
-        memory: 625M
-    registry_replicas: 1
-    shell_replicas: 1
+# Add your own configuration here - see overrides in the uds-bundle.yaml for some common configuration options.