UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit ae93cb2a authored by Branden Cobb's avatar Branden Cobb
Browse files

Merge branch 'blloyd_argocd_cypress_fix' into 'master'

SKIP UPGRADE Blloyd argocd cypress fix

Closes platform-one/big-bang/apps/core/argocd#17

See merge request platform-one/big-bang/bigbang!1072
parents 59114153 50a3aab3
No related branches found
No related tags found
2 merge requests!1386Master,!1072SKIP UPGRADE Blloyd argocd cypress fix
Pipeline #586262 passed with warnings
...@@ -491,7 +491,7 @@ addons: ...@@ -491,7 +491,7 @@ addons:
git: git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git
path: "./chart" path: "./chart"
tag: "3.6.8-bb.11" tag: "3.6.8-bb.12"
# -- Flux reconciliation overrides specifically for the ArgoCD Package # -- Flux reconciliation overrides specifically for the ArgoCD Package
flux: {} flux: {}
......
...@@ -135,6 +135,8 @@ gatekeeper: ...@@ -135,6 +135,8 @@ gatekeeper:
excludedResources: excludedResources:
# Allows k3d load balancer containers to pull from public repos # Allows k3d load balancer containers to pull from public repos
- istio-system/lb-port-.* - istio-system/lb-port-.*
# Allow argocd to deploy a test app in its cypress test
- argocd/guestbook-ui.*
allowedSecCompProfiles: allowedSecCompProfiles:
parameters: parameters:
excludedResources: excludedResources:
...@@ -385,15 +387,15 @@ addons: ...@@ -385,15 +387,15 @@ addons:
redis-bb: redis-bb:
master: master:
persistence: persistence:
size: 256Mi size: 512Mi
replica: replica:
persistence: persistence:
size: 256Mi size: 512Mi
redis: redis:
resources: resources:
requests: requests:
cpu: 50m cpu: 50m
memory: 64Mi memory: 256Mi
limits: {} limits: {}
server: server:
resources: resources:
...@@ -411,9 +413,7 @@ addons: ...@@ -411,9 +413,7 @@ addons:
secret: secret:
argocdServerAdminPassword: '$2a$10$rUDZDckdDZ2TEwk9PDs3QuqjkL58qR1IHE1Kj4MwDx.7/m5dytZJm' argocdServerAdminPassword: '$2a$10$rUDZDckdDZ2TEwk9PDs3QuqjkL58qR1IHE1Kj4MwDx.7/m5dytZJm'
bbtests: bbtests:
# TODO: Disabled pending resolution of some "timing?" issues enabled: true
# https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd/-/issues/17
enabled: false
cypress: cypress:
artifacts: true artifacts: true
envs: envs:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment