From 0470a01d742e51a4af239a19dd153a49ec79dcfa Mon Sep 17 00:00:00 2001 From: Adam Lewis <23342526+Adam-D-Lewis@users.noreply.github.com> Date: Mon, 30 Sep 2024 09:26:33 -0500 Subject: [PATCH 1/3] handle branch rename from develop to main --- .github/ISSUE_TEMPLATE/release-checklist.md | 4 ++-- .github/workflows/test_aws_integration.yaml | 2 +- .github/workflows/test_azure_integration.yaml | 2 +- .github/workflows/test_do_integration.yaml | 2 +- .github/workflows/test_gcp_integration.yaml | 2 +- .github/workflows/test_local_integration.yaml | 2 +- .github/workflows/trivy.yml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md index 3e6259cef..72d2c369c 100644 --- a/.github/ISSUE_TEMPLATE/release-checklist.md +++ b/.github/ISSUE_TEMPLATE/release-checklist.md @@ -39,7 +39,7 @@ Release captain responsible - <@gh_username> - [Do we need to update the `dask` versions in the `nebari-dask`?](https://github.com/conda-forge/nebari-dask-feedstock/blob/main/recipe/meta.yaml#L13-L16) - Will there be an accompanying blog post? - [ ] Prepare for the release. - - [ ] Update the [`nebari upgrade`](https://github.com/nebari-dev/nebari/blob/develop/src/_nebari/upgrade.py) for this release + - [ ] Update the [`nebari upgrade`](https://github.com/nebari-dev/nebari/blob/main/src/_nebari/upgrade.py) for this release - [ ] Add upgrade messaging including deprecation warnings, version specific warnings and so on. - [ ] Optionally, announce a merge freeze. - [ ] Release Candidate (RC) cycle. @@ -65,7 +65,7 @@ _These steps must be actioned in the order they appear in this checklist._ - [ ] [Tag, build and push docker images](https://github.com/nebari-dev/nebari-docker-images/releases/new) - [ ] [Update and cut release for `nebari-dask` meta package on Conda-Forge.](https://github.com/conda-forge/nebari-dask-feedstock) -- [ ] Update `CURRENT_RELEASE` (and any other tags) in the [`constants.py`](https://github.com/nebari-dev/nebari/blob/develop/src/_nebari/constants.py#L1) +- [ ] Update `CURRENT_RELEASE` (and any other tags) in the [`constants.py`](https://github.com/nebari-dev/nebari/blob/main/src/_nebari/constants.py#L1) - [ ] [Cut PyPI release via GHA release workflow.](https://github.com/nebari-dev/nebari/releases/new) - Avoid appending `v` to tag. - Copy release notes from `RELEASE.md`. diff --git a/.github/workflows/test_aws_integration.yaml b/.github/workflows/test_aws_integration.yaml index 3c8a0d04a..867006df2 100644 --- a/.github/workflows/test_aws_integration.yaml +++ b/.github/workflows/test_aws_integration.yaml @@ -30,7 +30,7 @@ on: env: AWS_DEFAULT_REGION: "us-west-2" - NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }} + NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'main' }} NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }} TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}∏ diff --git a/.github/workflows/test_azure_integration.yaml b/.github/workflows/test_azure_integration.yaml index c1eb477c7..812390749 100644 --- a/.github/workflows/test_azure_integration.yaml +++ b/.github/workflows/test_azure_integration.yaml @@ -28,7 +28,7 @@ on: - error env: - NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }} + NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'main' }} NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }} TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }} diff --git a/.github/workflows/test_do_integration.yaml b/.github/workflows/test_do_integration.yaml index d9ef1a7b4..95ad219a8 100644 --- a/.github/workflows/test_do_integration.yaml +++ b/.github/workflows/test_do_integration.yaml @@ -28,7 +28,7 @@ on: - error env: - NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }} + NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'main' }} NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }} TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }} diff --git a/.github/workflows/test_gcp_integration.yaml b/.github/workflows/test_gcp_integration.yaml index 7520cadf1..e0e5a5b9e 100644 --- a/.github/workflows/test_gcp_integration.yaml +++ b/.github/workflows/test_gcp_integration.yaml @@ -28,7 +28,7 @@ on: - error env: - NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }} + NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'main' }} NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }} TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }} diff --git a/.github/workflows/test_local_integration.yaml b/.github/workflows/test_local_integration.yaml index 945f14ae2..3b51f5797 100644 --- a/.github/workflows/test_local_integration.yaml +++ b/.github/workflows/test_local_integration.yaml @@ -187,7 +187,7 @@ jobs: # Since this is not critical for most pull requests and takes more than half of the time # in the CI, it makes sense to only run on merge to main or workflow_dispatch to speed # up feedback cycle - if: github.ref_name == 'develop' || github.event_name == 'workflow_dispatch' + if: github.ref_name == 'main' || github.event_name == 'workflow_dispatch' working-directory: local-deployment run: | nebari destroy --config nebari-config.yaml --disable-prompt diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 2a8bf120f..8c894653b 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -7,10 +7,10 @@ name: Code Scanning on: push: - branches: [ "develop", "release/*" ] + branches: [ "main", "release/*" ] pull_request: # The branches below must be a subset of the branches above - branches: [ "develop" ] + branches: [ "main" ] schedule: - cron: '19 23 * * 6' From 00b9247a41c7177399417048759bd5d5d768b673 Mon Sep 17 00:00:00 2001 From: Blake R Date: Tue, 1 Oct 2024 08:28:16 -0700 Subject: [PATCH 2/3] Precommit typos (#2731) Co-authored-by: Adam Lewis <23342526+Adam-D-Lewis@users.noreply.github.com> --- pyproject.toml | 2 +- src/_nebari/deprecate.py | 2 ++ .../services/dask-gateway/{controler.tf => controller.tf} | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/dask-gateway/{controler.tf => controller.tf} (100%) diff --git a/pyproject.toml b/pyproject.toml index 37d209c45..75301b854 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -188,7 +188,7 @@ ignore_errors = false files.extend-exclude = ["_build", "*/build/*", "*/node_modules/*", "nebari.egg-info", "*.git", "*.js", "*.json", "*.yaml", "*.yml", "pre-commit-config.yaml"] default.extend-ignore-re = ["(?Rm)^.*(#|//)\\s*typos: ignore$"] default.extend-ignore-words-re = ["aks", "AKS"] -default.check-filename = false # Turn off initially, enable once https://github.com/nebari-dev/nebari/issues/2598 is addressed +default.check-filename = true [tool.codespell] # Ref: https://github.com/codespell-project/codespell#using-a-config-file diff --git a/src/_nebari/deprecate.py b/src/_nebari/deprecate.py index 0b9494e9a..d43c057b9 100644 --- a/src/_nebari/deprecate.py +++ b/src/_nebari/deprecate.py @@ -7,4 +7,6 @@ ".github/workflows/image.yaml", ".github/workflows/jupyterhub-pr.yaml", ".github/workflows/jupyterhub.yaml", + # v2024.7.3 renamed misspelled file path + "stages/07-kubernetes-services/modules/kubernetes/services/dask-gateway/controler.tf", # codespell:ignore ] diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/dask-gateway/controler.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/dask-gateway/controller.tf similarity index 100% rename from src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/dask-gateway/controler.tf rename to src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/dask-gateway/controller.tf From eaa415ec9c5007e6f394cffd1c5496cc6fee6ee3 Mon Sep 17 00:00:00 2001 From: Blake R Date: Tue, 1 Oct 2024 08:31:08 -0700 Subject: [PATCH 3/3] fix typo in KubernetesCredentials (#2729) Co-authored-by: Adam Lewis <23342526+Adam-D-Lewis@users.noreply.github.com> --- src/_nebari/stages/infrastructure/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_nebari/stages/infrastructure/__init__.py b/src/_nebari/stages/infrastructure/__init__.py index 682e9d50b..026f33fe8 100644 --- a/src/_nebari/stages/infrastructure/__init__.py +++ b/src/_nebari/stages/infrastructure/__init__.py @@ -660,7 +660,7 @@ class NodeSelectorKeyValue(schema.Base): class KubernetesCredentials(schema.Base): host: str - cluster_ca_certifiate: str # ignored for now. More info in https://github.com/nebari-dev/nebari/issues/2597. # typos: ignore + cluster_ca_certificate: str token: Optional[str] = None username: Optional[str] = None password: Optional[str] = None