Merge pull request #149 from radixdlt/develop

Develop
radixdlt · Sep 28, 2023 · 8d99b02 · 8d99b02
2 parents 1fc4756 + d09143f
commit 8d99b02
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,6 +9,7 @@ on:
         default: Stokenet
         type: choice
         options:
+          - Mainnet
           - Stokenet
 
   push:
@@ -143,7 +144,7 @@ jobs:
       - name: Define network name
         id: network_name_step
         run: |
-          if [ "${{ github.event_name}}" = 'release' -a ${{!github.event.release.prerelease}} ]; then
+          if [ "${{ github.event_name}}" = 'release' -a ${{!github.event.release.prerelease}} ] || [ ${{github.event_name }} = 'workflow_dispatch' -a "${{github.event.inputs.ENVIRONMENT_NAME}}" = 'Mainnet' ]; then
             echo "is_public=true" >> $GITHUB_OUTPUT
             echo "network_name=Mainnet" >> $GITHUB_OUTPUT
           elif [ ${{github.event_name }} = 'workflow_dispatch' -a "${{github.event.inputs.ENVIRONMENT_NAME}}" = 'Stokenet' ]; then
@@ -439,7 +440,7 @@ jobs:
           HELM_GH_PASS: ${{ secrets.HELM_GH_PASS }}
 
   deploy-mainnet:
-    if: github.event_name == 'release' && !github.event.release.prerelease
+    if: github.event_name == 'release' && !github.event.release.prerelease || ( github.event.inputs.ENVIRONMENT_NAME == 'Mainnet' && github.event_name == 'workflow_dispatch' )
     runs-on: ubuntu-latest
     needs:
       - push-docker-image

diff --git a/deploy/helm/environments/mainnet/values.yaml.gotmpl b/deploy/helm/environments/mainnet/values.yaml.gotmpl
@@ -18,11 +18,6 @@ ingress:
       paths:
         - path: /
           pathType: Prefix
-  basic_auth: true
-  annotations:
-    nginx.ingress.kubernetes.io/auth-type: basic
-    nginx.ingress.kubernetes.io/auth-secret: radix-dapp-toolkit-basic-auth
-    nginx.ingress.kubernetes.io/auth-realm: 'Auth Required - Mainnet'
 
 alertmanager:
   env: "mainnet"

diff --git a/deploy/helm/radix-dapp-toolkit/values.yaml b/deploy/helm/radix-dapp-toolkit/values.yaml
@@ -32,6 +32,7 @@ ingress:
   annotations: {}
   hosts: []
   tls: []
+  basic_auth: false
 
 resources:
   limits: