Skip to content

Commit

Permalink
Merge pull request #151 from adamrushuk/develop
Browse files Browse the repository at this point in the history
v1.2.0 release
  • Loading branch information
adamrushuk authored Nov 27, 2020
2 parents 764f17e + 8f7955b commit 02e4695
Show file tree
Hide file tree
Showing 20 changed files with 407 additions and 458 deletions.
43 changes: 31 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
PREFIX: rush

# debug
CI_DEBUG: true
CI_DEBUG: false

# azure creds
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
Expand All @@ -34,7 +34,8 @@ env:
ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}

# other
# prod or staging. "" disables cert-manager annotations
# prod or staging.
# "" disables cert-manager annotations (use if you already have an existing TLS secret)
CERT_API_ENVIRONMENT: ""
DEMO_USER_USERNAME: demo_user
# DEMO_USER_PASSWORD: ${{ secrets.DEMO_USER_PASSWORD }}
Expand All @@ -53,6 +54,7 @@ env:
# NEXUS_ADMIN_PASSWORD: ${{ secrets.NEXUS_ADMIN_PASSWORD }}
# STORAGE_KEY: 'env var set by Get-StorageKey.ps1'
VELERO_ENABLED: true
WEAVE_SCOPE_ENABLED: false

# terraform
TF_IN_AUTOMATION: "true"
Expand Down Expand Up @@ -96,11 +98,26 @@ jobs:
echo "VELERO_STORAGE_RG=${{ env.PREFIX }}-rg-velero-dev-001" >> $GITHUB_ENV
echo "VELERO_STORAGE_ACCOUNT=${{ env.PREFIX }}stbckuksouth001" >> $GITHUB_ENV
# Show event info
- name: Show triggered event data
run: pwsh -command "./scripts/Get-EventData.ps1"
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
# # Show event info
# - name: Show triggered event data
# run: pwsh -command "./scripts/Get-EventData.ps1"
# env:
# GITHUB_CONTEXT: ${{ toJson(github) }}

# # Linting multiple languages
# - name: Lint Code Base
# uses: github/super-linter@v3
# env:
# DEFAULT_BRANCH: develop
# # VALIDATE_ALL_CODEBASE: false
# VALIDATE_ANSIBLE: true
# VALIDATE_BASH: true
# VALIDATE_POWERSHELL: true
# VALIDATE_SHELL_SHFMT: true
# VALIDATE_TERRAFORM: true
# VALIDATE_TERRAFORM_TERRASCAN: true
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


# Login
- name: Login to Azure
Expand Down Expand Up @@ -189,11 +206,13 @@ jobs:
run: ./scripts/wait.sh


# Ansible
- name: Lint Ansible Playbook
uses: ansible/ansible-lint-action@6c8c141
with:
targets: "./ansible"
# TODO: enable Ansible Lint once this issue has been resolved: https://github.com/ansible/ansible-lint-action/issues/36
# # Ansible
# - name: Lint Ansible Playbook
# uses: ansible/ansible-lint-action@6c8c141
# with:
# targets: "./ansible"


- name: Run Ansible playbook
run: ./scripts/ansible.sh
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/destroy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ jobs:
echo "VELERO_STORAGE_RG=${{ env.PREFIX }}-rg-velero-dev-001" >> $GITHUB_ENV
echo "VELERO_STORAGE_ACCOUNT=${{ env.PREFIX }}stbckuksouth001" >> $GITHUB_ENV
# Show event info
- name: Show triggered event data
run: pwsh -command "./scripts/Get-EventData.ps1"
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
# # Show event info
# - name: Show triggered event data
# run: pwsh -command "./scripts/Get-EventData.ps1"
# env:
# GITHUB_CONTEXT: ${{ toJson(github) }}

# Login
- name: Login to Azure
Expand Down
206 changes: 0 additions & 206 deletions aad-pod-identity/aad_pod_identity_values.yaml

This file was deleted.

Loading

0 comments on commit 02e4695

Please sign in to comment.