fix: various typos, remove unnecessary LifeCycle for cilium-agent DS
This commit is contained in:
parent
c16a233864
commit
7612d257aa
@ -5,7 +5,7 @@ pre_control_plane_upgrade_cluster() {
|
|||||||
if [ "$PLATFORM" != "gke" ];then
|
if [ "$PLATFORM" != "gke" ];then
|
||||||
# patch multus DS to ONLY run pods on 1.31 controllers
|
# patch multus DS to ONLY run pods on 1.31 controllers
|
||||||
kubectl patch ds kube-multus-ds -n kube-system -p '{"spec": {"template": {"spec": {"nodeSelector": {"node.kubernetes.io/kubezero.version": "v1.31.6"}}}}}' || true
|
kubectl patch ds kube-multus-ds -n kube-system -p '{"spec": {"template": {"spec": {"nodeSelector": {"node.kubernetes.io/kubezero.version": "v1.31.6"}}}}}' || true
|
||||||
}
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ function ensure_kubezero_secret_key() {
|
|||||||
local val
|
local val
|
||||||
|
|
||||||
for key in $1; do
|
for key in $1; do
|
||||||
val=$(echo $secret | yq ".data.\"$key\""
|
val=$(echo $secret | yq ".data.\"$key\"")
|
||||||
if [ "$val" == "null" ]; then
|
if [ "$val" == "null" ]; then
|
||||||
set_kubezero_secret $key ""
|
set_kubezero_secret $key ""
|
||||||
fi
|
fi
|
||||||
|
@ -44,6 +44,7 @@ cilium:
|
|||||||
logFile: /var/log/cilium-cni.log
|
logFile: /var/log/cilium-cni.log
|
||||||
#-- Ensure this is false if multus is enabled
|
#-- Ensure this is false if multus is enabled
|
||||||
exclusive: true
|
exclusive: true
|
||||||
|
iptablesRemoveAWSRules: false
|
||||||
|
|
||||||
cluster:
|
cluster:
|
||||||
# This should match the second octet of clusterPoolIPv4PodCIDRList
|
# This should match the second octet of clusterPoolIPv4PodCIDRList
|
||||||
|
Loading…
x
Reference in New Issue
Block a user