Merge branch 'master' into 'update-fortify-tag-0.2.0-bb.14'

# Conflicts:
#   chart/values.yaml

chart/values.yaml

@@ -1434,6 +1434,16 @@ addons:
     ingress:
       gateway: ""
 
+    sso:
+      # -- Toggle SSO for Harbor on and off
+      enabled: false
+
+      # -- OIDC Client ID to use for Harbor
+      client_id: ""
+
+      # -- OIDC Client Secret to use for Harbor
+      client_secret: ""
+
     # -- Values to passthrough to the fortify chart: https://repo1.dso.mil/big-bang/apps/third-party/fortify.git
     values: {}
 

tests/test-values.yaml

@@ -179,6 +179,7 @@ gatekeeper:
           - logging/loki-cypress-test
           - twistlock/twistlock-cypress-test
           - sonarqube/sonarqube-cypress-test
+          - fortify/fortify-cypress-test
           - harbor/harbor-cypress-test
           - logging/elasticsearch-kibana-cypress-test
           - tempo/tempo-cypress-test
@@ -314,6 +315,7 @@ gatekeeper:
           - logging/loki-cypress-test
           - twistlock/twistlock-cypress-test
           - sonarqube/sonarqube-cypress-test
+          - fortify/fortify-cypress-test
           - harbor/harbor-cypress-test
           - logging/elasticsearch-kibana-cypress-test
           - tempo/tempo-cypress-test
@@ -472,6 +474,7 @@ kyvernoPolicies:
               - minio
               - neuvector
               - harbor
+              - fortify
               names:
               - "*-cypress-test*"
         parameters:
@@ -506,6 +509,7 @@ kyvernoPolicies:
               - minio
               - neuvector
               - harbor
+              - fortify
               names:
               - "*-cypress-test*"
         parameters:
@@ -550,6 +554,7 @@ kyvernoPolicies:
               - minio
               - neuvector
               - harbor
+              - fortify
               names:
               - "*-cypress-test*"
       update-image-pull-policy: