Skip to content

Commit 2a895c1

Browse files
authored
Merge branch 'master' into feat/firewall_disco_pod_ranges
2 parents 37bfd15 + 3424339 commit 2a895c1

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/renovate.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"extends": [
44
"config:base",
55
":semanticCommits",
6-
":preserveSemverRanges"
6+
":preserveSemverRanges",
7+
":rebaseStalePrs"
78
],
89
"stabilityDays":7,
910
"ignorePaths": [],
@@ -15,10 +16,17 @@
1516
"stabilityDays":0
1617
},
1718
"packageRules": [
19+
{
20+
"matchPaths": ["examples/**", "test/**", ".github/**"],
21+
"extends": [":semanticCommitTypeAll(chore)"]
22+
},
1823
{
1924
"matchDepTypes": ["module"],
2025
"groupName": "TF modules",
21-
"separateMajorMinor":false
26+
"separateMajorMinor":false,
27+
"major": {
28+
"semanticCommitType": "feat!"
29+
}
2230
},
2331
{
2432
"matchDepTypes": ["require"],

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @terraform-google-modules/cft-admins @Jberlinsky

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 = "~> 23.0"
34+
version = "~> 24.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 = "~> 23.0"
34+
version = "~> 24.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 = "~> 23.0"
36+
version = "~> 24.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 = "~> 23.0"
51+
version = "~> 24.0"
5252
gcp_sa_name = "cnrmsa"
5353
cluster_name = module.gke.name
5454
name = "cnrm-controller-manager"

0 commit comments

Comments
 (0)