Skip to content

Commit

Permalink
chore: remove unecessary configuration options (#51)
Browse files Browse the repository at this point in the history
## Description

This clears the configuration options that are no longer needed now that
v0.2.0 is out

## Related Issue

Fixes #N/A

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [X] Other (security config, docs update, etc)

## Checklist before merging

- [X] Test, docs, adr added or updated as needed
- [X] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-software-factory/blob/main/CONTRIBUTING.md#developer-workflow)
followed
  • Loading branch information
Racer159 authored May 21, 2024
1 parent bcf594f commit 0542b9a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 150 deletions.
76 changes: 1 addition & 75 deletions bundles/dev/uds-config.yaml
Original file line number Diff line number Diff line change
@@ -1,76 +1,2 @@
# TODO (@WSTARR): We can remove this after the next bundle update
# Place your own variable settings here
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
76 changes: 1 addition & 75 deletions bundles/k3d-demo/uds-config.yaml
Original file line number Diff line number Diff line change
@@ -1,76 +1,2 @@
# TODO (@WSTARR): We can remove this after the next bundle update
# Place your own variable settings here
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

0 comments on commit 0542b9a

Please sign in to comment.