Skip to content

Commit dad498f

Browse files
committed
Merge remote-tracking branch 'origin/master' into release-13.0.0
2 parents 5ecfa46 + 5746d4c commit dad498f

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ references:
226226
name: "Validate DB Cluster"
227227
command: make -C ./.do/db-cluster initialize_terrafom
228228
- <<: *persist_to_workspace
229-
229+
230230
plan_cluster: &plan_cluster
231231
steps:
232232
- <<: *attach_workspace

.do/k8s-cluster/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TF_PARALLELISM ?= 30
55
TF ?= $(TF_EXTRA_OPTS) terraform
66
WORKSPACE ?= ${DO_TF_WORKSPACE}
77
VARS_FILE ?= deploy.tfvars
8-
NGINX_INGRESS_VERSION ?= 4.2.0
8+
NGINX_INGRESS_VERSION ?= 4.8.3
99
CERT_MANAGER_VERSION ?= v1.9.1
1010
K8S_VERSION ?= 1.26
1111
DO_K8S_SLUG ?= $(shell doctl kubernetes options versions | grep $(K8S_VERSION) | awk '{print $$1}')

.do/k8s-cluster/values/values-nginx.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
controller:
2+
enableAnnotationValidations: true
23
publishService:
34
enabled: true
45
config:

0 commit comments

Comments
 (0)