Skip to content

Commit

Permalink
fix(helm): do not override CHECKPOINT_PATH
Browse files Browse the repository at this point in the history
[ upstream commit b38d591 ]

[ Backporter's notes: conflicts due to structure around daemonset
  manifest having changed in #16795, which was not backported to v1.10.
  Changes have been manually reapplied where appropriate in
  `install/kubernetes/cilium/templates/cilium-nodeinit-daemonset.yaml`.
]

Take advantage of the dynamic CHECKPOINT_PATH in the startup-script:
https://github.com/cilium/image-tools/blob/396d5a19690229b42398a8be63b5712ea64a2601/images/startup-script/manage-startup-script.sh#L58

Signed-off-by: Raphaël Pinson <raphael@isovalent.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
  • Loading branch information
raphink authored and tklauser committed Apr 14, 2022
1 parent a77f324 commit c5fa809
Showing 1 changed file with 0 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ spec:
echo "Node de-initialization complete"
{{- end }}
env:
- name: CHECKPOINT_PATH
value: /tmp/node-init.cilium.io
# STARTUP_SCRIPT is the script run on node bootstrap. Node
# bootstrapping can be customized in this script. This script is invoked
# using nsenter, so it runs in the host's network and mount namespace using
Expand Down

0 comments on commit c5fa809

Please sign in to comment.