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:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git
path: "./chart"
tag: "3.6.8-bb.11"
tag: "3.6.8-bb.12"
# -- Flux reconciliation overrides specifically for the ArgoCD Package
flux: {}
......
......@@ -135,6 +135,8 @@ gatekeeper:
excludedResources:
# Allows k3d load balancer containers to pull from public repos
- istio-system/lb-port-.*
# Allow argocd to deploy a test app in its cypress test
- argocd/guestbook-ui.*
allowedSecCompProfiles:
parameters:
excludedResources:
......@@ -385,15 +387,15 @@ addons:
redis-bb:
master:
persistence:
size: 256Mi
size: 512Mi
replica:
persistence:
size: 256Mi
size: 512Mi
redis:
resources:
requests:
cpu: 50m
memory: 64Mi
memory: 256Mi
limits: {}
server:
resources:
......@@ -411,9 +413,7 @@ addons:
secret:
argocdServerAdminPassword: '$2a$10$rUDZDckdDZ2TEwk9PDs3QuqjkL58qR1IHE1Kj4MwDx.7/m5dytZJm'
bbtests:
# TODO: Disabled pending resolution of some "timing?" issues
# https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd/-/issues/17
enabled: false
enabled: true
cypress:
artifacts: true
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