Skip to content

Commit f22412b

Browse files
authored
PLAT-9951: Update helm to v4, turn off server side apply (#449)
1 parent 4ecddab commit f22412b

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

.circleci/config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
parameters:
44
helm_version:
55
type: string
6-
default: "v3.19.2"
6+
default: "v4.2.0"
77
terraform_version:
88
type: string
99
default: "1.14.9"
@@ -290,13 +290,15 @@ jobs:
290290
- install_tf:
291291
terraform_version: << parameters.terraform_version >>
292292
- install_helm:
293-
helm_version: << parameters.helm_version >>
293+
helm_version: v3.19.2
294294
- install_hcledit
295295
- setup_tf_mods_latest_rel
296296
- set_mod_source_latest_rel
297297
- set_tf_vars
298298
- tf_deploy
299299
- store_deploy_artifacts
300+
- install_helm:
301+
helm_version: << parameters.helm_version >>
300302
- setup_tf_mods_upgrade
301303
- set_mod_source_current
302304
- set_tf_vars

modules/eks/submodules/k8s/templates/k8s-functions.sh.tftpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ _install_calico_chart() {
143143
--version "${calico_version}" \
144144
--kubeconfig "$kubeconfig" \
145145
--namespace "tigera-operator" \
146+
--server-side=false \
146147
--set installation.kubernetesProvider=EKS \
147148
--set installation.cni.type=AmazonVPC \
148149
--set installation.registry="${calico_image_registry}/" \

0 commit comments

Comments
 (0)