Merge branch 'master' into 'integration-master'

Sync updates from master

See merge request go3-nrg/platform/System/partition!6

devops/azure/chart/templates/deployment.yaml

@@ -68,21 +68,6 @@ spec:
             configMapKeyRef:
               name: osdu-svc-properties
               key: ENV_KEYVAULT
-        - name: AZURE_TENANT_ID
-          valueFrom:
-            secretKeyRef:
-              name: active-directory
-              key: tenantid
-        - 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: appinsights_key
           valueFrom:
             secretKeyRef:
@@ -102,4 +87,3 @@ spec:
           value: "api://$(aad_client_id)"
         - name: azure_activedirectory_session_stateless
           value: "true"
-

provider/partition-azure/src/main/resources/application.properties

@@ -21,11 +21,6 @@ azure.keyvault.url=${KEYVAULT_URI}
 # Azure App Insights configuration
 azure.application-insights.instrumentation-key=${appinsights_key}
 
-# Azure service connection properties
-AZURE_CLIENT_ID=${AZURE_CLIENT_ID}
-AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET}
-AZURE_TENANT_ID=${AZURE_TENANT_ID}
-
 # Cache configuration, provider [vm or redis]
 cache.provider=redis
 
@@ -37,4 +32,4 @@ cache.maxSize=1000
 redis.port=6380
 redis.expiration=3600
 redis.ssl.enabled=true
-redis.database=${REDIS_DATABASE}
\ No newline at end of file
+redis.database=${REDIS_DATABASE}