make apimachinery && make crds

k8s/crds/kops.k8s.io_clusters.yaml

@@ -5060,6 +5060,12 @@ spec:
                       nodeInitBootstrapFile:
                         description: NodeInitBootstrapFile is unused.
                         type: string
+                      operatorPodAnnotations:
+                        additionalProperties:
+                          type: string
+                        description: 'OperatorPodAnnotations makes possible to add
+                          additional annotations to cilium operator. Default: none'
+                        type: object
                       pprof:
                         description: Pprof is unused.
                         type: boolean

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -1963,6 +1963,7 @@ func autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
 	out.Masquerade = in.Masquerade
 	// INFO: in.Nat46Range opted out of conversion generation
 	out.AgentPodAnnotations = in.AgentPodAnnotations
+	out.OperatorPodAnnotations = in.OperatorPodAnnotations
 	// INFO: in.Pprof opted out of conversion generation
 	// INFO: in.PrefilterDevice opted out of conversion generation
 	// INFO: in.PrometheusServeAddr opted out of conversion generation
@@ -2037,6 +2038,7 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in *
 	out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod
 	out.Masquerade = in.Masquerade
 	out.AgentPodAnnotations = in.AgentPodAnnotations
+	out.OperatorPodAnnotations = in.OperatorPodAnnotations
 	out.Tunnel = in.Tunnel
 	out.MonitorAggregation = in.MonitorAggregation
 	out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax

pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

@@ -604,6 +604,13 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
 			(*out)[key] = val
 		}
 	}
+	if in.OperatorPodAnnotations != nil {
+		in, out := &in.OperatorPodAnnotations, &out.OperatorPodAnnotations
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	if in.InstallIptablesRules != nil {
 		in, out := &in.InstallIptablesRules, &out.InstallIptablesRules
 		*out = new(bool)

pkg/apis/kops/v1alpha3/zz_generated.conversion.go

@@ -2099,6 +2099,7 @@ func autoConvert_v1alpha3_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
 	out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod
 	out.Masquerade = in.Masquerade
 	out.AgentPodAnnotations = in.AgentPodAnnotations
+	out.OperatorPodAnnotations = in.OperatorPodAnnotations
 	out.Tunnel = in.Tunnel
 	out.MonitorAggregation = in.MonitorAggregation
 	out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
@@ -2162,6 +2163,7 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in *
 	out.IdentityChangeGracePeriod = in.IdentityChangeGracePeriod
 	out.Masquerade = in.Masquerade
 	out.AgentPodAnnotations = in.AgentPodAnnotations
+	out.OperatorPodAnnotations = in.OperatorPodAnnotations
 	out.Tunnel = in.Tunnel
 	out.MonitorAggregation = in.MonitorAggregation
 	out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax

pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go

@@ -626,6 +626,13 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
 			(*out)[key] = val
 		}
 	}
+	if in.OperatorPodAnnotations != nil {
+		in, out := &in.OperatorPodAnnotations, &out.OperatorPodAnnotations
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	if in.InstallIptablesRules != nil {
 		in, out := &in.InstallIptablesRules, &out.InstallIptablesRules
 		*out = new(bool)

pkg/apis/kops/zz_generated.deepcopy.go

@@ -707,6 +707,13 @@ func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) {
 			(*out)[key] = val
 		}
 	}
+	if in.OperatorPodAnnotations != nil {
+		in, out := &in.OperatorPodAnnotations, &out.OperatorPodAnnotations
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	if in.InstallIptablesRules != nil {
 		in, out := &in.InstallIptablesRules, &out.InstallIptablesRules
 		*out = new(bool)

tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content

@@ -230,6 +230,10 @@ spec:
       ipam: kubernetes
       memoryRequest: 128Mi
       monitorAggregation: medium
+      operatorPodAnnotations:
+        test1: "true"
+        test2: "123"
+        test3: cilium-operator
       sidecarIstioProxyImage: cilium/istio_proxy
       toFqdnsDnsRejectResponseCode: refused
       tunnel: vxlan

tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content

@@ -48,7 +48,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.16
     manifest: networking.cilium.io/k8s-1.16-v1.12.yaml
-    manifestHash: 2a1ee49e7de7f6109240c11f32555b269d41ac87416a0203f2cbac9fda60283a
+    manifestHash: d1db96e7bf2e42c0e9514182f66fc48ca5eca29063c103f5e1b73c770f750c3a
     name: networking.cilium.io
     needsRollingUpdate: all
     selector:

tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content

@@ -648,6 +648,10 @@ spec:
     type: RollingUpdate
   template:
     metadata:
+      annotations:
+        test1: "true"
+        test2: "123"
+        test3: cilium-operator
       creationTimestamp: null
       labels:
         io.cilium/app: operator