Update workflow.yml

msftsean · Dec 17, 2019 · 45eaa7e · 45eaa7e
1 parent 529a691
commit 45eaa7e
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -24,17 +24,15 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@master
-
+
+ # Fetch secrets from Azure Key Vault
  - uses: Azure/login@v1
  with:
  creds: ${{ secrets.AZURE_CREDENTIALS }}
-
  - name: Azure key vault - Get Secrets
  uses: azure/get-keyvault-secrets@v1
  with:
- # Name of the azure key vault
  keyvault: ${{ secrets.AZURE_KEY_VAULT }}
- # Name of the secret to be fetched
  secrets: '*'
 
  - run: |
@@ -86,21 +84,24 @@ jobs:
  # Create namespace if doesn't exist
  - run: |
  kubectl create namespace ${{ secrets.AKS_NAMESPACE }} --dry-run -o json | kubectl apply -f -
- 
+ 
+ # Fetch secrets from Azure Key Vault
+ - uses: Azure/login@v1
+ with:
+ creds: ${{ secrets.AZURE_CREDENTIALS }}
  - name: Azure key vault - Get Secrets
  uses: azure/get-keyvault-secrets@v1
  with:
- # Name of the azure key vault
  keyvault: ${{ secrets.AZURE_KEY_VAULT }}
- # Name of the secret to be fetched
  secrets: '*'
 
  # Create generic secrets to be available on pods
  - uses: azure/k8s-create-secret@v1
  with:
  namespace: ${{ secrets.AKS_NAMESPACE }}
  secret-type: 'generic'
- arguments: --from-literal=config_service_password=${{ secrets.CONFIG_SERVICE_PASSWORD }} --from-literal=notification_service_password=${{ secrets.NOTIFICATION_SERVICE_PASSWORD }} --from-literal=statistics_service_password=${{ secrets.STATISTICS_SERVICE_PASSWORD }} --from-literal=account_service_password=${{ secrets.ACCOUNT_SERVICE_PASSWORD }} --from-literal=rabbitmq_password=${{ secrets.RABBITMQ_PASSWORD }} --from-literal=mongodb_uri=${{ secrets.MONGODB_URI }} --from-literal=mongodb_database=${{ secrets.MONGODB_DATABASE }} --from-literal=rabbitmq_username=${{ secrets.RABBITMQ_USERNAME }} --from-literal=rabbitmq_host=${{ secrets.RABBITMQ_HOST }} --from-literal=rabbitmq_port=${{ secrets.RABBITMQ_PORT }} --from-literal=notification_email_user=${{ secrets.NOTIFICATION_EMAIL_USER }} --from-literal=notification_email_pass=${{ secrets.NOTIFICATION_EMAIL_PASSWORD }} --from-literal=notification_email_host=${{ secrets.NOTIFICATION_EMAIL_HOST }} --from-literal=notification_email_port=${{ secrets.NOTIFICATION_EMAIL_PORT }} 
+ #arguments: --from-literal=config_service_password=${{ secrets.CONFIG_SERVICE_PASSWORD }} --from-literal=notification_service_password=${{ secrets.NOTIFICATION_SERVICE_PASSWORD }} --from-literal=statistics_service_password=${{ secrets.STATISTICS_SERVICE_PASSWORD }} --from-literal=account_service_password=${{ secrets.ACCOUNT_SERVICE_PASSWORD }} --from-literal=rabbitmq_password=${{ secrets.RABBITMQ_PASSWORD }} --from-literal=mongodb_uri=${{ secrets.MONGODB_URI }} --from-literal=mongodb_database=${{ secrets.MONGODB_DATABASE }} --from-literal=rabbitmq_username=${{ secrets.RABBITMQ_USERNAME }} --from-literal=rabbitmq_host=${{ secrets.RABBITMQ_HOST }} --from-literal=rabbitmq_port=${{ secrets.RABBITMQ_PORT }} --from-literal=notification_email_user=${{ secrets.NOTIFICATION_EMAIL_USER }} --from-literal=notification_email_pass=${{ secrets.NOTIFICATION_EMAIL_PASSWORD }} --from-literal=notification_email_host=${{ secrets.NOTIFICATION_EMAIL_HOST }} --from-literal=notification_email_port=${{ secrets.NOTIFICATION_EMAIL_PORT }} 
+ arguments: --from-literal=config_service_password=${{ env.CONFIG-SERVICE-PASSWORD }} --from-literal=notification_service_password=${{ env.NOTIFICATION-SERVICE-PASSWORD }} --from-literal=statistics_service_password=${{ env.STATISTICS-SERVICE-PASSWORD }} --from-literal=account_service_password=${{ env.ACCOUNT-SERVICE-PASSWORD }} --from-literal=rabbitmq_password=${{ env.RABBITMQ-PASSWORD }} --from-literal=mongodb_uri=${{ env.MONGODB-URI }} --from-literal=mongodb_database=${{ env.MONGODB-DATABASE }} --from-literal=rabbitmq_username=${{ env.RABBITMQ-USERNAME }} --from-literal=rabbitmq_host=${{ env.RABBITMQ-HOST }} --from-literal=rabbitmq_port=${{ env.RABBITMQ_PORT }} --from-literal=notification_email_user=${{ env.SMTP-USER }} --from-literal=notification_email_pass=${{ env.SMTP-PASSWORD }} --from-literal=notification_email_host=${{ env.NOTIFICATION-EMAIL-HOST }} --from-literal=notification_email_port=${{ env.NOTIFICATION-EMAIL-PORT }} 
  secret-name: piggymetrics
 
 
@@ -111,7 +112,7 @@ jobs:
  tokenSuffix: '}'
  files: '["kubernetes/*.yaml"]'
  env:
- CONTAINER_REGISTRY: ${{ secrets.AZURE_CONTAINER_REGISTRY }}
+ CONTAINER_REGISTRY: ${{ env.AZURE-CONTAINER-REGISTRY }}
  IMAGE_TAG: ${{ env.IMAGE_TAG }}