kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Cilium agent pod annotations support to improve personalization 

Annotations is pretty useful when you need third-party tool to add additional behavior
for a k8s resource.
Lots of auto-discovery tools are based on this annotations.
This commit is contained in:
Nicolas Sterchele 2021-09-24 20:13:22 +02:00
parent 2584e4133d
commit 103a98d060
11 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -4438,6 +4438,12 @@ spec:
items:
type: string
type: array
agentPodAnnotations:
additionalProperties:
type: string
description: 'AgentPodAnnotations makes possible to add additional
annotations to the cilium agent. Default: none'
type: object
agentPrometheusPort:
description: AgentPrometheusPort is the port to listen to
for Prometheus metrics. Defaults to 9090.

3
pkg/apis/kops/networking.go
View File

@ -434,6 +434,9 @@ type CiliumNetworkingSpec struct {
// Nat6Range is not implemented and may be removed in the future.
// Setting this has no effect.
Nat46Range string `json:"nat46Range,omitempty"`
// AgentPodAnnotations makes possible to add additional annotations to cilium agent.
// Default: none
AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
// Pprof is not implemented and may be removed in the future.
// Setting this has no effect.
Pprof bool `json:"pprof,omitempty"`

3
pkg/apis/kops/v1alpha2/networking.go
View File

@ -434,6 +434,9 @@ type CiliumNetworkingSpec struct {
// Nat6Range is not implemented and may be removed in the future.
// Setting this has no effect.
Nat46Range string `json:"nat46Range,omitempty"`
// AgentPodAnnotations makes possible to add additional annotations to the cilium agent.
// Default: none
AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
// Pprof is not implemented and may be removed in the future.
// Setting this has no effect.
Pprof bool `json:"pprof,omitempty"`

2
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -1849,6 +1849,7 @@ func autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
out.LogstashProbeTimer = in.LogstashProbeTimer
out.DisableMasquerade = in.DisableMasquerade
out.Nat46Range = in.Nat46Range
out.AgentPodAnnotations = in.AgentPodAnnotations
out.Pprof = in.Pprof
out.PrefilterDevice = in.PrefilterDevice
out.PrometheusServeAddr = in.PrometheusServeAddr
@ -1958,6 +1959,7 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in *
out.LogstashProbeTimer = in.LogstashProbeTimer
out.DisableMasquerade = in.DisableMasquerade
out.Nat46Range = in.Nat46Range
out.AgentPodAnnotations = in.AgentPodAnnotations
out.Pprof = in.Pprof
out.PrefilterDevice = in.PrefilterDevice
out.PrometheusServeAddr = in.PrometheusServeAddr

7
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go generated
View File

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

3
pkg/apis/kops/v1alpha3/networking.go
View File

@ -434,6 +434,9 @@ type CiliumNetworkingSpec struct {
// Nat6Range is not implemented and may be removed in the future.
// Setting this has no effect.
Nat46Range string `json:"nat46Range,omitempty"`
// AgentPodAnnotations makes possible to add additional annotations to the cilium agent.
// Default: none
AgentPodAnnotations map[string]string `json:"agentPodAnnotations,omitempty"`
// Pprof is not implemented and may be removed in the future.
// Setting this has no effect.
Pprof bool `json:"pprof,omitempty"`

2
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -1849,6 +1849,7 @@ func autoConvert_v1alpha3_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
out.LogstashProbeTimer = in.LogstashProbeTimer
out.DisableMasquerade = in.DisableMasquerade
out.Nat46Range = in.Nat46Range
out.AgentPodAnnotations = in.AgentPodAnnotations
out.Pprof = in.Pprof
out.PrefilterDevice = in.PrefilterDevice
out.PrometheusServeAddr = in.PrometheusServeAddr
@ -1958,6 +1959,7 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in *
out.LogstashProbeTimer = in.LogstashProbeTimer
out.DisableMasquerade = in.DisableMasquerade
out.Nat46Range = in.Nat46Range
out.AgentPodAnnotations = in.AgentPodAnnotations
out.Pprof = in.Pprof
out.PrefilterDevice = in.PrefilterDevice
out.PrometheusServeAddr = in.PrometheusServeAddr

7
pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go generated
View File

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

7
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

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

3
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
View File

@ -555,6 +555,9 @@ spec:
prometheus.io/scrape: "true"
prometheus.io/port: {{ printf "%q" .AgentPrometheusPort }}
{{ end }}
{{- with .AgentPodAnnotations }}
{{- . | nindent 8 }}
{{- end }}
labels:
k8s-app: cilium
kubernetes.io/cluster-service: "true"

3
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template
View File

@ -587,6 +587,9 @@ spec:
prometheus.io/scrape: "true"
prometheus.io/port: {{ printf "%q" .AgentPrometheusPort }}
{{ end }}
{{- with .AgentPodAnnotations }}
{{- . | nindent 8 }}
{{- end }}
labels:
k8s-app: cilium
kubernetes.io/cluster-service: "true"