Skip to content

Commit 6046a9d

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents 0334bc4 + b3ba59b commit 6046a9d

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

.github/workflows/test-provider.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102

103103
- name: 'Azure login'
104104
if: ${{ matrix.provider == 'azure' }}
105-
uses: azure/login@v1
105+
uses: azure/login@v2
106106
with:
107107
client-id: ${{ secrets.ARM_CLIENT_ID }}
108108
tenant-id: ${{ secrets.ARM_TENANT_ID }}

README.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
> [!IMPORTANT]
2-
> **Nebari Deployment Issues**
3-
>
4-
> The current stable releases on PyPI and conda-forge suffer from issues related to [Bitnami image deprecation](https://github.com/bitnami/charts/issues/35164) that prevent successful deployments.
5-
> These issues have been resolved on the `main` branch and will be included in the upcoming `2025.10.1` release.
6-
>
7-
> If trying to deploy nebari in the meantime, please install directly from the `main` branch e.g. `pip install git+https://github.com/nebari-dev/nebari.git@main`.
8-
9-
---
10-
111
<p align="center">
122
<picture>
133
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/nebari-dev/nebari-design/main/logo-mark/horizontal/Nebari-Logo-Horizontal-Lockup.svg">
@@ -24,7 +14,7 @@
2414
| :---------- | :-----|
2515
| Project | [![License](https://img.shields.io/badge/License-BSD%203--Clause-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://opensource.org/licenses/BSD-3-Clause) [![Nebari documentation](https://img.shields.io/badge/%F0%9F%93%96%20Read-the%20docs-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://www.nebari.dev/docs/welcome) [![PyPI](https://img.shields.io/pypi/v/nebari)](https://badge.fury.io/py/nebari) [![conda version](https://img.shields.io/conda/vn/conda-forge/nebari)]((https://anaconda.org/conda-forge/nebari)) |
2616
| Community | [![GH discussions](https://img.shields.io/badge/%F0%9F%92%AC%20-Participate%20in%20discussions-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://github.com/nebari-dev/nebari/discussions) [![Open an issue](https://img.shields.io/badge/%F0%9F%93%9D%20Open-an%20issue-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://github.com/nebari-dev/nebari/issues/new/choose) [![Community guidelines](https://img.shields.io/badge/🤝%20Community-guidelines-gray.svg?colorA=2D2A56&colorB=5936D9&style=flat.svg)](https://www.nebari.dev/docs/community/) |
27-
| CI | [![Kubernetes Tests](https://github.com/nebari-dev/nebari/actions/workflows/test_local_integration.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/kubernetes_test.yaml) [![Tests](https://github.com/nebari-dev/nebari/actions/workflows/test.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test.yaml) [![Test Nebari Provider](https://github.com/nebari-dev/nebari/actions/workflows/test-provider.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test-provider.yaml)|
17+
| CI | [![Kubernetes Tests](https://github.com/nebari-dev/nebari/actions/workflows/test_local_integration.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test_local_integration.yaml) [![Tests](https://github.com/nebari-dev/nebari/actions/workflows/test.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test.yaml) [![Test Nebari Provider](https://github.com/nebari-dev/nebari/actions/workflows/test-provider.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test-provider.yaml)|
2818
| Cloud Providers | [![AWS Deployment Status](https://github.com/nebari-dev/nebari/actions/workflows/test_aws_integration.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test_aws_integration.yaml) [![Azure Deployment Status](https://github.com/nebari-dev/nebari/actions/workflows/test_azure_integration.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test_azure_integration.yaml) [![GCP Deployment Status](https://github.com/nebari-dev/nebari/actions/workflows/test_gcp_integration.yaml/badge.svg)](https://github.com/nebari-dev/nebari/actions/workflows/test_gcp_integration.yaml)|
2919

3020
## Table of contents

src/_nebari/stages/infrastructure/template/gcp/modules/kubernetes/main.tf

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
data "google_client_config" "main" {
22
}
33

4+
data "google_container_engine_versions" "main" {
5+
location = var.location
6+
version_prefix = "${var.kubernetes_version}."
7+
}
8+
49
resource "google_container_cluster" "main" {
510
name = var.name
611
location = var.location
7-
min_master_version = var.kubernetes_version
12+
min_master_version = data.google_container_engine_versions.main.latest_master_version
813
deletion_protection = false
914

1015
node_locations = var.availability_zones
@@ -75,7 +80,7 @@ resource "google_container_node_pool" "main" {
7580
name = local.merged_node_groups[count.index].name
7681
location = var.location
7782
cluster = google_container_cluster.main.name
78-
version = var.kubernetes_version
83+
version = data.google_container_engine_versions.main.latest_node_version
7984

8085
initial_node_count = local.merged_node_groups[count.index].min_size
8186

@@ -122,4 +127,11 @@ resource "google_container_node_pool" "main" {
122127
tags = var.tags
123128
}
124129

130+
lifecycle {
131+
ignore_changes = [
132+
# GCP automatically adds resource labels for node pools (e.g., goog-gke-accelerator-type)
133+
node_config[0].resource_labels,
134+
]
135+
}
136+
125137
}

src/_nebari/stages/infrastructure/template/local/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ terraform {
66
}
77
docker = {
88
source = "kreuzwerker/docker"
9-
version = "2.16.0"
9+
version = "3.8.0"
1010
}
1111
kubectl = {
1212
source = "gavinbunney/kubectl"

0 commit comments

Comments
 (0)