Skip to content

Commit cbab4aa

Browse files
authored
Merge branch 'main' into private-cluster-node-pool
2 parents d985e40 + 0b75473 commit cbab4aa

File tree

56 files changed

+137
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+137
-97
lines changed

.github/conventional-commit-lint.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/lint.yaml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ name: 'lint'
2020
on:
2121
workflow_dispatch:
2222
pull_request:
23-
branches:
24-
- main
23+
types: [opened, edited, reopened, synchronize]
24+
branches: [main]
25+
26+
permissions:
27+
contents: read
2528

2629
concurrency:
2730
group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
@@ -47,8 +50,25 @@ jobs:
4750
- run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} module-swapper
4851
env:
4952
ENABLE_BPMETADATA: 1
50-
5153
- run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh
5254
env:
5355
ENABLE_BPMETADATA: 1
5456

57+
commitlint:
58+
runs-on: ubuntu-latest
59+
steps:
60+
- uses: actions/checkout@v4
61+
with:
62+
fetch-depth: 0
63+
- name: Setup node
64+
uses: actions/setup-node@v4
65+
with:
66+
node-version: lts/*
67+
- name: Install commitlint
68+
run: |
69+
npm install -D @commitlint/[email protected] @commitlint/[email protected]
70+
echo "module.exports = { extends: ['@commitlint/config-conventional'], rules: {'subject-case': [0]} };" > commitlint.config.js
71+
npx commitlint --version
72+
- name: Validate PR commits with commitlint
73+
if: github.event_name == 'pull_request'
74+
run: 'echo "${{ github.event.pull_request.title }}" | npx commitlint --verbose'

examples/acm-terraform-blog-part1/terraform/gke.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module "enabled_google_apis" {
3131

3232
module "gke" {
3333
source = "terraform-google-modules/kubernetes-engine/google"
34-
version = "~> 37.0"
34+
version = "~> 38.0"
3535
project_id = module.enabled_google_apis.project_id
3636
name = "sfl-acm-part1"
3737
region = var.region

examples/acm-terraform-blog-part2/terraform/gke.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module "enabled_google_apis" {
3131

3232
module "gke" {
3333
source = "terraform-google-modules/kubernetes-engine/google"
34-
version = "~> 37.0"
34+
version = "~> 38.0"
3535
project_id = module.enabled_google_apis.project_id
3636
name = "sfl-acm-part2"
3737
region = var.region

examples/acm-terraform-blog-part3/terraform/gke.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module "enabled_google_apis" {
3333

3434
module "gke" {
3535
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
36-
version = "~> 37.0"
36+
version = "~> 38.0"
3737
project_id = module.enabled_google_apis.project_id
3838
name = "sfl-acm-part3"
3939
region = var.region
@@ -48,7 +48,7 @@ module "gke" {
4848

4949
module "wi" {
5050
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
51-
version = "~> 37.0"
51+
version = "~> 38.0"
5252
gcp_sa_name = "cnrmsa"
5353
cluster_name = module.gke.name
5454
name = "cnrm-controller-manager"

examples/autopilot_private_firewalls/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ provider "kubernetes" {
3434

3535
module "gke" {
3636
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
37-
version = "~> 37.0"
37+
version = "~> 38.0"
3838

3939
project_id = var.project_id
4040
name = "${local.cluster_type}-cluster"

examples/confidential_autopilot_private/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ resource "google_kms_crypto_key_iam_member" "main" {
5454

5555
module "gke" {
5656
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
57-
version = "~> 37.0"
57+
version = "~> 38.0"
5858

5959
project_id = var.project_id
6060
name = "${local.cluster_type}-cluster"

examples/confidential_safer_cluster/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ resource "google_kms_crypto_key_iam_member" "main" {
6262

6363
module "gke" {
6464
source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster"
65-
version = "~> 37.0"
65+
version = "~> 38.0"
6666

6767
project_id = var.project_id
6868
name = "${local.cluster_type}-cluster-${random_string.suffix.result}"

examples/deploy_service/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ provider "kubernetes" {
2828

2929
module "gke" {
3030
source = "terraform-google-modules/kubernetes-engine/google"
31-
version = "~> 37.0"
31+
version = "~> 38.0"
3232

3333
project_id = var.project_id
3434
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"

examples/disable_client_cert/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ provider "kubernetes" {
2828

2929
module "gke" {
3030
source = "terraform-google-modules/kubernetes-engine/google"
31-
version = "~> 37.0"
31+
version = "~> 38.0"
3232

3333
project_id = var.project_id
3434
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"

0 commit comments

Comments
 (0)