starlingx/stx-puppet
Code Issues Proposed changes

Merge "Ignore kubectl error output when searching firewall's GNP"

Browse Source
This commit is contained in:
Zuul 2025-01-21 16:12:15 +00:00 committed by Gerrit Code Review
commit 0333af6eff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-manifests/src/bin/calico_firewall_apply_policy.sh
View File

@ -25,7 +25,7 @@ resource_name='globalnetworkpolicies.crd.projectcalico.org';
resource_exist=$(kubectl --kubeconfig=${kubeconfig} get --no-headers customresourcedefinitions.apiextensions.k8s.io ${resource_name} | awk '{print $1}');
if [[ ${resource_exist} == "${resource_name}" ]]; then
gnp_exist=$(kubectl --kubeconfig=${kubeconfig} get --no-headers ${resource_name} ${gnp_name} | awk '{print $1}');
gnp_exist=$(kubectl --kubeconfig=${kubeconfig} get --no-headers ${resource_name} ${gnp_name} 2> /dev/null | awk '{print $1}');
if [[ ${gnp_exist} == "${gnp_name}" ]]; then
# Remove annotation as it contains last-applied-configuration with
# resourceVersion in it, which will require the gnp re-apply to