Skip to content

Commit 991114e

Browse files
dcmcanddcmcand
authored
Merge branch 'main' into opentofu/stages/sync-versions
2 parents 0e82a79 + 43e63fe commit 991114e

File tree

7 files changed

+30
-72
lines changed

7 files changed

+30
-72
lines changed

‎.github/workflows/test-provider.yaml‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ on:
2929
required: true
3030
type: string
3131

32+
env:
33+
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
34+
ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
35+
ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
36+
PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
37+
3238
jobs:
3339
test-render-providers:
3440
# Prevents the execution of this test under the following conditions:
@@ -72,32 +78,14 @@ jobs:
7278
with:
7379
python-version: "3.11"
7480

75-
- name: Retrieve secret from Vault
76-
uses: hashicorp/vault-action@v3.0.0
77-
with:
78-
method: jwt
79-
url: "https://quansight-vault-public-vault-b2379fa7.d415e30e.z1.hashicorp.cloud:8200"
80-
namespace: "admin/quansight"
81-
role: "repository-nebari-dev-nebari-role"
82-
secrets: |
83-
kv/data/repository/nebari-dev/nebari/amazon_web_services/nebari-dev-ci role_name | AWS_ROLE_ARN;
84-
kv/data/repository/nebari-dev/nebari/google_cloud_platform/nebari-dev-ci/github-nebari-dev-repo-ci project_id | PROJECT_ID;
85-
kv/data/repository/nebari-dev/nebari/google_cloud_platform/nebari-dev-ci/github-nebari-dev-repo-ci workload_identity_provider | GCP_WORKFLOW_PROVIDER;
86-
kv/data/repository/nebari-dev/nebari/google_cloud_platform/nebari-dev-ci/github-nebari-dev-repo-ci service_account_name | GCP_SERVICE_ACCOUNT;
87-
kv/data/repository/nebari-dev/nebari/azure/nebari-dev-ci/github-nebari-dev-repo-ci client_id | ARM_CLIENT_ID;
88-
kv/data/repository/nebari-dev/nebari/azure/nebari-dev-ci/github-nebari-dev-repo-ci tenant_id | ARM_TENANT_ID;
89-
kv/data/repository/nebari-dev/nebari/azure/nebari-dev-ci/github-nebari-dev-repo-ci subscription_id | ARM_SUBSCRIPTION_ID;
90-
kv/data/repository/nebari-dev/nebari/shared_secrets SPACES_ACCESS_KEY_ID | SPACES_ACCESS_KEY_ID;
91-
kv/data/repository/nebari-dev/nebari/shared_secrets SPACES_SECRET_ACCESS_KEY | SPACES_SECRET_ACCESS_KEY;
92-
9381
- name: 'Authenticate to GCP'
9482
if: ${{ matrix.provider == 'gcp' }}
9583
uses: 'google-github-actions/auth@v1'
9684
with:
9785
token_format: access_token
9886
create_credentials_file: 'true'
99-
workload_identity_provider: ${{ env.GCP_WORKFLOW_PROVIDER }}
100-
service_account: ${{ env.GCP_SERVICE_ACCOUNT }}
87+
workload_identity_provider: ${{ secrets.GCP_WORKFLOW_PROVIDER }}
88+
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
10189

10290
- name: Set required environment variables
10391
if: ${{ matrix.provider == 'gcp' }}
@@ -108,17 +96,17 @@ jobs:
10896
if: ${{ matrix.provider == 'aws' }}
10997
uses: aws-actions/configure-aws-credentials@v1
11098
with:
111-
role-to-assume: ${{ env.AWS_ROLE_ARN }}
99+
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
112100
role-session-name: github-action
113101
aws-region: us-east-1
114102

115103
- name: 'Azure login'
116104
if: ${{ matrix.provider == 'azure' }}
117105
uses: azure/login@v1
118106
with:
119-
client-id: ${{ env.ARM_CLIENT_ID }}
120-
tenant-id: ${{ env.ARM_TENANT_ID }}
121-
subscription-id: ${{ env.ARM_SUBSCRIPTION_ID }}
107+
client-id: ${{ secrets.ARM_CLIENT_ID }}
108+
tenant-id: ${{ secrets.ARM_TENANT_ID }}
109+
subscription-id: ${{ secrets.ARM_SUBSCRIPTION_ID }}
122110

123111
- name: Install Nebari
124112
run: |

‎.github/workflows/test_aws_integration.yaml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,10 @@ jobs:
5151
pip install .[dev]
5252
playwright install
5353
54-
- name: Retrieve secret from Vault
55-
uses: hashicorp/vault-action@v3.0.0
56-
with:
57-
method: jwt
58-
url: "https://quansight-vault-public-vault-b2379fa7.d415e30e.z1.hashicorp.cloud:8200"
59-
namespace: "admin/quansight"
60-
role: "repository-nebari-dev-nebari-role"
61-
secrets: |
62-
kv/data/repository/nebari-dev/nebari/amazon_web_services/nebari-dev-ci role_name | AWS_ROLE_ARN;
63-
kv/data/repository/nebari-dev/nebari/cloudflare/internal-devops@quansight.com/nebari-dev-ci token | CLOUDFLARE_TOKEN;
64-
6554
- name: Authenticate to AWS
6655
uses: aws-actions/configure-aws-credentials@v1
6756
with:
68-
role-to-assume: ${{ env.AWS_ROLE_ARN }}
57+
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
6958
role-session-name: github-action
7059
aws-region: ${{ env.AWS_DEFAULT_REGION }}
7160

@@ -77,3 +66,4 @@ jobs:
7766
NEBARI_SECRET__default_images__jupyterhub: "quay.io/nebari/nebari-jupyterhub:${{ env.NEBARI_IMAGE_TAG }}"
7867
NEBARI_SECRET__default_images__jupyterlab: "quay.io/nebari/nebari-jupyterlab:${{ env.NEBARI_IMAGE_TAG }}"
7968
NEBARI_SECRET__default_images__dask_worker: "quay.io/nebari/nebari-dask-worker:${{ env.NEBARI_IMAGE_TAG }}"
69+
CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}

‎.github/workflows/test_azure_integration.yaml‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,12 @@ jobs:
5050
conda install --quiet --yes conda-build
5151
playwright install
5252
53-
- name: Retrieve secret from Vault
54-
uses: hashicorp/vault-action@v3.0.0
55-
with:
56-
method: jwt
57-
url: "https://quansight-vault-public-vault-b2379fa7.d415e30e.z1.hashicorp.cloud:8200"
58-
namespace: "admin/quansight"
59-
role: "repository-nebari-dev-nebari-role"
60-
secrets: |
61-
kv/data/repository/nebari-dev/nebari/azure/nebari-dev-ci/github-nebari-dev-repo-ci client_id | ARM_CLIENT_ID;
62-
kv/data/repository/nebari-dev/nebari/azure/nebari-dev-ci/github-nebari-dev-repo-ci tenant_id | ARM_TENANT_ID;
63-
kv/data/repository/nebari-dev/nebari/azure/nebari-dev-ci/github-nebari-dev-repo-ci subscription_id | ARM_SUBSCRIPTION_ID;
64-
kv/data/repository/nebari-dev/nebari/cloudflare/internal-devops@quansight.com/nebari-dev-ci token | CLOUDFLARE_TOKEN;
65-
6653
- name: 'Azure login'
6754
uses: azure/login@v2
6855
with:
69-
client-id: ${{ env.ARM_CLIENT_ID }}
70-
tenant-id: ${{ env.ARM_TENANT_ID }}
71-
subscription-id: ${{ env.ARM_SUBSCRIPTION_ID }}
56+
client-id: ${{ secrets.ARM_CLIENT_ID }}
57+
tenant-id: ${{ secrets.ARM_TENANT_ID }}
58+
subscription-id: ${{ secrets.ARM_SUBSCRIPTION_ID }}
7259

7360
- name: Integration Tests
7461
run: |
@@ -78,8 +65,8 @@ jobs:
7865
NEBARI_SECRET__default_images__jupyterhub: "quay.io/nebari/nebari-jupyterhub:${{ env.NEBARI_IMAGE_TAG }}"
7966
NEBARI_SECRET__default_images__jupyterlab: "quay.io/nebari/nebari-jupyterlab:${{ env.NEBARI_IMAGE_TAG }}"
8067
NEBARI_SECRET__default_images__dask_worker: "quay.io/nebari/nebari-dask-worker:${{ env.NEBARI_IMAGE_TAG }}"
81-
ARM_CLIENT_ID: ${{ env.ARM_CLIENT_ID }}
82-
ARM_TENANT_ID: ${{ env.ARM_TENANT_ID }}
83-
ARM_SUBSCRIPTION_ID: ${{ env.ARM_SUBSCRIPTION_ID }}
68+
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
69+
ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
70+
ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
8471
ARM_USE_OIDC: "true"
85-
CLOUDFLARE_TOKEN: ${{ env.CLOUDFLARE_TOKEN }}
72+
CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}

‎.github/workflows/test_gcp_integration.yaml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,24 +50,11 @@ jobs:
5050
pip install .[dev]
5151
playwright install
5252
53-
- name: Retrieve secret from Vault
54-
uses: hashicorp/vault-action@v3.0.0
55-
with:
56-
method: jwt
57-
url: "https://quansight-vault-public-vault-b2379fa7.d415e30e.z1.hashicorp.cloud:8200"
58-
namespace: "admin/quansight"
59-
role: "repository-nebari-dev-nebari-role"
60-
secrets: |
61-
kv/data/repository/nebari-dev/nebari/google_cloud_platform/nebari-dev-ci/github-nebari-dev-repo-ci project_id | PROJECT_ID;
62-
kv/data/repository/nebari-dev/nebari/google_cloud_platform/nebari-dev-ci/github-nebari-dev-repo-ci workload_identity_provider | GCP_WORKFLOW_PROVIDER;
63-
kv/data/repository/nebari-dev/nebari/google_cloud_platform/nebari-dev-ci/github-nebari-dev-repo-ci service_account_name | GCP_SERVICE_ACCOUNT;
64-
kv/data/repository/nebari-dev/nebari/cloudflare/internal-devops@quansight.com/nebari-dev-ci token | CLOUDFLARE_TOKEN;
65-
6653
- name: 'Authenticate to GCP'
6754
uses: 'google-github-actions/auth@v1'
6855
with:
69-
workload_identity_provider: ${{ env.GCP_WORKFLOW_PROVIDER }}
70-
service_account: ${{ env.GCP_SERVICE_ACCOUNT }}
56+
workload_identity_provider: ${{ secrets.GCP_WORKFLOW_PROVIDER }}
57+
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
7158

7259
- name: Set required environment variables
7360
run: |
@@ -81,3 +68,5 @@ jobs:
8168
NEBARI_SECRET__default_images__jupyterhub: "quay.io/nebari/nebari-jupyterhub:${{ env.NEBARI_IMAGE_TAG }}"
8269
NEBARI_SECRET__default_images__jupyterlab: "quay.io/nebari/nebari-jupyterlab:${{ env.NEBARI_IMAGE_TAG }}"
8370
NEBARI_SECRET__default_images__dask_worker: "quay.io/nebari/nebari-dask-worker:${{ env.NEBARI_IMAGE_TAG }}"
71+
PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
72+
CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}

‎docs-sphinx/cli.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ <h4>keycloak-api<a class="headerlink" href="#nebari-dev-keycloak-api" title="Lin
242242
</section>
243243
<section id="nebari-info">
244244
<h3>info<a class="headerlink" href="#nebari-info" title="Link to this heading"></a></h3>
245+
<p>Display information about installed Nebari plugins and their configurations.</p>
245246
<div class="highlight-shell notranslate"><div class="highlight"><pre><span></span>nebari<span class="w"> </span>info<span class="w"> </span><span class="o">[</span>OPTIONS<span class="o">]</span>
246247
</pre></div>
247248
</div>

‎src/_nebari/cli.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
class OrderCommands(TyperGroup):
1111
def list_commands(self, ctx: typer.Context):
1212
"""Return list of commands in the order appear."""
13-
return list(self.commands)
13+
return list(self.commands)[::-1]
1414

1515

1616
def version_callback(value: bool):

‎src/_nebari/subcommands/info.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ def nebari_subcommand(cli: typer.Typer):
1414

1515
@cli.command()
1616
def info(ctx: typer.Context):
17+
"""
18+
Display information about installed Nebari plugins and their configurations.
19+
"""
1720
from nebari.plugins import nebari_plugin_manager
1821

1922
rich.print(f"Nebari version: {__version__}")

0 commit comments

Comments
 (0)