diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c386904656ad91c1d7ec65838c70b87ef0a84e5f..3e19f59746173af475cdc9bfe01de47a55a2b313 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ include: file: "build/maven.yml" - project: "osdu/platform/ci-cd-pipelines" - file: "scanners/fossa.yml" + file: "scanners/fossa-maven.yml" - project: "osdu/platform/ci-cd-pipelines" file: "scanners/gitlab-ultimate.yml" diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 788491ed0c315deef32d9d4faa6b860567e155ba..0489626493e9b2bb17228040037e4d4e4f883f0d 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -68,21 +68,6 @@ spec: configMapKeyRef: name: osdu-svc-properties key: ENV_KEYVAULT - - name: AZURE_CLIENT_ID - valueFrom: - secretKeyRef: - name: active-directory - key: principal-clientid - - name: AZURE_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: active-directory - key: principal-clientpassword - - name: AZURE_TENANT_ID - valueFrom: - secretKeyRef: - name: active-directory - key: tenantid - name: aad_client_id valueFrom: secretKeyRef: