Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024.3.2 #2331

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
74c8614
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Feb 5, 2024
ddbc6cc
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Feb 5, 2024
afec9ae
update max k8s versions and remove depreciated api usage in local deploy
dcmcand Feb 22, 2024
928865c
generate random pass for grafana
aktech Mar 5, 2024
6477b63
Trigger ci run
aktech Mar 5, 2024
89df695
add test for grafana API 401
aktech Mar 5, 2024
aee7fb7
undo branch add
aktech Mar 5, 2024
d1a59ea
add note about pass generation
aktech Mar 5, 2024
029098a
remove extra line
aktech Mar 5, 2024
269154f
Merge branch 'develop' into grafana-security
aktech Mar 5, 2024
bb298e5
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Mar 5, 2024
fb76fd6
make precommit happy
aktech Mar 5, 2024
273d51f
disable ssl verification
aktech Mar 5, 2024
7c99d4f
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Mar 5, 2024
e821a10
use http
aktech Mar 5, 2024
1dcc569
ignore insecure request warning
aktech Mar 5, 2024
eb6155f
Upgrade Actions versions
isumitjha Mar 5, 2024
c05b7d3
update miniconda action, kubectl action as well
isumitjha Mar 6, 2024
2834115
fix upload artifact action name
isumitjha Mar 7, 2024
31cb5e4
fix azure version
isumitjha Mar 7, 2024
6626266
Merge branch 'develop' into update-max-k8s-version
dcmcand Mar 12, 2024
aa69d53
Merge branch 'develop' into pre-commit-ci-update-config
dcmcand Mar 12, 2024
5319447
[pre-commit.ci] pre-commit autoupdate (#2237)
dcmcand Mar 12, 2024
d2b7ff6
update keycloak image repo
Adam-D-Lewis Mar 12, 2024
e116cf9
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Mar 12, 2024
2ed3018
update max k8s versions and remove depreciated api usage in local dep…
dcmcand Mar 12, 2024
cfd4086
Merge branch 'develop' into grafana-security
aktech Mar 12, 2024
a034756
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Mar 12, 2024
a60d008
update keycloak image repo (#2312)
dcmcand Mar 13, 2024
ff38679
Generate random password for Grafana (#2289)
dcmcand Mar 13, 2024
af7790b
update conda store to 2024.3.1 (#2316)
Adam-D-Lewis Mar 13, 2024
6566e4c
add upgrade step (#2318)
Adam-D-Lewis Mar 13, 2024
8c75dfd
Switch PyPI release workflow to use trusted publishing (#2323)
viniciusdc Mar 14, 2024
f73ad97
update CURRENT_RELEASE for 2024.3.2 release (#2324)
Adam-D-Lewis Mar 14, 2024
366d1cd
get default variable value when following a terraform variable (#2322)
Adam-D-Lewis Mar 14, 2024
9c87660
Upgrade Actions versions
isumitjha Mar 15, 2024
a06fcc5
Upgrade Actions versions (#2291)
dcmcand Mar 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/generate_cli_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
working-directory: ./docs-sphinx
steps:
- name: Check out repository 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: "3.10"

Expand Down
27 changes: 6 additions & 21 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ jobs:
test-pypi:
name: Test PyPi release
runs-on: ubuntu-latest

permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
steps:
- name: Set up python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"

- name: Upgrade pip
run: python -m pip install --upgrade pip build

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -35,8 +36,6 @@ jobs:
- name: Publish to test PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
repository-url: https://test.pypi.org/legacy/

- name: Sleep
Expand All @@ -59,34 +58,20 @@ jobs:

steps:
- name: Set up python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"

- name: Upgrade pip
run: python -m pip install --upgrade pip build

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Build source and binary
run: python -m build --sdist --wheel .

- name: Retrieve secret from Vault
uses: hashicorp/[email protected]
with:
method: jwt
url: "https://quansight-vault-public-vault-b2379fa7.d415e30e.z1.hashicorp.cloud:8200"
namespace: "admin/quansight"
role: "repository-nebari-dev-nebari-role"
secrets: |
kv/data/repository/nebari-dev/nebari/shared_secrets PYPI_USERNAME | PYPI_USERNAME;
kv/data/repository/nebari-dev/nebari/shared_secrets PYPI_PASSWORD | PYPI_PASSWORD;

- name: Publish package
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: ${{ env.PYPI_USERNAME }}
password: ${{ env.PYPI_PASSWORD }}
4 changes: 2 additions & 2 deletions .github/workflows/run-precommit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
shell: bash -l {0}
steps:
- name: Checkout repository 🔔
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1

- name: Run terraform pre-commit ⚡️
uses: pre-commit/[email protected].0
uses: pre-commit/[email protected].1
with:
extra_args: --all-files terraform_fmt
4 changes: 2 additions & 2 deletions .github/workflows/test-provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
fail-fast: false
steps:
- name: "Checkout Infrastructure"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout the branch from the PR that triggered the job
if: ${{ github.event_name == 'issue_comment' }}
Expand All @@ -65,7 +65,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ jobs:
cancel-in-progress: true
steps:
- name: "Checkout Infrastructure"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_aws_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ jobs:
contents: read
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ env.NEBARI_GH_BRANCH }}
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.11

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_conda_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
cancel-in-progress: true
steps:
- name: "Checkout Infrastructure"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: 3.8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_do_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ jobs:
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ env.NEBARI_GH_BRANCH }}
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.11

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_gcp_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ jobs:
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ env.NEBARI_GH_BRANCH }}
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.11

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_helm_charts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout Infrastructure"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.8"
- name: Install additional Python dependencies
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test_local_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
env:
CONDA: /home/runnerx/miniconda3
with:
Expand All @@ -70,7 +70,7 @@ jobs:
pip install .[dev]
playwright install

- uses: azure/setup-kubectl@v3
- uses: azure/setup-kubectl@v4.0.0
with:
version: v1.19.16

Expand Down Expand Up @@ -140,9 +140,9 @@ jobs:
nebari keycloak adduser --user "${TEST_USERNAME}" "${TEST_PASSWORD}" --config nebari-config.yaml
nebari keycloak listusers --config nebari-config.yaml

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20

- name: Get nebari-config.yaml full path
run: echo "NEBARI_CONFIG_PATH=`realpath ./local-deployment/nebari-config.yaml`" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:

- name: Save Cypress screenshots and videos
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.1
with:
name: e2e-cypress
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/typing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
cancel-in-progress: true
steps:
- name: "Checkout Repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
cache: "pip"
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ repos:

# python
- repo: https://github.com/psf/black
rev: 23.12.1
rev: 24.1.1
hooks:
- id: black
args: ["--line-length=88", "--exclude=/src/_nebari/template/"]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.9
rev: v0.2.0
hooks:
- id: ruff
args: ["--fix"]
Expand Down
13 changes: 12 additions & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,18 @@ This file is copied to nebari-dev/nebari-docs using a GitHub Action. -->

---

## Upcoming Release

## Release 2024.3.2 - March 14, 2024

### What's Changed
* update max k8s versions and remove depreciated api usage in local deploy by @dcmcand in https://github.com/nebari-dev/nebari/pull/2276
* update keycloak image repo by @Adam-D-Lewis in https://github.com/nebari-dev/nebari/pull/2312
* Generate random password for Grafana by @aktech in https://github.com/nebari-dev/nebari/pull/2289
* update conda store to 2024.3.1 by @Adam-D-Lewis in https://github.com/nebari-dev/nebari/pull/2316
* Switch PyPI release workflow to use trusted publishing by @viniciusdc in https://github.com/nebari-dev/nebari/pull/2323


**Full Changelog**: https://github.com/nebari-dev/nebari/compare/2024.3.1...2024.3.2

## Release 2024.3.1 - March 11, 2024

Expand Down
2 changes: 1 addition & 1 deletion scripts/helm-validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def _load_variable_value(self, argument, parent_contents):
var_name = self._clean_var_name(argument, "var")
for var in parent_contents.get("variable", {}):
if var_name in var:
return var[var_name]
return var[var_name]["default"]
else:
raise ValueError(f"Could not find variable {var_name}")

Expand Down
6 changes: 3 additions & 3 deletions src/_nebari/constants.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CURRENT_RELEASE = "2024.3.1"
CURRENT_RELEASE = "2024.3.2"

# NOTE: Terraform cannot be upgraded further due to Hashicorp licensing changes
# implemented in August 2023.
Expand All @@ -8,14 +8,14 @@
# 04-kubernetes-ingress
DEFAULT_TRAEFIK_IMAGE_TAG = "2.9.1"

HIGHEST_SUPPORTED_K8S_VERSION = ("1", "26", "9")
HIGHEST_SUPPORTED_K8S_VERSION = ("1", "29", "2")
DEFAULT_GKE_RELEASE_CHANNEL = "UNSPECIFIED"

DEFAULT_NEBARI_DASK_VERSION = CURRENT_RELEASE
DEFAULT_NEBARI_IMAGE_TAG = CURRENT_RELEASE
DEFAULT_NEBARI_WORKFLOW_CONTROLLER_IMAGE_TAG = CURRENT_RELEASE

DEFAULT_CONDA_STORE_IMAGE_TAG = "2024.1.1"
DEFAULT_CONDA_STORE_IMAGE_TAG = "2024.3.1"

LATEST_SUPPORTED_PYTHON_VERSION = "3.10"

Expand Down
6 changes: 3 additions & 3 deletions src/_nebari/stages/infrastructure/template/local/main.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
terraform {
required_providers {
kind = {
source = "kyma-incubator/kind"
version = "0.0.11"
source = "tehcyx/kind"
version = "0.4.0"
}
docker = {
source = "kreuzwerker/docker"
Expand Down Expand Up @@ -48,7 +48,7 @@ resource "kind_cluster" "default" {

node {
role = "general"
image = "kindest/node:v1.23.13"
image = "kindest/node:v1.29.2"
}
}
}
Expand Down
Loading
Loading