Helm template rendering error when specifying both bgp.enabled and operator.resources

[rkage]

Bug report

General Information

• Cilium version: 1.10.0
• Kernel version: 5.11.0-1008-raspi
• Orchestration system version in use: kubectl/1.21.1, helm/3.5.4

How to reproduce the issue

1. Create a values.yaml file with the following contents:

operator:
  resources:
    requests:
      cpu: 100m
      memory: 256Mi
    limits:
      cpu: 200m
      memory: 384Mi

bgp:
  enabled: true
  announce:
    loadbalancerIP: true

2. helm install cilium cilium/cilium -f values.yaml

Error reported by helm:
YAML parse error on cilium/templates/cilium-operator-deployment.yaml: error converting YAML to JSON: yaml: line 92: did not find expected key

It appears the lines 231-239 of the cilium-operator-deployment.yaml file are out of order;

cilium/install/kubernetes/cilium/templates/cilium-operator-deployment.yaml

Lines 231 to 239 in d3b5492

	{{- if .Values.operator.resources }}
	resources:
	{{- toYaml .Values.operator.resources | trim | nindent 10 }}
	{{- end }}
	{{- if .Values.bgp.enabled }}
	- mountPath: /var/lib/cilium/bgp
	name: bgp-config-path
	readOnly: true
	{{- end }}

The {{- if .Values.bgp.enabled }} block should be moved above the {{- if .Values.operator.resources }} block.

[pchaigno]

I see you already have a commit ready to fix this so I've assigned you. Please tell me if I'm assuming incorrectly.

EDIT: And even a PR now 🚀