Support Cilium operator pod annotations

pkg/apis/kops/networking.go

@@ -391,6 +391,9 @@ type CiliumNetworkingSpec struct {
 	// AgentPodAnnotations makes possible to add additional annotations to cilium agent.
 	// Default: none
 	AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
+	// OperatorPodAnnotations makes possible to add additional annotations to cilium operator.
+	// Default: none
+	OperatorPodAnnotations map[string]string `json:"operatorPodAnnotations,omitempty"`
 	// Tunnel specifies the Cilium tunnelling mode. Possible values are "vxlan", "geneve", or "disabled".
 	// Default: vxlan
 	Tunnel string `json:"tunnel,omitempty"`

pkg/apis/kops/v1alpha2/networking.go

@@ -464,6 +464,9 @@ type CiliumNetworkingSpec struct {
 	// AgentPodAnnotations makes possible to add additional annotations to the cilium agent.
 	// Default: none
 	AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
+	// OperatorPodAnnotations makes possible to add additional annotations to cilium operator.
+	// Default: none
+	OperatorPodAnnotations map[string]string `json:"operatorPodAnnotations,omitempty"`
 	// Pprof is unused.
 	// +k8s:conversion-gen=false
 	Pprof bool `json:"pprof,omitempty"`

pkg/apis/kops/v1alpha3/networking.go

@@ -354,6 +354,9 @@ type CiliumNetworkingSpec struct {
 	// AgentPodAnnotations makes possible to add additional annotations to the cilium agent.
 	// Default: none
 	AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
+	// OperatorPodAnnotations makes possible to add additional annotations to cilium operator.
+	// Default: none
+	OperatorPodAnnotations map[string]string `json:"operatorPodAnnotations,omitempty"`
 	// Tunnel specifies the Cilium tunnelling mode. Possible values are "vxlan", "geneve", or "disabled".
 	// Default: vxlan
 	Tunnel string `json:"tunnel,omitempty"`

tests/integration/update_cluster/privatecilium/in-v1alpha2.yaml

@@ -30,6 +30,10 @@ spec:
         test1: "true"
         test2: "123"
         test3: awesome
+      operatorPodAnnotations:
+        test1: "true"
+        test2: "123"
+        test3: cilium-operator
   nonMasqueradeCIDR: 100.64.0.0/10
   sshAccess:
   - 0.0.0.0/0

upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.12.yaml.template

@@ -964,6 +964,10 @@ spec:
     type: RollingUpdate
   template:
     metadata:
+      annotations:
+        {{- range $key, $value := .OperatorPodAnnotations }}
+        {{ $key }}: "{{ $value }}"
+        {{- end }}
       labels:
         io.cilium/app: operator
         name: cilium-operator