mirror of https://github.com/kubernetes/kops.git
Merge pull request #7474 from nebril/cilium-standalone
Change Cilium templates to standalone version
This commit is contained in:
Kubernetes Prow Robot
GitHub
commit
3b9821d5c5
|
|
@ -422,7 +422,7 @@ $ kops create cluster \
|
||||||
--name cilium.example.com
|
--name cilium.example.com
|
||||||
```
|
```
|
||||||
|
|
||||||
The above will deploy a daemonset installation which requires K8s 1.7.x or above.
|
The above will deploy a Cilium daemonset installation which requires K8s 1.10.x or above.
|
||||||
|
|
||||||
#### Configuring Cilium
|
#### Configuring Cilium
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2121,6 +2121,8 @@ spec:
|
||||||
type: object
|
type: object
|
||||||
cilium:
|
cilium:
|
||||||
properties:
|
properties:
|
||||||
|
IPTablesRulesNoinstall:
|
||||||
|
type: boolean
|
||||||
accessLog:
|
accessLog:
|
||||||
type: string
|
type: string
|
||||||
agentLabels:
|
agentLabels:
|
||||||
|
|
@ -2129,16 +2131,28 @@ spec:
|
||||||
type: array
|
type: array
|
||||||
allowLocalhost:
|
allowLocalhost:
|
||||||
type: string
|
type: string
|
||||||
|
autoDirectNodeRoutes:
|
||||||
|
type: boolean
|
||||||
autoIpv6NodeRoutes:
|
autoIpv6NodeRoutes:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
bpfCTGlobalAnyMax:
|
||||||
|
format: int64
|
||||||
|
type: integer
|
||||||
|
bpfCTGlobalTCPMax:
|
||||||
|
format: int64
|
||||||
|
type: integer
|
||||||
bpfRoot:
|
bpfRoot:
|
||||||
type: string
|
type: string
|
||||||
|
clusterName:
|
||||||
|
type: string
|
||||||
containerRuntime:
|
containerRuntime:
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
containerRuntimeEndpoint:
|
containerRuntimeEndpoint:
|
||||||
type: object
|
type: object
|
||||||
|
containerRuntimeLabels:
|
||||||
|
type: string
|
||||||
debug:
|
debug:
|
||||||
type: boolean
|
type: boolean
|
||||||
debugVerbose:
|
debugVerbose:
|
||||||
|
|
@ -2155,10 +2169,16 @@ spec:
|
||||||
type: boolean
|
type: boolean
|
||||||
disableMasquerade:
|
disableMasquerade:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
enableNodePort:
|
||||||
|
type: boolean
|
||||||
enablePolicy:
|
enablePolicy:
|
||||||
type: string
|
type: string
|
||||||
enableTracing:
|
enableTracing:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
enableipv4:
|
||||||
|
type: boolean
|
||||||
|
enableipv6:
|
||||||
|
type: boolean
|
||||||
envoyLog:
|
envoyLog:
|
||||||
type: string
|
type: string
|
||||||
ipv4ClusterCidrMaskSize:
|
ipv4ClusterCidrMaskSize:
|
||||||
|
|
@ -2209,22 +2229,30 @@ spec:
|
||||||
logstashProbeTimer:
|
logstashProbeTimer:
|
||||||
format: int32
|
format: int32
|
||||||
type: integer
|
type: integer
|
||||||
|
monitorAggregation:
|
||||||
|
type: string
|
||||||
nat46Range:
|
nat46Range:
|
||||||
type: string
|
type: string
|
||||||
pprof:
|
pprof:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
preallocateBPFMaps:
|
||||||
|
type: boolean
|
||||||
prefilterDevice:
|
prefilterDevice:
|
||||||
type: string
|
type: string
|
||||||
prometheusServeAddr:
|
prometheusServeAddr:
|
||||||
type: string
|
type: string
|
||||||
restore:
|
restore:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
sidecarIstioProxyImage:
|
||||||
|
type: string
|
||||||
singleClusterRoute:
|
singleClusterRoute:
|
||||||
type: boolean
|
type: boolean
|
||||||
socketPath:
|
socketPath:
|
||||||
type: string
|
type: string
|
||||||
stateDir:
|
stateDir:
|
||||||
type: string
|
type: string
|
||||||
|
toFqdnsEnablePoller:
|
||||||
|
type: boolean
|
||||||
tracePayloadlen:
|
tracePayloadlen:
|
||||||
format: int64
|
format: int64
|
||||||
type: integer
|
type: integer
|
||||||
|
|
@ -2232,6 +2260,22 @@ spec:
|
||||||
type: string
|
type: string
|
||||||
version:
|
version:
|
||||||
type: string
|
type: string
|
||||||
|
waitBPFMount:
|
||||||
|
type: boolean
|
||||||
|
required:
|
||||||
|
- enableipv6
|
||||||
|
- enableipv4
|
||||||
|
- monitorAggregation
|
||||||
|
- bpfCTGlobalTCPMax
|
||||||
|
- bpfCTGlobalAnyMax
|
||||||
|
- preallocateBPFMaps
|
||||||
|
- sidecarIstioProxyImage
|
||||||
|
- clusterName
|
||||||
|
- toFqdnsEnablePoller
|
||||||
|
- waitBPFMount
|
||||||
|
- IPTablesRulesNoinstall
|
||||||
|
- autoDirectNodeRoutes
|
||||||
|
- enableNodePort
|
||||||
type: object
|
type: object
|
||||||
classic:
|
classic:
|
||||||
type: object
|
type: object
|
||||||
|
|
@ -2336,6 +2380,9 @@ spec:
|
||||||
NonMasqueradeCIDR is the CIDR for the internal k8s network (on which
|
NonMasqueradeCIDR is the CIDR for the internal k8s network (on which
|
||||||
pods & services live) It cannot overlap ServiceClusterIPRange
|
pods & services live) It cannot overlap ServiceClusterIPRange
|
||||||
type: string
|
type: string
|
||||||
|
podCIDR:
|
||||||
|
description: PodCIDR is the CIDR from which we allocate IPs for pods
|
||||||
|
type: string
|
||||||
project:
|
project:
|
||||||
description: Project is the cloud project we should use, required on
|
description: Project is the cloud project we should use, required on
|
||||||
GCE
|
GCE
|
||||||
|
|
|
||||||
|
|
@ -196,6 +196,10 @@ spec:
|
||||||
image:
|
image:
|
||||||
description: Image is the instance (ami etc) we should use
|
description: Image is the instance (ami etc) we should use
|
||||||
type: string
|
type: string
|
||||||
|
instanceProtection:
|
||||||
|
description: InstanceProtection makes new instances in an autoscaling
|
||||||
|
group protected from scale in
|
||||||
|
type: boolean
|
||||||
kubelet:
|
kubelet:
|
||||||
description: Kubelet overrides kubelet config from the ClusterSpec
|
description: Kubelet overrides kubelet config from the ClusterSpec
|
||||||
properties:
|
properties:
|
||||||
|
|
@ -520,7 +524,8 @@ spec:
|
||||||
type: string
|
type: string
|
||||||
volumePluginDirectory:
|
volumePluginDirectory:
|
||||||
description: The full path of the directory in which to search for
|
description: The full path of the directory in which to search for
|
||||||
additional third party volume plugins
|
additional third party volume plugins (this path must be writeable,
|
||||||
|
dependant on your choice of OS)
|
||||||
type: string
|
type: string
|
||||||
volumeStatsAggPeriod:
|
volumeStatsAggPeriod:
|
||||||
description: VolumeStatsAggPeriod is the interval for kubelet to
|
description: VolumeStatsAggPeriod is the interval for kubelet to
|
||||||
|
|
|
||||||
|
|
@ -70,6 +70,32 @@ func (b *NetworkBuilder) Build(c *fi.ModelBuilderContext) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if networking.Cilium != nil {
|
||||||
|
var unit *string
|
||||||
|
unit = s(`
|
||||||
|
[Unit]
|
||||||
|
Description=Cilium BPF mounts
|
||||||
|
Documentation=http://docs.cilium.io/
|
||||||
|
DefaultDependencies=no
|
||||||
|
Before=local-fs.target umount.target kubelet.service
|
||||||
|
|
||||||
|
[Mount]
|
||||||
|
What=bpffs
|
||||||
|
Where=/sys/fs/bpf
|
||||||
|
Type=bpf
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
`)
|
||||||
|
|
||||||
|
service := &nodetasks.Service{
|
||||||
|
Name: "sys-fs-bpf.mount",
|
||||||
|
Definition: unit,
|
||||||
|
}
|
||||||
|
service.InitDefaults()
|
||||||
|
c.AddTask(service)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -155,7 +155,7 @@ type AmazonVPCNetworkingSpec struct {
|
||||||
ImageName string `json:"imageName,omitempty"`
|
ImageName string `json:"imageName,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
const CiliumDefaultVersion = "v1.0-stable"
|
const CiliumDefaultVersion = "v1.6.1"
|
||||||
|
|
||||||
// CiliumNetworkingSpec declares that we want Cilium networking
|
// CiliumNetworkingSpec declares that we want Cilium networking
|
||||||
type CiliumNetworkingSpec struct {
|
type CiliumNetworkingSpec struct {
|
||||||
|
|
@ -209,6 +209,27 @@ type CiliumNetworkingSpec struct {
|
||||||
StateDir string `json:"stateDir,omitempty"`
|
StateDir string `json:"stateDir,omitempty"`
|
||||||
TracePayloadLen int `json:"tracePayloadlen,omitempty"`
|
TracePayloadLen int `json:"tracePayloadlen,omitempty"`
|
||||||
Tunnel string `json:"tunnel,omitempty"`
|
Tunnel string `json:"tunnel,omitempty"`
|
||||||
|
|
||||||
|
EnableIpv6 bool `json:"enableipv6"`
|
||||||
|
EnableIpv4 bool `json:"enableipv4"`
|
||||||
|
MonitorAggregation string `json:"monitorAggregation"`
|
||||||
|
BPFCTGlobalTCPMax int `json:"bpfCTGlobalTCPMax"`
|
||||||
|
BPFCTGlobalAnyMax int `json:"bpfCTGlobalAnyMax"`
|
||||||
|
PreallocateBPFMaps bool `json:"preallocateBPFMaps"`
|
||||||
|
SidecarIstioProxyImage string `json:"sidecarIstioProxyImage"`
|
||||||
|
ClusterName string `json:"clusterName"`
|
||||||
|
ToFqdnsEnablePoller bool `json:"toFqdnsEnablePoller"`
|
||||||
|
ContainerRuntimeLabels string `json:"containerRuntimeLabels,omitempty"`
|
||||||
|
IPTablesRulesNoinstall bool `json:"IPTablesRulesNoinstall"`
|
||||||
|
AutoDirectNodeRoutes bool `json:"autoDirectNodeRoutes"`
|
||||||
|
EnableNodePort bool `json:"enableNodePort"`
|
||||||
|
|
||||||
|
//node init options
|
||||||
|
RemoveCbrBridge bool `json:"removeCbrBridge"`
|
||||||
|
RestartPods bool `json:"restartPods"`
|
||||||
|
ReconfigureKubelet bool `json:"reconfigureKubelet"`
|
||||||
|
NodeInitBootstrapFile string `json:"nodeInitBootstrapFile"`
|
||||||
|
CniBinPath string `json:"cniBinPath"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// LyftIpVlanNetworkingSpec declares that we want to use the cni-ipvlan-vpc-k8s CNI networking
|
// LyftIpVlanNetworkingSpec declares that we want to use the cni-ipvlan-vpc-k8s CNI networking
|
||||||
|
|
|
||||||
|
|
@ -206,6 +206,27 @@ type CiliumNetworkingSpec struct {
|
||||||
StateDir string `json:"stateDir,omitempty"`
|
StateDir string `json:"stateDir,omitempty"`
|
||||||
TracePayloadLen int `json:"tracePayloadlen,omitempty"`
|
TracePayloadLen int `json:"tracePayloadlen,omitempty"`
|
||||||
Tunnel string `json:"tunnel,omitempty"`
|
Tunnel string `json:"tunnel,omitempty"`
|
||||||
|
|
||||||
|
EnableIpv6 bool `json:"enableipv6"`
|
||||||
|
EnableIpv4 bool `json:"enableipv4"`
|
||||||
|
MonitorAggregation string `json:"monitorAggregation"`
|
||||||
|
BPFCTGlobalTCPMax int `json:"bpfCTGlobalTCPMax"`
|
||||||
|
BPFCTGlobalAnyMax int `json:"bpfCTGlobalAnyMax"`
|
||||||
|
PreallocateBPFMaps bool `json:"preallocateBPFMaps"`
|
||||||
|
SidecarIstioProxyImage string `json:"sidecarIstioProxyImage"`
|
||||||
|
ClusterName string `json:"clusterName"`
|
||||||
|
ToFqdnsEnablePoller bool `json:"toFqdnsEnablePoller"`
|
||||||
|
ContainerRuntimeLabels string `json:"containerRuntimeLabels,omitempty"`
|
||||||
|
IPTablesRulesNoinstall bool `json:"IPTablesRulesNoinstall"`
|
||||||
|
AutoDirectNodeRoutes bool `json:"autoDirectNodeRoutes"`
|
||||||
|
EnableNodePort bool `json:"enableNodePort"`
|
||||||
|
|
||||||
|
//node init options
|
||||||
|
RemoveCbrBridge bool `json:"removeCbrBridge"`
|
||||||
|
RestartPods bool `json:"restartPods"`
|
||||||
|
ReconfigureKubelet bool `json:"reconfigureKubelet"`
|
||||||
|
NodeInitBootstrapFile string `json:"nodeInitBootstrapFile"`
|
||||||
|
CniBinPath string `json:"cniBinPath"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// LyftIpVlanNetworkingSpec declares that we want to use the cni-ipvlan-vpc-k8s CNI networking
|
// LyftIpVlanNetworkingSpec declares that we want to use the cni-ipvlan-vpc-k8s CNI networking
|
||||||
|
|
|
||||||
|
|
@ -1236,6 +1236,24 @@ func autoConvert_v1alpha1_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
|
||||||
out.StateDir = in.StateDir
|
out.StateDir = in.StateDir
|
||||||
out.TracePayloadLen = in.TracePayloadLen
|
out.TracePayloadLen = in.TracePayloadLen
|
||||||
out.Tunnel = in.Tunnel
|
out.Tunnel = in.Tunnel
|
||||||
|
out.EnableIpv6 = in.EnableIpv6
|
||||||
|
out.EnableIpv4 = in.EnableIpv4
|
||||||
|
out.MonitorAggregation = in.MonitorAggregation
|
||||||
|
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
|
||||||
|
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
|
||||||
|
out.PreallocateBPFMaps = in.PreallocateBPFMaps
|
||||||
|
out.SidecarIstioProxyImage = in.SidecarIstioProxyImage
|
||||||
|
out.ClusterName = in.ClusterName
|
||||||
|
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
|
||||||
|
out.ContainerRuntimeLabels = in.ContainerRuntimeLabels
|
||||||
|
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
|
||||||
|
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
|
||||||
|
out.EnableNodePort = in.EnableNodePort
|
||||||
|
out.RemoveCbrBridge = in.RemoveCbrBridge
|
||||||
|
out.RestartPods = in.RestartPods
|
||||||
|
out.ReconfigureKubelet = in.ReconfigureKubelet
|
||||||
|
out.NodeInitBootstrapFile = in.NodeInitBootstrapFile
|
||||||
|
out.CniBinPath = in.CniBinPath
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1294,6 +1312,24 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha1_CiliumNetworkingSpec(in *
|
||||||
out.StateDir = in.StateDir
|
out.StateDir = in.StateDir
|
||||||
out.TracePayloadLen = in.TracePayloadLen
|
out.TracePayloadLen = in.TracePayloadLen
|
||||||
out.Tunnel = in.Tunnel
|
out.Tunnel = in.Tunnel
|
||||||
|
out.EnableIpv6 = in.EnableIpv6
|
||||||
|
out.EnableIpv4 = in.EnableIpv4
|
||||||
|
out.MonitorAggregation = in.MonitorAggregation
|
||||||
|
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
|
||||||
|
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
|
||||||
|
out.PreallocateBPFMaps = in.PreallocateBPFMaps
|
||||||
|
out.SidecarIstioProxyImage = in.SidecarIstioProxyImage
|
||||||
|
out.ClusterName = in.ClusterName
|
||||||
|
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
|
||||||
|
out.ContainerRuntimeLabels = in.ContainerRuntimeLabels
|
||||||
|
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
|
||||||
|
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
|
||||||
|
out.EnableNodePort = in.EnableNodePort
|
||||||
|
out.RemoveCbrBridge = in.RemoveCbrBridge
|
||||||
|
out.RestartPods = in.RestartPods
|
||||||
|
out.ReconfigureKubelet = in.ReconfigureKubelet
|
||||||
|
out.NodeInitBootstrapFile = in.NodeInitBootstrapFile
|
||||||
|
out.CniBinPath = in.CniBinPath
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -207,6 +207,27 @@ type CiliumNetworkingSpec struct {
|
||||||
StateDir string `json:"stateDir,omitempty"`
|
StateDir string `json:"stateDir,omitempty"`
|
||||||
TracePayloadLen int `json:"tracePayloadlen,omitempty"`
|
TracePayloadLen int `json:"tracePayloadlen,omitempty"`
|
||||||
Tunnel string `json:"tunnel,omitempty"`
|
Tunnel string `json:"tunnel,omitempty"`
|
||||||
|
|
||||||
|
EnableIpv6 bool `json:"enableipv6"`
|
||||||
|
EnableIpv4 bool `json:"enableipv4"`
|
||||||
|
MonitorAggregation string `json:"monitorAggregation"`
|
||||||
|
BPFCTGlobalTCPMax int `json:"bpfCTGlobalTCPMax"`
|
||||||
|
BPFCTGlobalAnyMax int `json:"bpfCTGlobalAnyMax"`
|
||||||
|
PreallocateBPFMaps bool `json:"preallocateBPFMaps"`
|
||||||
|
SidecarIstioProxyImage string `json:"sidecarIstioProxyImage"`
|
||||||
|
ClusterName string `json:"clusterName"`
|
||||||
|
ToFqdnsEnablePoller bool `json:"toFqdnsEnablePoller"`
|
||||||
|
ContainerRuntimeLabels string `json:"containerRuntimeLabels,omitempty"`
|
||||||
|
IPTablesRulesNoinstall bool `json:"IPTablesRulesNoinstall"`
|
||||||
|
AutoDirectNodeRoutes bool `json:"autoDirectNodeRoutes"`
|
||||||
|
EnableNodePort bool `json:"enableNodePort"`
|
||||||
|
|
||||||
|
//node init options
|
||||||
|
RemoveCbrBridge bool `json:"removeCbrBridge"`
|
||||||
|
RestartPods bool `json:"restartPods"`
|
||||||
|
ReconfigureKubelet bool `json:"reconfigureKubelet"`
|
||||||
|
NodeInitBootstrapFile string `json:"nodeInitBootstrapFile"`
|
||||||
|
CniBinPath string `json:"cniBinPath"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// LyftIpVlanNetworkingSpec declares that we want to use the cni-ipvlan-vpc-k8s CNI networking
|
// LyftIpVlanNetworkingSpec declares that we want to use the cni-ipvlan-vpc-k8s CNI networking
|
||||||
|
|
|
||||||
|
|
@ -1278,6 +1278,24 @@ func autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
|
||||||
out.StateDir = in.StateDir
|
out.StateDir = in.StateDir
|
||||||
out.TracePayloadLen = in.TracePayloadLen
|
out.TracePayloadLen = in.TracePayloadLen
|
||||||
out.Tunnel = in.Tunnel
|
out.Tunnel = in.Tunnel
|
||||||
|
out.EnableIpv6 = in.EnableIpv6
|
||||||
|
out.EnableIpv4 = in.EnableIpv4
|
||||||
|
out.MonitorAggregation = in.MonitorAggregation
|
||||||
|
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
|
||||||
|
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
|
||||||
|
out.PreallocateBPFMaps = in.PreallocateBPFMaps
|
||||||
|
out.SidecarIstioProxyImage = in.SidecarIstioProxyImage
|
||||||
|
out.ClusterName = in.ClusterName
|
||||||
|
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
|
||||||
|
out.ContainerRuntimeLabels = in.ContainerRuntimeLabels
|
||||||
|
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
|
||||||
|
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
|
||||||
|
out.EnableNodePort = in.EnableNodePort
|
||||||
|
out.RemoveCbrBridge = in.RemoveCbrBridge
|
||||||
|
out.RestartPods = in.RestartPods
|
||||||
|
out.ReconfigureKubelet = in.ReconfigureKubelet
|
||||||
|
out.NodeInitBootstrapFile = in.NodeInitBootstrapFile
|
||||||
|
out.CniBinPath = in.CniBinPath
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1336,6 +1354,24 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in *
|
||||||
out.StateDir = in.StateDir
|
out.StateDir = in.StateDir
|
||||||
out.TracePayloadLen = in.TracePayloadLen
|
out.TracePayloadLen = in.TracePayloadLen
|
||||||
out.Tunnel = in.Tunnel
|
out.Tunnel = in.Tunnel
|
||||||
|
out.EnableIpv6 = in.EnableIpv6
|
||||||
|
out.EnableIpv4 = in.EnableIpv4
|
||||||
|
out.MonitorAggregation = in.MonitorAggregation
|
||||||
|
out.BPFCTGlobalTCPMax = in.BPFCTGlobalTCPMax
|
||||||
|
out.BPFCTGlobalAnyMax = in.BPFCTGlobalAnyMax
|
||||||
|
out.PreallocateBPFMaps = in.PreallocateBPFMaps
|
||||||
|
out.SidecarIstioProxyImage = in.SidecarIstioProxyImage
|
||||||
|
out.ClusterName = in.ClusterName
|
||||||
|
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
|
||||||
|
out.ContainerRuntimeLabels = in.ContainerRuntimeLabels
|
||||||
|
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
|
||||||
|
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
|
||||||
|
out.EnableNodePort = in.EnableNodePort
|
||||||
|
out.RemoveCbrBridge = in.RemoveCbrBridge
|
||||||
|
out.RestartPods = in.RestartPods
|
||||||
|
out.ReconfigureKubelet = in.ReconfigureKubelet
|
||||||
|
out.NodeInitBootstrapFile = in.NodeInitBootstrapFile
|
||||||
|
out.CniBinPath = in.CniBinPath
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -770,12 +770,6 @@ func validateCilium(c *kops.Cluster) *field.Error {
|
||||||
if kubeVersion.LT(minimalKubeVersion) {
|
if kubeVersion.LT(minimalKubeVersion) {
|
||||||
return field.Invalid(specPath.Child("KubernetesVersion"), c.Spec.KubernetesVersion, "Cilium needs at least Kubernetes 1.7")
|
return field.Invalid(specPath.Child("KubernetesVersion"), c.Spec.KubernetesVersion, "Cilium needs at least Kubernetes 1.7")
|
||||||
}
|
}
|
||||||
|
|
||||||
minimalVersion := semver.MustParse("3.1.0")
|
|
||||||
path := specPath.Child("EtcdClusters").Index(0)
|
|
||||||
if err := validateEtcdVersion(c.Spec.EtcdClusters[0], path, &minimalVersion); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -259,13 +259,6 @@ func (b *FirewallModelBuilder) applyNodeToMasterBlockSpecificPorts(c *fi.ModelBu
|
||||||
protocols = append(protocols, ProtocolIPIP)
|
protocols = append(protocols, ProtocolIPIP)
|
||||||
}
|
}
|
||||||
|
|
||||||
if b.Cluster.Spec.Networking.Cilium != nil {
|
|
||||||
// Cilium needs to access etcd
|
|
||||||
klog.Warningf("Opening etcd port on masters for access from the nodes, for Cilium. This is unsafe in untrusted environments.")
|
|
||||||
tcpBlocked[4001] = false
|
|
||||||
protocols = append(protocols, ProtocolIPIP)
|
|
||||||
}
|
|
||||||
|
|
||||||
if b.Cluster.Spec.Networking.Kuberouter != nil {
|
if b.Cluster.Spec.Networking.Kuberouter != nil {
|
||||||
protocols = append(protocols, ProtocolIPIP)
|
protocols = append(protocols, ProtocolIPIP)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -387,7 +387,7 @@ func (b *PolicyBuilder) AddS3Permissions(p *Policy) (*Policy, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// @check if calico is enabled as the CNI provider and permit access to the client TLS certificate by default
|
// @check if calico is enabled as the CNI provider and permit access to the client TLS certificate by default
|
||||||
if b.Cluster.Spec.Networking.Calico != nil || b.Cluster.Spec.Networking.Cilium != nil {
|
if b.Cluster.Spec.Networking.Calico != nil {
|
||||||
p.Statement = append(p.Statement, &Statement{
|
p.Statement = append(p.Statement, &Statement{
|
||||||
Effect: StatementEffectAllow,
|
Effect: StatementEffectAllow,
|
||||||
Action: stringorslice.Slice([]string{"s3:Get*"}),
|
Action: stringorslice.Slice([]string{"s3:Get*"}),
|
||||||
|
|
|
||||||
|
|
@ -152,7 +152,6 @@ func (b *FirewallModelBuilder) addETCDRules(c *fi.ModelBuilderContext, sgMap map
|
||||||
addDirectionalGroupRule(c, masterSG, masterSG, etcdPeerRule)
|
addDirectionalGroupRule(c, masterSG, masterSG, etcdPeerRule)
|
||||||
|
|
||||||
if b.Cluster.Spec.Networking.Romana != nil ||
|
if b.Cluster.Spec.Networking.Romana != nil ||
|
||||||
b.Cluster.Spec.Networking.Cilium != nil ||
|
|
||||||
b.Cluster.Spec.Networking.Calico != nil {
|
b.Cluster.Spec.Networking.Calico != nil {
|
||||||
|
|
||||||
etcdCNIRule := &openstacktasks.SecurityGroupRule{
|
etcdCNIRule := &openstacktasks.SecurityGroupRule{
|
||||||
|
|
|
||||||
|
|
@ -174,8 +174,8 @@ func (b *PKIModelBuilder) Build(c *fi.ModelBuilderContext) error {
|
||||||
Format: format,
|
Format: format,
|
||||||
})
|
})
|
||||||
|
|
||||||
// @check if calico or Cilium is enabled as the CNI provider
|
// @check if calico is enabled as the CNI provider
|
||||||
if b.KopsModelContext.Cluster.Spec.Networking.Calico != nil || b.KopsModelContext.Cluster.Spec.Networking.Cilium != nil {
|
if b.KopsModelContext.Cluster.Spec.Networking.Calico != nil {
|
||||||
c.AddTask(&fitasks.Keypair{
|
c.AddTask(&fitasks.Keypair{
|
||||||
Name: fi.String("calico-client"),
|
Name: fi.String("calico-client"),
|
||||||
Lifecycle: b.Lifecycle,
|
Lifecycle: b.Lifecycle,
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,116 @@
|
||||||
{{- $etcd_scheme := EtcdScheme }}
|
|
||||||
kind: ConfigMap
|
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
name: cilium-config
|
name: cilium-config
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
data:
|
data:
|
||||||
etcd-config: |-
|
{{ with .Networking.Cilium }}
|
||||||
---
|
# Identity allocation mode selects how identities are shared between cilium
|
||||||
endpoints: [{{ $cluster := index .EtcdClusters 0 -}}
|
# nodes by setting how they are stored. The options are "crd" or "kvstore".
|
||||||
{{- range $j, $member := $cluster.Members -}}
|
# - "crd" stores identities in kubernetes as CRDs (custom resource definition).
|
||||||
{{- if $j }},{{ end -}}
|
# These can be queried with:
|
||||||
"{{ $etcd_scheme }}://etcd-{{ $member.Name }}.internal.{{ ClusterName }}:4001"
|
# kubectl get ciliumid
|
||||||
{{- end }}]
|
# - "kvstore" stores identities in a kvstore, etcd or consul, that is
|
||||||
{{- if eq $etcd_scheme "https" }}
|
# configured below. Cilium versions before 1.6 supported only the kvstore
|
||||||
ca-file: '/var/lib/etcd-secrets/ca.pem'
|
# backend. Upgrades from these older cilium versions should continue using
|
||||||
key-file: '/var/lib/etcd-secrets/calico-client-key.pem'
|
# the kvstore by commenting out the identity-allocation-mode below, or
|
||||||
cert-file: '/var/lib/etcd-secrets/calico-client.pem'
|
# setting it to "kvstore".
|
||||||
{{- end }}
|
identity-allocation-mode: crd
|
||||||
|
|
||||||
# If you want to run cilium in debug mode change this value to true
|
# If you want to run cilium in debug mode change this value to true
|
||||||
debug: "false"
|
debug: "{{- if .Debug -}}true{{- else -}}false{{- end -}}"
|
||||||
disable-ipv4: "false"
|
# Enable IPv4 addressing. If enabled, all endpoints are allocated an IPv4
|
||||||
sidecar-http-proxy: "false"
|
# address.
|
||||||
# If you want to clean cilium state; change this value to true
|
enable-ipv4: "{{- if or (.EnableIpv4) (and (not (.EnableIpv4)) (not (.EnableIpv6))) -}}true{{- else -}}false{{- end -}}"
|
||||||
clean-cilium-state: "false"
|
# Enable IPv6 addressing. If enabled, all endpoints are allocated an IPv6
|
||||||
|
# address.
|
||||||
|
enable-ipv6: "{{- if .EnableIpv6 -}}true{{- else -}}false{{- end -}}"
|
||||||
|
# If you want cilium monitor to aggregate tracing for packets, set this level
|
||||||
|
# to "low", "medium", or "maximum". The higher the level, the less packets
|
||||||
|
# that will be seen in monitor output.
|
||||||
|
monitor-aggregation: "{{- if eq .MonitorAggregation "" -}}medium{{- else -}}{{ .MonitorAggregation }}{{- end -}}"
|
||||||
|
# ct-global-max-entries-* specifies the maximum number of connections
|
||||||
|
# supported across all endpoints, split by protocol: tcp or other. One pair
|
||||||
|
# of maps uses these values for IPv4 connections, and another pair of maps
|
||||||
|
# use these values for IPv6 connections.
|
||||||
|
#
|
||||||
|
# If these values are modified, then during the next Cilium startup the
|
||||||
|
# tracking of ongoing connections may be disrupted. This may lead to brief
|
||||||
|
# policy drops or a change in loadbalancing decisions for a connection.
|
||||||
|
#
|
||||||
|
# For users upgrading from Cilium 1.2 or earlier, to minimize disruption
|
||||||
|
# during the upgrade process, comment out these options.
|
||||||
|
bpf-ct-global-tcp-max: "{{- if eq .BPFCTGlobalTCPMax 0 -}}524288{{- else -}}{{ .BPFCTGlobalTCPMax}}{{- end -}}"
|
||||||
|
bpf-ct-global-any-max: "{{- if eq .BPFCTGlobalAnyMax 0 -}}262144{{- else -}}{{ .BPFCTGlobalAnyMax}}{{- end -}}"
|
||||||
|
|
||||||
|
# Pre-allocation of map entries allows per-packet latency to be reduced, at
|
||||||
|
# the expense of up-front memory allocation for the entries in the maps. The
|
||||||
|
# default value below will minimize memory usage in the default installation;
|
||||||
|
# users who are sensitive to latency may consider setting this to "true".
|
||||||
|
#
|
||||||
|
# This option was introduced in Cilium 1.4. Cilium 1.3 and earlier ignore
|
||||||
|
# this option and behave as though it is set to "true".
|
||||||
|
#
|
||||||
|
# If this value is modified, then during the next Cilium startup the restore
|
||||||
|
# of existing endpoints and tracking of ongoing connections may be disrupted.
|
||||||
|
# This may lead to policy drops or a change in loadbalancing decisions for a
|
||||||
|
# connection for some time. Endpoints may need to be recreated to restore
|
||||||
|
# connectivity.
|
||||||
|
#
|
||||||
|
# If this option is set to "false" during an upgrade from 1.3 or earlier to
|
||||||
|
# 1.4 or later, then it may cause one-time disruptions during the upgrade.
|
||||||
|
preallocate-bpf-maps: "{{- if .PreallocateBPFMaps -}}true{{- else -}}false{{- end -}}"
|
||||||
|
# Regular expression matching compatible Istio sidecar istio-proxy
|
||||||
|
# container image names
|
||||||
|
sidecar-istio-proxy-image: "{{- if eq .SidecarIstioProxyImage "" -}}cilium/istio_proxy{{- else -}}{{ .SidecarIstioProxyImage }}{{- end -}}"
|
||||||
|
# Encapsulation mode for communication between nodes
|
||||||
|
# Possible values:
|
||||||
|
# - disabled
|
||||||
|
# - vxlan (default)
|
||||||
|
# - geneve
|
||||||
|
tunnel: "{{- if eq .Tunnel "" -}}vxlan{{- else -}}{{ .Tunnel }}{{- end -}}"
|
||||||
|
|
||||||
|
# Name of the cluster. Only relevant when building a mesh of clusters.
|
||||||
|
cluster-name: "{{- if eq .ClusterName "" -}}default{{- else -}}{{ .ClusterName}}{{- end -}}"
|
||||||
|
|
||||||
|
# This option is disabled by default starting from version 1.4.x in favor
|
||||||
|
# of a more powerful DNS proxy-based implementation, see [0] for details.
|
||||||
|
# Enable this option if you want to use FQDN policies but do not want to use
|
||||||
|
# the DNS proxy.
|
||||||
|
#
|
||||||
|
# To ease upgrade, users may opt to set this option to "true".
|
||||||
|
# Otherwise please refer to the Upgrade Guide [1] which explains how to
|
||||||
|
# prepare policy rules for upgrade.
|
||||||
|
#
|
||||||
|
# [0] http://docs.cilium.io/en/stable/policy/language/#dns-based
|
||||||
|
# [1] http://docs.cilium.io/en/stable/install/upgrade/#changes-that-may-require-action
|
||||||
|
tofqdns-enable-poller: "{{- if .ToFqdnsEnablePoller -}}true{{- else -}}false{{- end -}}"
|
||||||
|
# wait-bpf-mount makes init container wait until bpf filesystem is mounted
|
||||||
|
wait-bpf-mount: "true"
|
||||||
|
# Enable fetching of container-runtime specific metadata
|
||||||
|
#
|
||||||
|
# By default, the Kubernetes pod and namespace labels are retrieved and
|
||||||
|
# associated with endpoints for identification purposes. By integrating
|
||||||
|
# with the container runtime, container runtime specific labels can be
|
||||||
|
# retrieved, such labels will be prefixed with container:
|
||||||
|
#
|
||||||
|
# CAUTION: The container runtime labels can include information such as pod
|
||||||
|
# annotations which may result in each pod being associated a unique set of
|
||||||
|
# labels which can result in excessive security identities being allocated.
|
||||||
|
# Please review the labels filter when enabling container runtime labels.
|
||||||
|
#
|
||||||
|
# Supported values:
|
||||||
|
# - containerd
|
||||||
|
# - crio
|
||||||
|
# - docker
|
||||||
|
# - none
|
||||||
|
# - auto (automatically detect the container runtime)
|
||||||
|
#
|
||||||
|
container-runtime: "{{- if eq .ContainerRuntimeLabels "" -}}none{{- else -}}{{ .ContainerRuntimeLabels }}{{- end -}}"
|
||||||
|
masquerade: "{{- if .DisableMasquerade -}}false{{- else -}}true{{- end -}}"
|
||||||
|
install-iptables-rules: "{{- if .IPTablesRulesNoinstall -}}false{{- else -}}true{{- end -}}"
|
||||||
|
auto-direct-node-routes: "{{- if .AutoDirectNodeRoutes -}}true{{- else -}}false{{- end -}}"
|
||||||
|
enable-node-port: "{{- if .EnableNodePort -}}true{{- else -}}false{{- end -}}"
|
||||||
|
{{ end }} # With .Networking.Cilium end
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
|
|
@ -31,371 +118,19 @@ metadata:
|
||||||
name: cilium
|
name: cilium
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
---
|
---
|
||||||
apiVersion: apps/v1
|
apiVersion: v1
|
||||||
kind: DaemonSet
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: cilium
|
name: cilium-operator
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
k8s-app: cilium
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
k8s-app: cilium
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
annotations:
|
|
||||||
# This annotation plus the CriticalAddonsOnly toleration makes
|
|
||||||
# cilium to be a critical pod in the cluster, which ensures cilium
|
|
||||||
# gets priority scheduling.
|
|
||||||
# https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
|
|
||||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
|
||||||
scheduler.alpha.kubernetes.io/tolerations: >-
|
|
||||||
[{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}]
|
|
||||||
prometheus.io/scrape: "true"
|
|
||||||
prometheus.io/port: "9090"
|
|
||||||
spec:
|
|
||||||
serviceAccountName: cilium
|
|
||||||
{{ with .Networking.Cilium }}
|
|
||||||
containers:
|
|
||||||
- image: "cilium/cilium:{{ .Version }}"
|
|
||||||
imagePullPolicy: Always
|
|
||||||
name: cilium-agent
|
|
||||||
command: [ "cilium-agent" ]
|
|
||||||
args:
|
|
||||||
{{ if .Debug }}
|
|
||||||
- "--debug=true"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .DebugVerbose}}
|
|
||||||
{{ range $j, $group:= .DebugVerbose}}
|
|
||||||
- "--debug-verbose"
|
|
||||||
- "{{ $group}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .AccessLog "" }}
|
|
||||||
- "--access-log"
|
|
||||||
- "{{ .AccessLog}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .AgentLabels }}
|
|
||||||
{{ range $j, $label := .AgentLabels }}
|
|
||||||
- "--agent-labels"
|
|
||||||
- "{{ $label }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .AllowLocalhost "" }}
|
|
||||||
- "--allow-localhost"
|
|
||||||
- "{{ .AllowLocalhost}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .AutoIpv6NodeRoutes }}
|
|
||||||
- "--auto-ipv6-node-routes"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .BPFRoot "" }}
|
|
||||||
- "--bpf-root"
|
|
||||||
- "{{ .BPFRoot }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .ContainerRuntime }}
|
|
||||||
{{ range $j, $runtime:= .ContainerRuntime }}
|
|
||||||
- "--container-runtime"
|
|
||||||
- "{{ $runtime}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if .ContainerRuntimeEndpoint }}
|
|
||||||
{{ range $runtime, $endpoint:= .ContainerRuntimeEndpoint }}
|
|
||||||
- "--container-runtime-endpoint={{ $runtime }}={{ $endpoint }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Device "" }}
|
|
||||||
- "--device"
|
|
||||||
- "{{ .Device }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .DisableConntrack }}
|
|
||||||
- "--disable-conntrack"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .DisableIpv4 }}
|
|
||||||
- "--disable-ipv4"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .DisableK8sServices }}
|
|
||||||
- "--disable-k8s-services"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .EnablePolicy "" }}
|
|
||||||
- "--enable-policy"
|
|
||||||
- "{{ .EnablePolicy }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .EnableTracing }}
|
|
||||||
- "--enable-tracing"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .EnvoyLog "" }}
|
|
||||||
- "--envoy-log"
|
|
||||||
- "{{ .EnvoyLog }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv4ClusterCIDRMaskSize 0 }}
|
|
||||||
- "--ipv4-cluster-cidr-mask-size"
|
|
||||||
- "{{ .Ipv4ClusterCIDRMaskSize }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv4Node "" }}
|
|
||||||
- "--ipv4-node"
|
|
||||||
- "{{ .Ipv4Node }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv4Range "" }}
|
|
||||||
- "--ipv4-range"
|
|
||||||
- "{{ .Ipv4Range }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv4ServiceRange "" }}
|
|
||||||
- "--ipv4-service-range"
|
|
||||||
- "{{ .Ipv4ServiceRange }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv6ClusterAllocCidr "" }}
|
|
||||||
- "--ipv6-cluster-alloc-cidr"
|
|
||||||
- "{{ .Ipv6ClusterAllocCidr }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv6Node "" }}
|
|
||||||
- "--ipv6-node"
|
|
||||||
- "{{ .Ipv6Node }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv6Range "" }}
|
|
||||||
- "--ipv6-range"
|
|
||||||
- "{{ .Ipv6Range }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv6ServiceRange "" }}
|
|
||||||
- "--ipv6-service-range"
|
|
||||||
- "{{ .Ipv6ServiceRange }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .K8sAPIServer "" }}
|
|
||||||
- "--k8s-api-server"
|
|
||||||
- "{{ .K8sAPIServer }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .K8sKubeconfigPath "" }}
|
|
||||||
- "--k8s-kubeconfig-path"
|
|
||||||
- "{{ .K8sKubeconfigPath }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .KeepBPFTemplates }}
|
|
||||||
- "--keep-bpf-templates"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .KeepConfig }}
|
|
||||||
- "--keep-config"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LabelPrefixFile "" }}
|
|
||||||
- "--label-prefix-file"
|
|
||||||
- "{{ .LabelPrefixFile }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .Labels }}
|
|
||||||
{{ range $j, $label := .Labels }}
|
|
||||||
- "--labels"
|
|
||||||
- "{{ $label }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LB "" }}
|
|
||||||
- "--lb"
|
|
||||||
- "{{ .LB }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LibDir "" }}
|
|
||||||
- "--lib-dir"
|
|
||||||
- "{{ .LibDir }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .LogDrivers }}
|
|
||||||
{{ range $j, $driver := .LogDrivers }}
|
|
||||||
- "--log-driver"
|
|
||||||
- "{{ $driver}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if .LogOpt }}
|
|
||||||
{{ range $option, $value := .LogOpt }}
|
|
||||||
- "--log-opt={{ $option }}={{ $value }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if .Logstash }}
|
|
||||||
- "--logstash"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LogstashAgent "" }}
|
|
||||||
- "--logstash-agent"
|
|
||||||
- "{{ .LogstashAgent }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LogstashProbeTimer 0 }}
|
|
||||||
- "--logstash-probe-timer"
|
|
||||||
- "{{ .LogstashProbeTimer }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if eq .DisableMasquerade true }}
|
|
||||||
- "--masquerade"
|
|
||||||
- "false"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Nat46Range "" }}
|
|
||||||
- "--nat46-range"
|
|
||||||
- "{{ .Nat46Range }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .Pprof}}
|
|
||||||
- "--pprof"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .PrefilterDevice "" }}
|
|
||||||
- "--prefilter-device"
|
|
||||||
- "{{ .PrefilterDevice }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .PrometheusServeAddr "" }}
|
|
||||||
- "--prometheus-serve-addr"
|
|
||||||
- "{{ .PrometheusServeAddr }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .Restore}}
|
|
||||||
- "--restore"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .SingleClusterRoute}}
|
|
||||||
- "--single-cluster-route"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .SocketPath "" }}
|
|
||||||
- "--socket-path"
|
|
||||||
- "{{ .SocketPath }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .StateDir "" }}
|
|
||||||
- "--state-dir"
|
|
||||||
- "{{ .StateDir }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .TracePayloadLen 0 }}
|
|
||||||
- "--trace-payloadlen"
|
|
||||||
- "{{ .TracePayloadLen}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Tunnel "" }}
|
|
||||||
- "--tunnel"
|
|
||||||
- "{{ .Tunnel }}"
|
|
||||||
{{ end }}
|
|
||||||
# end of `with .Networking.Cilium`
|
|
||||||
{{ end }}
|
|
||||||
- "--kvstore"
|
|
||||||
- "etcd"
|
|
||||||
- "--kvstore-opt"
|
|
||||||
- "etcd.config=/var/lib/etcd-config/etcd.config"
|
|
||||||
ports:
|
|
||||||
- name: prometheus
|
|
||||||
containerPort: 9090
|
|
||||||
lifecycle:
|
|
||||||
postStart:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- "/cni-install.sh"
|
|
||||||
preStop:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- "/cni-uninstall.sh"
|
|
||||||
env:
|
|
||||||
- name: "K8S_NODE_NAME"
|
|
||||||
valueFrom:
|
|
||||||
fieldRef:
|
|
||||||
fieldPath: spec.nodeName
|
|
||||||
- name: "CILIUM_DEBUG"
|
|
||||||
valueFrom:
|
|
||||||
configMapKeyRef:
|
|
||||||
name: cilium-config
|
|
||||||
key: debug
|
|
||||||
- name: "DISABLE_IPV4"
|
|
||||||
valueFrom:
|
|
||||||
configMapKeyRef:
|
|
||||||
name: cilium-config
|
|
||||||
key: disable-ipv4
|
|
||||||
# Note: this variable is a no-op if not defined, and is used in the
|
|
||||||
# prometheus examples.
|
|
||||||
- name: "CILIUM_PROMETHEUS_SERVE_ADDR"
|
|
||||||
valueFrom:
|
|
||||||
configMapKeyRef:
|
|
||||||
name: cilium-metrics-config
|
|
||||||
optional: true
|
|
||||||
key: prometheus-serve-addr
|
|
||||||
livenessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- cilium
|
|
||||||
- status
|
|
||||||
# The initial delay for the liveness probe is intentionally large to
|
|
||||||
# avoid an endless kill & restart cycle if in the event that the initial
|
|
||||||
# bootstrapping takes longer than expected.
|
|
||||||
initialDelaySeconds: 120
|
|
||||||
failureThreshold: 10
|
|
||||||
periodSeconds: 10
|
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- cilium
|
|
||||||
- status
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
periodSeconds: 5
|
|
||||||
volumeMounts:
|
|
||||||
- name: bpf-maps
|
|
||||||
mountPath: /sys/fs/bpf
|
|
||||||
- name: cilium-run
|
|
||||||
mountPath: /var/run/cilium
|
|
||||||
- name: cni-path
|
|
||||||
mountPath: /host/opt/cni/bin
|
|
||||||
- name: etc-cni-netd
|
|
||||||
mountPath: /host/etc/cni/net.d
|
|
||||||
- name: docker-socket
|
|
||||||
mountPath: /var/run/docker.sock
|
|
||||||
readOnly: true
|
|
||||||
- name: etcd-config-path
|
|
||||||
mountPath: /var/lib/etcd-config
|
|
||||||
readOnly: true
|
|
||||||
{{- if eq $etcd_scheme "https" }}
|
|
||||||
- name: etcd-secrets
|
|
||||||
mountPath: /var/lib/etcd-secrets
|
|
||||||
readOnly: true
|
|
||||||
{{- end }}
|
|
||||||
securityContext:
|
|
||||||
capabilities:
|
|
||||||
add:
|
|
||||||
- "NET_ADMIN"
|
|
||||||
privileged: true
|
|
||||||
hostNetwork: true
|
|
||||||
volumes:
|
|
||||||
# To keep state between restarts / upgrades
|
|
||||||
- name: cilium-run
|
|
||||||
hostPath:
|
|
||||||
path: /var/run/cilium
|
|
||||||
# To keep state between restarts / upgrades
|
|
||||||
- name: bpf-maps
|
|
||||||
hostPath:
|
|
||||||
path: /sys/fs/bpf
|
|
||||||
# To read docker events from the node
|
|
||||||
- name: docker-socket
|
|
||||||
hostPath:
|
|
||||||
path: /var/run/docker.sock
|
|
||||||
# To install cilium cni plugin in the host
|
|
||||||
- name: cni-path
|
|
||||||
hostPath:
|
|
||||||
path: /opt/cni/bin
|
|
||||||
# To install cilium cni configuration in the host
|
|
||||||
- name: etc-cni-netd
|
|
||||||
hostPath:
|
|
||||||
path: /etc/cni/net.d
|
|
||||||
# To read the etcd config stored in config maps
|
|
||||||
- name: etcd-config-path
|
|
||||||
configMap:
|
|
||||||
name: cilium-config
|
|
||||||
items:
|
|
||||||
- key: etcd-config
|
|
||||||
path: etcd.config
|
|
||||||
{{- if eq $etcd_scheme "https" }}
|
|
||||||
- name: etcd-secrets
|
|
||||||
hostPath:
|
|
||||||
path: /srv/kubernetes/calico
|
|
||||||
{{- end }}
|
|
||||||
tolerations:
|
|
||||||
- effect: NoSchedule
|
|
||||||
key: node.cloudprovider.kubernetes.io/uninitialized
|
|
||||||
value: "true"
|
|
||||||
# Mark cilium's pod as critical for rescheduling
|
|
||||||
- key: CriticalAddonsOnly
|
|
||||||
operator: "Exists"
|
|
||||||
- effect: NoExecute
|
|
||||||
operator: Exists
|
|
||||||
# Allow the pod to run on all nodes. This is required
|
|
||||||
# for cluster communication
|
|
||||||
- effect: NoSchedule
|
|
||||||
operator: Exists
|
|
||||||
---
|
---
|
||||||
kind: ClusterRole
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: ClusterRole
|
||||||
metadata:
|
metadata:
|
||||||
name: cilium
|
name: cilium
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- "networking.k8s.io"
|
- networking.k8s.io
|
||||||
resources:
|
resources:
|
||||||
- networkpolicies
|
- networkpolicies
|
||||||
verbs:
|
verbs:
|
||||||
|
|
@ -424,11 +159,16 @@ rules:
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- update
|
- update
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- nodes
|
||||||
|
- nodes/status
|
||||||
|
verbs:
|
||||||
|
- patch
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- extensions
|
- extensions
|
||||||
resources:
|
resources:
|
||||||
- networkpolicies
|
|
||||||
- thirdpartyresources
|
|
||||||
- ingresses
|
- ingresses
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
- create
|
||||||
|
|
@ -436,7 +176,7 @@ rules:
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- "apiextensions.k8s.io"
|
- apiextensions.k8s.io
|
||||||
resources:
|
resources:
|
||||||
- customresourcedefinitions
|
- customresourcedefinitions
|
||||||
verbs:
|
verbs:
|
||||||
|
|
@ -449,12 +189,64 @@ rules:
|
||||||
- cilium.io
|
- cilium.io
|
||||||
resources:
|
resources:
|
||||||
- ciliumnetworkpolicies
|
- ciliumnetworkpolicies
|
||||||
|
- ciliumnetworkpolicies/status
|
||||||
- ciliumendpoints
|
- ciliumendpoints
|
||||||
|
- ciliumendpoints/status
|
||||||
|
- ciliumnodes
|
||||||
|
- ciliumnodes/status
|
||||||
|
- ciliumidentities
|
||||||
|
- ciliumidentities/status
|
||||||
verbs:
|
verbs:
|
||||||
- "*"
|
- '*'
|
||||||
---
|
---
|
||||||
kind: ClusterRoleBinding
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: ClusterRole
|
||||||
|
metadata:
|
||||||
|
name: cilium-operator
|
||||||
|
rules:
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
# to automatically delete [core|kube]dns pods so that are starting to being
|
||||||
|
# managed by Cilium
|
||||||
|
- pods
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
|
- delete
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
# to automatically read from k8s and import the node's pod CIDR to cilium's
|
||||||
|
# etcd so all nodes know how to reach another pod running in in a different
|
||||||
|
# node.
|
||||||
|
- nodes
|
||||||
|
# to perform the translation of a CNP that contains `ToGroup` to its endpoints
|
||||||
|
- services
|
||||||
|
- endpoints
|
||||||
|
# to check apiserver connectivity
|
||||||
|
- namespaces
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
|
- apiGroups:
|
||||||
|
- cilium.io
|
||||||
|
resources:
|
||||||
|
- ciliumnetworkpolicies
|
||||||
|
- ciliumnetworkpolicies/status
|
||||||
|
- ciliumendpoints
|
||||||
|
- ciliumendpoints/status
|
||||||
|
- ciliumnodes
|
||||||
|
- ciliumnodes/status
|
||||||
|
- ciliumidentities
|
||||||
|
- ciliumidentities/status
|
||||||
|
verbs:
|
||||||
|
- '*'
|
||||||
|
---
|
||||||
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: cilium
|
name: cilium
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -465,5 +257,358 @@ subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: cilium
|
name: cilium
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
- kind: Group
|
---
|
||||||
name: system:nodes
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: ClusterRoleBinding
|
||||||
|
metadata:
|
||||||
|
name: cilium-operator
|
||||||
|
roleRef:
|
||||||
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
kind: ClusterRole
|
||||||
|
name: cilium-operator
|
||||||
|
subjects:
|
||||||
|
- kind: ServiceAccount
|
||||||
|
name: cilium-operator
|
||||||
|
namespace: kube-system
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: DaemonSet
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
k8s-app: cilium
|
||||||
|
kubernetes.io/cluster-service: "true"
|
||||||
|
name: cilium
|
||||||
|
namespace: kube-system
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
k8s-app: cilium
|
||||||
|
kubernetes.io/cluster-service: "true"
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
annotations:
|
||||||
|
# This annotation plus the CriticalAddonsOnly toleration makes
|
||||||
|
# cilium to be a critical pod in the cluster, which ensures cilium
|
||||||
|
# gets priority scheduling.
|
||||||
|
# https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
|
||||||
|
scheduler.alpha.kubernetes.io/critical-pod: ""
|
||||||
|
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}]'
|
||||||
|
labels:
|
||||||
|
k8s-app: cilium
|
||||||
|
kubernetes.io/cluster-service: "true"
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- args:
|
||||||
|
- --config-dir=/tmp/cilium/config-map
|
||||||
|
command:
|
||||||
|
- cilium-agent
|
||||||
|
env:
|
||||||
|
- name: K8S_NODE_NAME
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
apiVersion: v1
|
||||||
|
fieldPath: spec.nodeName
|
||||||
|
- name: CILIUM_K8S_NAMESPACE
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
apiVersion: v1
|
||||||
|
fieldPath: metadata.namespace
|
||||||
|
- name: CILIUM_FLANNEL_MASTER_DEVICE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: flannel-master-device
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_FLANNEL_UNINSTALL_ON_EXIT
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: flannel-uninstall-on-exit
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_CLUSTERMESH_CONFIG
|
||||||
|
value: /var/lib/cilium/clustermesh/
|
||||||
|
- name: CILIUM_CNI_CHAINING_MODE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: cni-chaining-mode
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_CUSTOM_CNI_CONF
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: custom-cni-conf
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
{{ with .Networking.Cilium }}
|
||||||
|
image: "docker.io/cilium/cilium:{{ .Version }}"
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
lifecycle:
|
||||||
|
postStart:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- /cni-install.sh
|
||||||
|
preStop:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- /cni-uninstall.sh
|
||||||
|
livenessProbe:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- cilium
|
||||||
|
- status
|
||||||
|
- --brief
|
||||||
|
failureThreshold: 10
|
||||||
|
# The initial delay for the liveness probe is intentionally large to
|
||||||
|
# avoid an endless kill & restart cycle if in the event that the initial
|
||||||
|
# bootstrapping takes longer than expected.
|
||||||
|
initialDelaySeconds: 120
|
||||||
|
periodSeconds: 30
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 5
|
||||||
|
name: cilium-agent
|
||||||
|
readinessProbe:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- cilium
|
||||||
|
- status
|
||||||
|
- --brief
|
||||||
|
failureThreshold: 3
|
||||||
|
initialDelaySeconds: 5
|
||||||
|
periodSeconds: 30
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 5
|
||||||
|
securityContext:
|
||||||
|
capabilities:
|
||||||
|
add:
|
||||||
|
- NET_ADMIN
|
||||||
|
- SYS_MODULE
|
||||||
|
privileged: true
|
||||||
|
volumeMounts:
|
||||||
|
- mountPath: /sys/fs/bpf
|
||||||
|
name: bpf-maps
|
||||||
|
- mountPath: /var/run/cilium
|
||||||
|
name: cilium-run
|
||||||
|
- mountPath: /host/opt/cni/bin
|
||||||
|
name: cni-path
|
||||||
|
- mountPath: /host/etc/cni/net.d
|
||||||
|
name: etc-cni-netd
|
||||||
|
- mountPath: /var/lib/cilium/clustermesh
|
||||||
|
name: clustermesh-secrets
|
||||||
|
readOnly: true
|
||||||
|
- mountPath: /tmp/cilium/config-map
|
||||||
|
name: cilium-config-path
|
||||||
|
readOnly: true
|
||||||
|
# Needed to be able to load kernel modules
|
||||||
|
- mountPath: /lib/modules
|
||||||
|
name: lib-modules
|
||||||
|
readOnly: true
|
||||||
|
- mountPath: /run/xtables.lock
|
||||||
|
name: xtables-lock
|
||||||
|
hostNetwork: true
|
||||||
|
initContainers:
|
||||||
|
- command:
|
||||||
|
- /init-container.sh
|
||||||
|
env:
|
||||||
|
- name: CILIUM_ALL_STATE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: clean-cilium-state
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_BPF_STATE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: clean-cilium-bpf-state
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_WAIT_BPF_MOUNT
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: wait-bpf-mount
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
image: "docker.io/cilium/cilium:{{ .Version }}"
|
||||||
|
## end of `with .Networking.Cilium`
|
||||||
|
#{{ end }}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
name: clean-cilium-state
|
||||||
|
securityContext:
|
||||||
|
capabilities:
|
||||||
|
add:
|
||||||
|
- NET_ADMIN
|
||||||
|
privileged: true
|
||||||
|
volumeMounts:
|
||||||
|
- mountPath: /sys/fs/bpf
|
||||||
|
name: bpf-maps
|
||||||
|
- mountPath: /var/run/cilium
|
||||||
|
name: cilium-run
|
||||||
|
restartPolicy: Always
|
||||||
|
serviceAccount: cilium
|
||||||
|
serviceAccountName: cilium
|
||||||
|
terminationGracePeriodSeconds: 1
|
||||||
|
tolerations:
|
||||||
|
- operator: Exists
|
||||||
|
volumes:
|
||||||
|
# To keep state between restarts / upgrades
|
||||||
|
- hostPath:
|
||||||
|
path: /var/run/cilium
|
||||||
|
type: DirectoryOrCreate
|
||||||
|
name: cilium-run
|
||||||
|
# To keep state between restarts / upgrades for bpf maps
|
||||||
|
- hostPath:
|
||||||
|
path: /sys/fs/bpf
|
||||||
|
type: DirectoryOrCreate
|
||||||
|
name: bpf-maps
|
||||||
|
# To install cilium cni plugin in the host
|
||||||
|
- hostPath:
|
||||||
|
path: /opt/cni/bin
|
||||||
|
type: DirectoryOrCreate
|
||||||
|
name: cni-path
|
||||||
|
# To install cilium cni configuration in the host
|
||||||
|
- hostPath:
|
||||||
|
path: /etc/cni/net.d
|
||||||
|
type: DirectoryOrCreate
|
||||||
|
name: etc-cni-netd
|
||||||
|
# To be able to load kernel modules
|
||||||
|
- hostPath:
|
||||||
|
path: /lib/modules
|
||||||
|
name: lib-modules
|
||||||
|
# To access iptables concurrently with other processes (e.g. kube-proxy)
|
||||||
|
- hostPath:
|
||||||
|
path: /run/xtables.lock
|
||||||
|
type: FileOrCreate
|
||||||
|
name: xtables-lock
|
||||||
|
# To read the clustermesh configuration
|
||||||
|
- name: clustermesh-secrets
|
||||||
|
secret:
|
||||||
|
defaultMode: 420
|
||||||
|
optional: true
|
||||||
|
secretName: cilium-clustermesh
|
||||||
|
# To read the configuration from the config map
|
||||||
|
- configMap:
|
||||||
|
name: cilium-config
|
||||||
|
name: cilium-config-path
|
||||||
|
updateStrategy:
|
||||||
|
rollingUpdate:
|
||||||
|
maxUnavailable: 2
|
||||||
|
type: RollingUpdate
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
io.cilium/app: operator
|
||||||
|
name: cilium-operator
|
||||||
|
name: cilium-operator
|
||||||
|
namespace: kube-system
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
io.cilium/app: operator
|
||||||
|
name: cilium-operator
|
||||||
|
strategy:
|
||||||
|
rollingUpdate:
|
||||||
|
maxSurge: 1
|
||||||
|
maxUnavailable: 1
|
||||||
|
type: RollingUpdate
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
io.cilium/app: operator
|
||||||
|
name: cilium-operator
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- args:
|
||||||
|
- --debug=$(CILIUM_DEBUG)
|
||||||
|
command:
|
||||||
|
- cilium-operator
|
||||||
|
env:
|
||||||
|
- name: CILIUM_K8S_NAMESPACE
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
apiVersion: v1
|
||||||
|
fieldPath: metadata.namespace
|
||||||
|
- name: K8S_NODE_NAME
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
apiVersion: v1
|
||||||
|
fieldPath: spec.nodeName
|
||||||
|
- name: CILIUM_DEBUG
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: debug
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_CLUSTER_NAME
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: cluster-name
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_CLUSTER_ID
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: cluster-id
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_IPAM
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: ipam
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_DISABLE_ENDPOINT_CRD
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: disable-endpoint-crd
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_KVSTORE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: kvstore
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_KVSTORE_OPT
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: kvstore-opt
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: AWS_ACCESS_KEY_ID
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: AWS_ACCESS_KEY_ID
|
||||||
|
name: cilium-aws
|
||||||
|
optional: true
|
||||||
|
- name: AWS_SECRET_ACCESS_KEY
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: AWS_SECRET_ACCESS_KEY
|
||||||
|
name: cilium-aws
|
||||||
|
optional: true
|
||||||
|
- name: AWS_DEFAULT_REGION
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: AWS_DEFAULT_REGION
|
||||||
|
name: cilium-aws
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
{{ with .Networking.Cilium }}
|
||||||
|
image: "docker.io/cilium/operator:{{ .Version }}"
|
||||||
|
{{ end }}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
name: cilium-operator
|
||||||
|
livenessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /healthz
|
||||||
|
port: 9234
|
||||||
|
scheme: HTTP
|
||||||
|
initialDelaySeconds: 60
|
||||||
|
periodSeconds: 10
|
||||||
|
timeoutSeconds: 3
|
||||||
|
hostNetwork: true
|
||||||
|
restartPolicy: Always
|
||||||
|
serviceAccount: cilium-operator
|
||||||
|
serviceAccountName: cilium-operator
|
||||||
|
|
@ -1,29 +1,116 @@
|
||||||
{{- $etcd_scheme := EtcdScheme }}
|
|
||||||
kind: ConfigMap
|
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
name: cilium-config
|
name: cilium-config
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
data:
|
data:
|
||||||
etcd-config: |-
|
{{ with .Networking.Cilium }}
|
||||||
---
|
# Identity allocation mode selects how identities are shared between cilium
|
||||||
endpoints: [{{ $cluster := index .EtcdClusters 0 -}}
|
# nodes by setting how they are stored. The options are "crd" or "kvstore".
|
||||||
{{- range $j, $member := $cluster.Members -}}
|
# - "crd" stores identities in kubernetes as CRDs (custom resource definition).
|
||||||
{{- if $j }},{{ end -}}
|
# These can be queried with:
|
||||||
"{{ $etcd_scheme }}://etcd-{{ $member.Name }}.internal.{{ ClusterName }}:4001"
|
# kubectl get ciliumid
|
||||||
{{- end }}]
|
# - "kvstore" stores identities in a kvstore, etcd or consul, that is
|
||||||
{{- if eq $etcd_scheme "https" }}
|
# configured below. Cilium versions before 1.6 supported only the kvstore
|
||||||
ca-file: '/var/lib/etcd-secrets/ca.pem'
|
# backend. Upgrades from these older cilium versions should continue using
|
||||||
key-file: '/var/lib/etcd-secrets/calico-client-key.pem'
|
# the kvstore by commenting out the identity-allocation-mode below, or
|
||||||
cert-file: '/var/lib/etcd-secrets/calico-client.pem'
|
# setting it to "kvstore".
|
||||||
{{- end }}
|
identity-allocation-mode: crd
|
||||||
|
|
||||||
# If you want to run cilium in debug mode change this value to true
|
# If you want to run cilium in debug mode change this value to true
|
||||||
debug: "false"
|
debug: "{{- if .Debug -}}true{{- else -}}false{{- end -}}"
|
||||||
disable-ipv4: "false"
|
# Enable IPv4 addressing. If enabled, all endpoints are allocated an IPv4
|
||||||
sidecar-http-proxy: "false"
|
# address.
|
||||||
# If you want to clean cilium state; change this value to true
|
enable-ipv4: "{{- if or (.EnableIpv4) (and (not (.EnableIpv4)) (not (.EnableIpv6))) -}}true{{- else -}}false{{- end -}}"
|
||||||
clean-cilium-state: "false"
|
# Enable IPv6 addressing. If enabled, all endpoints are allocated an IPv6
|
||||||
|
# address.
|
||||||
|
enable-ipv6: "{{- if .EnableIpv6 -}}true{{- else -}}false{{- end -}}"
|
||||||
|
# If you want cilium monitor to aggregate tracing for packets, set this level
|
||||||
|
# to "low", "medium", or "maximum". The higher the level, the less packets
|
||||||
|
# that will be seen in monitor output.
|
||||||
|
monitor-aggregation: "{{- if eq .MonitorAggregation "" -}}medium{{- else -}}{{ .MonitorAggregation }}{{- end -}}"
|
||||||
|
# ct-global-max-entries-* specifies the maximum number of connections
|
||||||
|
# supported across all endpoints, split by protocol: tcp or other. One pair
|
||||||
|
# of maps uses these values for IPv4 connections, and another pair of maps
|
||||||
|
# use these values for IPv6 connections.
|
||||||
|
#
|
||||||
|
# If these values are modified, then during the next Cilium startup the
|
||||||
|
# tracking of ongoing connections may be disrupted. This may lead to brief
|
||||||
|
# policy drops or a change in loadbalancing decisions for a connection.
|
||||||
|
#
|
||||||
|
# For users upgrading from Cilium 1.2 or earlier, to minimize disruption
|
||||||
|
# during the upgrade process, comment out these options.
|
||||||
|
bpf-ct-global-tcp-max: "{{- if eq .BPFCTGlobalTCPMax 0 -}}524288{{- else -}}{{ .BPFCTGlobalTCPMax}}{{- end -}}"
|
||||||
|
bpf-ct-global-any-max: "{{- if eq .BPFCTGlobalAnyMax 0 -}}262144{{- else -}}{{ .BPFCTGlobalAnyMax}}{{- end -}}"
|
||||||
|
|
||||||
|
# Pre-allocation of map entries allows per-packet latency to be reduced, at
|
||||||
|
# the expense of up-front memory allocation for the entries in the maps. The
|
||||||
|
# default value below will minimize memory usage in the default installation;
|
||||||
|
# users who are sensitive to latency may consider setting this to "true".
|
||||||
|
#
|
||||||
|
# This option was introduced in Cilium 1.4. Cilium 1.3 and earlier ignore
|
||||||
|
# this option and behave as though it is set to "true".
|
||||||
|
#
|
||||||
|
# If this value is modified, then during the next Cilium startup the restore
|
||||||
|
# of existing endpoints and tracking of ongoing connections may be disrupted.
|
||||||
|
# This may lead to policy drops or a change in loadbalancing decisions for a
|
||||||
|
# connection for some time. Endpoints may need to be recreated to restore
|
||||||
|
# connectivity.
|
||||||
|
#
|
||||||
|
# If this option is set to "false" during an upgrade from 1.3 or earlier to
|
||||||
|
# 1.4 or later, then it may cause one-time disruptions during the upgrade.
|
||||||
|
preallocate-bpf-maps: "{{- if .PreallocateBPFMaps -}}true{{- else -}}false{{- end -}}"
|
||||||
|
# Regular expression matching compatible Istio sidecar istio-proxy
|
||||||
|
# container image names
|
||||||
|
sidecar-istio-proxy-image: "{{- if eq .SidecarIstioProxyImage "" -}}cilium/istio_proxy{{- else -}}{{ .SidecarIstioProxyImage }}{{- end -}}"
|
||||||
|
# Encapsulation mode for communication between nodes
|
||||||
|
# Possible values:
|
||||||
|
# - disabled
|
||||||
|
# - vxlan (default)
|
||||||
|
# - geneve
|
||||||
|
tunnel: "{{- if eq .Tunnel "" -}}vxlan{{- else -}}{{ .Tunnel }}{{- end -}}"
|
||||||
|
|
||||||
|
# Name of the cluster. Only relevant when building a mesh of clusters.
|
||||||
|
cluster-name: "{{- if eq .ClusterName "" -}}default{{- else -}}{{ .ClusterName}}{{- end -}}"
|
||||||
|
|
||||||
|
# This option is disabled by default starting from version 1.4.x in favor
|
||||||
|
# of a more powerful DNS proxy-based implementation, see [0] for details.
|
||||||
|
# Enable this option if you want to use FQDN policies but do not want to use
|
||||||
|
# the DNS proxy.
|
||||||
|
#
|
||||||
|
# To ease upgrade, users may opt to set this option to "true".
|
||||||
|
# Otherwise please refer to the Upgrade Guide [1] which explains how to
|
||||||
|
# prepare policy rules for upgrade.
|
||||||
|
#
|
||||||
|
# [0] http://docs.cilium.io/en/stable/policy/language/#dns-based
|
||||||
|
# [1] http://docs.cilium.io/en/stable/install/upgrade/#changes-that-may-require-action
|
||||||
|
tofqdns-enable-poller: "{{- if .ToFqdnsEnablePoller -}}true{{- else -}}false{{- end -}}"
|
||||||
|
# wait-bpf-mount makes init container wait until bpf filesystem is mounted
|
||||||
|
wait-bpf-mount: "true"
|
||||||
|
# Enable fetching of container-runtime specific metadata
|
||||||
|
#
|
||||||
|
# By default, the Kubernetes pod and namespace labels are retrieved and
|
||||||
|
# associated with endpoints for identification purposes. By integrating
|
||||||
|
# with the container runtime, container runtime specific labels can be
|
||||||
|
# retrieved, such labels will be prefixed with container:
|
||||||
|
#
|
||||||
|
# CAUTION: The container runtime labels can include information such as pod
|
||||||
|
# annotations which may result in each pod being associated a unique set of
|
||||||
|
# labels which can result in excessive security identities being allocated.
|
||||||
|
# Please review the labels filter when enabling container runtime labels.
|
||||||
|
#
|
||||||
|
# Supported values:
|
||||||
|
# - containerd
|
||||||
|
# - crio
|
||||||
|
# - docker
|
||||||
|
# - none
|
||||||
|
# - auto (automatically detect the container runtime)
|
||||||
|
#
|
||||||
|
container-runtime: "{{- if eq .ContainerRuntimeLabels "" -}}none{{- else -}}{{ .ContainerRuntimeLabels }}{{- end -}}"
|
||||||
|
masquerade: "{{- if .DisableMasquerade -}}false{{- else -}}true{{- end -}}"
|
||||||
|
install-iptables-rules: "{{- if .IPTablesRulesNoinstall -}}false{{- else -}}true{{- end -}}"
|
||||||
|
auto-direct-node-routes: "{{- if .AutoDirectNodeRoutes -}}true{{- else -}}false{{- end -}}"
|
||||||
|
enable-node-port: "{{- if .EnableNodePort -}}true{{- else -}}false{{- end -}}"
|
||||||
|
{{ end }} # With .Networking.Cilium end
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
|
|
@ -31,382 +118,19 @@ metadata:
|
||||||
name: cilium
|
name: cilium
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
---
|
---
|
||||||
kind: ClusterRoleBinding
|
apiVersion: v1
|
||||||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: cilium
|
name: cilium-operator
|
||||||
roleRef:
|
|
||||||
apiGroup: rbac.authorization.k8s.io
|
|
||||||
kind: ClusterRole
|
|
||||||
name: cilium
|
|
||||||
subjects:
|
|
||||||
- kind: ServiceAccount
|
|
||||||
name: cilium
|
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
- kind: Group
|
|
||||||
name: system:nodes
|
|
||||||
---
|
|
||||||
apiVersion: extensions/v1beta1
|
|
||||||
kind: DaemonSet
|
|
||||||
metadata:
|
|
||||||
name: cilium
|
|
||||||
namespace: kube-system
|
|
||||||
spec:
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
k8s-app: cilium
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
annotations:
|
|
||||||
# This annotation plus the CriticalAddonsOnly toleration makes
|
|
||||||
# cilium to be a critical pod in the cluster, which ensures cilium
|
|
||||||
# gets priority scheduling.
|
|
||||||
# https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
|
|
||||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
|
||||||
scheduler.alpha.kubernetes.io/tolerations: >-
|
|
||||||
[{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}]
|
|
||||||
prometheus.io/scrape: "true"
|
|
||||||
prometheus.io/port: "9090"
|
|
||||||
spec:
|
|
||||||
serviceAccountName: cilium
|
|
||||||
{{ with .Networking.Cilium }}
|
|
||||||
containers:
|
|
||||||
- image: "cilium/cilium:{{ .Version }}"
|
|
||||||
imagePullPolicy: Always
|
|
||||||
name: cilium-agent
|
|
||||||
command: [ "cilium-agent" ]
|
|
||||||
args:
|
|
||||||
{{ if .Debug }}
|
|
||||||
- "--debug=true"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .DebugVerbose}}
|
|
||||||
{{ range $j, $group:= .DebugVerbose}}
|
|
||||||
- "--debug-verbose"
|
|
||||||
- "{{ $group}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .AccessLog "" }}
|
|
||||||
- "--access-log"
|
|
||||||
- "{{ .AccessLog}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .AgentLabels }}
|
|
||||||
{{ range $j, $label := .AgentLabels }}
|
|
||||||
- "--agent-labels"
|
|
||||||
- "{{ $label }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .AllowLocalhost "" }}
|
|
||||||
- "--allow-localhost"
|
|
||||||
- "{{ .AllowLocalhost}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .AutoIpv6NodeRoutes }}
|
|
||||||
- "--auto-ipv6-node-routes"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .BPFRoot "" }}
|
|
||||||
- "--bpf-root"
|
|
||||||
- "{{ .BPFRoot }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .ContainerRuntime }}
|
|
||||||
{{ range $j, $runtime:= .ContainerRuntime }}
|
|
||||||
- "--container-runtime"
|
|
||||||
- "{{ $runtime}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if .ContainerRuntimeEndpoint }}
|
|
||||||
{{ range $runtime, $endpoint:= .ContainerRuntimeEndpoint }}
|
|
||||||
- "--container-runtime-endpoint={{ $runtime }}={{ $endpoint }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Device "" }}
|
|
||||||
- "--device"
|
|
||||||
- "{{ .Device }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .DisableConntrack }}
|
|
||||||
- "--disable-conntrack"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .DisableIpv4 }}
|
|
||||||
- "--disable-ipv4"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .DisableK8sServices }}
|
|
||||||
- "--disable-k8s-services"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .EnablePolicy "" }}
|
|
||||||
- "--enable-policy"
|
|
||||||
- "{{ .EnablePolicy }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .EnableTracing }}
|
|
||||||
- "--enable-tracing"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .EnvoyLog "" }}
|
|
||||||
- "--envoy-log"
|
|
||||||
- "{{ .EnvoyLog }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv4ClusterCIDRMaskSize 0 }}
|
|
||||||
- "--ipv4-cluster-cidr-mask-size"
|
|
||||||
- "{{ .Ipv4ClusterCIDRMaskSize }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv4Node "" }}
|
|
||||||
- "--ipv4-node"
|
|
||||||
- "{{ .Ipv4Node }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv4Range "" }}
|
|
||||||
- "--ipv4-range"
|
|
||||||
- "{{ .Ipv4Range }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv4ServiceRange "" }}
|
|
||||||
- "--ipv4-service-range"
|
|
||||||
- "{{ .Ipv4ServiceRange }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv6ClusterAllocCidr "" }}
|
|
||||||
- "--ipv6-cluster-alloc-cidr"
|
|
||||||
- "{{ .Ipv6ClusterAllocCidr }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv6Node "" }}
|
|
||||||
- "--ipv6-node"
|
|
||||||
- "{{ .Ipv6Node }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv6Range "" }}
|
|
||||||
- "--ipv6-range"
|
|
||||||
- "{{ .Ipv6Range }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Ipv6ServiceRange "" }}
|
|
||||||
- "--ipv6-service-range"
|
|
||||||
- "{{ .Ipv6ServiceRange }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .K8sAPIServer "" }}
|
|
||||||
- "--k8s-api-server"
|
|
||||||
- "{{ .K8sAPIServer }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .K8sKubeconfigPath "" }}
|
|
||||||
- "--k8s-kubeconfig-path"
|
|
||||||
- "{{ .K8sKubeconfigPath }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .KeepBPFTemplates }}
|
|
||||||
- "--keep-bpf-templates"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .KeepConfig }}
|
|
||||||
- "--keep-config"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LabelPrefixFile "" }}
|
|
||||||
- "--label-prefix-file"
|
|
||||||
- "{{ .LabelPrefixFile }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .Labels }}
|
|
||||||
{{ range $j, $label := .Labels }}
|
|
||||||
- "--labels"
|
|
||||||
- "{{ $label }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LB "" }}
|
|
||||||
- "--lb"
|
|
||||||
- "{{ .LB }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LibDir "" }}
|
|
||||||
- "--lib-dir"
|
|
||||||
- "{{ .LibDir }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .LogDrivers }}
|
|
||||||
{{ range $j, $driver := .LogDrivers }}
|
|
||||||
- "--log-driver"
|
|
||||||
- "{{ $driver}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if .LogOpt }}
|
|
||||||
{{ range $option, $value := .LogOpt }}
|
|
||||||
- "--log-opt={{ $option }}={{ $value }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if .Logstash }}
|
|
||||||
- "--logstash"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LogstashAgent "" }}
|
|
||||||
- "--logstash-agent"
|
|
||||||
- "{{ .LogstashAgent }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .LogstashProbeTimer 0 }}
|
|
||||||
- "--logstash-probe-timer"
|
|
||||||
- "{{ .LogstashProbeTimer }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if eq .DisableMasquerade true }}
|
|
||||||
- "--masquerade"
|
|
||||||
- "false"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Nat46Range "" }}
|
|
||||||
- "--nat46-range"
|
|
||||||
- "{{ .Nat46Range }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .Pprof}}
|
|
||||||
- "--pprof"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .PrefilterDevice "" }}
|
|
||||||
- "--prefilter-device"
|
|
||||||
- "{{ .PrefilterDevice }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .PrometheusServeAddr "" }}
|
|
||||||
- "--prometheus-serve-addr"
|
|
||||||
- "{{ .PrometheusServeAddr }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .Restore}}
|
|
||||||
- "--restore"
|
|
||||||
{{ end }}
|
|
||||||
{{ if .SingleClusterRoute}}
|
|
||||||
- "--single-cluster-route"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .SocketPath "" }}
|
|
||||||
- "--socket-path"
|
|
||||||
- "{{ .SocketPath }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .StateDir "" }}
|
|
||||||
- "--state-dir"
|
|
||||||
- "{{ .StateDir }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .TracePayloadLen 0 }}
|
|
||||||
- "--trace-payloadlen"
|
|
||||||
- "{{ .TracePayloadLen}}"
|
|
||||||
{{ end }}
|
|
||||||
{{ if ne .Tunnel "" }}
|
|
||||||
- "--tunnel"
|
|
||||||
- "{{ .Tunnel }}"
|
|
||||||
{{ end }}
|
|
||||||
# end of `with .Networking.Cilium`
|
|
||||||
{{ end }}
|
|
||||||
- "--kvstore"
|
|
||||||
- "etcd"
|
|
||||||
- "--kvstore-opt"
|
|
||||||
- "etcd.config=/var/lib/etcd-config/etcd.config"
|
|
||||||
ports:
|
|
||||||
- name: prometheus
|
|
||||||
containerPort: 9090
|
|
||||||
lifecycle:
|
|
||||||
postStart:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- "/cni-install.sh"
|
|
||||||
preStop:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- "/cni-uninstall.sh"
|
|
||||||
env:
|
|
||||||
- name: "K8S_NODE_NAME"
|
|
||||||
valueFrom:
|
|
||||||
fieldRef:
|
|
||||||
fieldPath: spec.nodeName
|
|
||||||
- name: "CILIUM_DEBUG"
|
|
||||||
valueFrom:
|
|
||||||
configMapKeyRef:
|
|
||||||
name: cilium-config
|
|
||||||
key: debug
|
|
||||||
- name: "DISABLE_IPV4"
|
|
||||||
valueFrom:
|
|
||||||
configMapKeyRef:
|
|
||||||
name: cilium-config
|
|
||||||
key: disable-ipv4
|
|
||||||
# Note: this variable is a no-op if not defined, and is used in the
|
|
||||||
# prometheus examples.
|
|
||||||
- name: "CILIUM_PROMETHEUS_SERVE_ADDR"
|
|
||||||
valueFrom:
|
|
||||||
configMapKeyRef:
|
|
||||||
name: cilium-metrics-config
|
|
||||||
optional: true
|
|
||||||
key: prometheus-serve-addr
|
|
||||||
livenessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- cilium
|
|
||||||
- status
|
|
||||||
# The initial delay for the liveness probe is intentionally large to
|
|
||||||
# avoid an endless kill & restart cycle if in the event that the initial
|
|
||||||
# bootstrapping takes longer than expected.
|
|
||||||
initialDelaySeconds: 120
|
|
||||||
failureThreshold: 10
|
|
||||||
periodSeconds: 10
|
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- cilium
|
|
||||||
- status
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
periodSeconds: 5
|
|
||||||
volumeMounts:
|
|
||||||
- name: bpf-maps
|
|
||||||
mountPath: /sys/fs/bpf
|
|
||||||
- name: cilium-run
|
|
||||||
mountPath: /var/run/cilium
|
|
||||||
- name: cni-path
|
|
||||||
mountPath: /host/opt/cni/bin
|
|
||||||
- name: etc-cni-netd
|
|
||||||
mountPath: /host/etc/cni/net.d
|
|
||||||
- name: docker-socket
|
|
||||||
mountPath: /var/run/docker.sock
|
|
||||||
readOnly: true
|
|
||||||
- name: etcd-config-path
|
|
||||||
mountPath: /var/lib/etcd-config
|
|
||||||
readOnly: true
|
|
||||||
{{- if eq $etcd_scheme "https" }}
|
|
||||||
- name: etcd-secrets
|
|
||||||
mountPath: /var/lib/etcd-secrets
|
|
||||||
readOnly: true
|
|
||||||
{{- end }}
|
|
||||||
securityContext:
|
|
||||||
capabilities:
|
|
||||||
add:
|
|
||||||
- "NET_ADMIN"
|
|
||||||
privileged: true
|
|
||||||
hostNetwork: true
|
|
||||||
volumes:
|
|
||||||
# To keep state between restarts / upgrades
|
|
||||||
- name: cilium-run
|
|
||||||
hostPath:
|
|
||||||
path: /var/run/cilium
|
|
||||||
# To keep state between restarts / upgrades
|
|
||||||
- name: bpf-maps
|
|
||||||
hostPath:
|
|
||||||
path: /sys/fs/bpf
|
|
||||||
# To read docker events from the node
|
|
||||||
- name: docker-socket
|
|
||||||
hostPath:
|
|
||||||
path: /var/run/docker.sock
|
|
||||||
# To install cilium cni plugin in the host
|
|
||||||
- name: cni-path
|
|
||||||
hostPath:
|
|
||||||
path: /opt/cni/bin
|
|
||||||
# To install cilium cni configuration in the host
|
|
||||||
- name: etc-cni-netd
|
|
||||||
hostPath:
|
|
||||||
path: /etc/cni/net.d
|
|
||||||
# To read the etcd config stored in config maps
|
|
||||||
- name: etcd-config-path
|
|
||||||
configMap:
|
|
||||||
name: cilium-config
|
|
||||||
items:
|
|
||||||
- key: etcd-config
|
|
||||||
path: etcd.config
|
|
||||||
{{- if eq $etcd_scheme "https" }}
|
|
||||||
- name: etcd-secrets
|
|
||||||
hostPath:
|
|
||||||
path: /srv/kubernetes/calico
|
|
||||||
{{- end }}
|
|
||||||
tolerations:
|
|
||||||
- effect: NoSchedule
|
|
||||||
key: node.cloudprovider.kubernetes.io/uninitialized
|
|
||||||
value: "true"
|
|
||||||
# Mark cilium's pod as critical for rescheduling
|
|
||||||
- key: CriticalAddonsOnly
|
|
||||||
operator: "Exists"
|
|
||||||
- effect: NoExecute
|
|
||||||
operator: Exists
|
|
||||||
# Allow the pod to run on all nodes. This is required
|
|
||||||
# for cluster communication
|
|
||||||
- effect: NoSchedule
|
|
||||||
operator: Exists
|
|
||||||
---
|
---
|
||||||
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
|
||||||
metadata:
|
metadata:
|
||||||
name: cilium
|
name: cilium
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- "networking.k8s.io"
|
- networking.k8s.io
|
||||||
resources:
|
resources:
|
||||||
- networkpolicies
|
- networkpolicies
|
||||||
verbs:
|
verbs:
|
||||||
|
|
@ -435,11 +159,16 @@ rules:
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- update
|
- update
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- nodes
|
||||||
|
- nodes/status
|
||||||
|
verbs:
|
||||||
|
- patch
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- extensions
|
- extensions
|
||||||
resources:
|
resources:
|
||||||
- networkpolicies
|
|
||||||
- thirdpartyresources
|
|
||||||
- ingresses
|
- ingresses
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
- create
|
||||||
|
|
@ -447,7 +176,7 @@ rules:
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- "apiextensions.k8s.io"
|
- apiextensions.k8s.io
|
||||||
resources:
|
resources:
|
||||||
- customresourcedefinitions
|
- customresourcedefinitions
|
||||||
verbs:
|
verbs:
|
||||||
|
|
@ -460,6 +189,426 @@ rules:
|
||||||
- cilium.io
|
- cilium.io
|
||||||
resources:
|
resources:
|
||||||
- ciliumnetworkpolicies
|
- ciliumnetworkpolicies
|
||||||
|
- ciliumnetworkpolicies/status
|
||||||
- ciliumendpoints
|
- ciliumendpoints
|
||||||
|
- ciliumendpoints/status
|
||||||
|
- ciliumnodes
|
||||||
|
- ciliumnodes/status
|
||||||
|
- ciliumidentities
|
||||||
|
- ciliumidentities/status
|
||||||
verbs:
|
verbs:
|
||||||
- "*"
|
- '*'
|
||||||
|
---
|
||||||
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: ClusterRole
|
||||||
|
metadata:
|
||||||
|
name: cilium-operator
|
||||||
|
rules:
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
# to automatically delete [core|kube]dns pods so that are starting to being
|
||||||
|
# managed by Cilium
|
||||||
|
- pods
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
|
- delete
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
# to automatically read from k8s and import the node's pod CIDR to cilium's
|
||||||
|
# etcd so all nodes know how to reach another pod running in in a different
|
||||||
|
# node.
|
||||||
|
- nodes
|
||||||
|
# to perform the translation of a CNP that contains `ToGroup` to its endpoints
|
||||||
|
- services
|
||||||
|
- endpoints
|
||||||
|
# to check apiserver connectivity
|
||||||
|
- namespaces
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
|
- apiGroups:
|
||||||
|
- cilium.io
|
||||||
|
resources:
|
||||||
|
- ciliumnetworkpolicies
|
||||||
|
- ciliumnetworkpolicies/status
|
||||||
|
- ciliumendpoints
|
||||||
|
- ciliumendpoints/status
|
||||||
|
- ciliumnodes
|
||||||
|
- ciliumnodes/status
|
||||||
|
- ciliumidentities
|
||||||
|
- ciliumidentities/status
|
||||||
|
verbs:
|
||||||
|
- '*'
|
||||||
|
---
|
||||||
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: ClusterRoleBinding
|
||||||
|
metadata:
|
||||||
|
name: cilium
|
||||||
|
roleRef:
|
||||||
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
kind: ClusterRole
|
||||||
|
name: cilium
|
||||||
|
subjects:
|
||||||
|
- kind: ServiceAccount
|
||||||
|
name: cilium
|
||||||
|
namespace: kube-system
|
||||||
|
---
|
||||||
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: ClusterRoleBinding
|
||||||
|
metadata:
|
||||||
|
name: cilium-operator
|
||||||
|
roleRef:
|
||||||
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
kind: ClusterRole
|
||||||
|
name: cilium-operator
|
||||||
|
subjects:
|
||||||
|
- kind: ServiceAccount
|
||||||
|
name: cilium-operator
|
||||||
|
namespace: kube-system
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: DaemonSet
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
k8s-app: cilium
|
||||||
|
kubernetes.io/cluster-service: "true"
|
||||||
|
name: cilium
|
||||||
|
namespace: kube-system
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
k8s-app: cilium
|
||||||
|
kubernetes.io/cluster-service: "true"
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
annotations:
|
||||||
|
# This annotation plus the CriticalAddonsOnly toleration makes
|
||||||
|
# cilium to be a critical pod in the cluster, which ensures cilium
|
||||||
|
# gets priority scheduling.
|
||||||
|
# https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
|
||||||
|
scheduler.alpha.kubernetes.io/critical-pod: ""
|
||||||
|
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}]'
|
||||||
|
labels:
|
||||||
|
k8s-app: cilium
|
||||||
|
kubernetes.io/cluster-service: "true"
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- args:
|
||||||
|
- --config-dir=/tmp/cilium/config-map
|
||||||
|
command:
|
||||||
|
- cilium-agent
|
||||||
|
env:
|
||||||
|
- name: K8S_NODE_NAME
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
apiVersion: v1
|
||||||
|
fieldPath: spec.nodeName
|
||||||
|
- name: CILIUM_K8S_NAMESPACE
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
apiVersion: v1
|
||||||
|
fieldPath: metadata.namespace
|
||||||
|
- name: CILIUM_FLANNEL_MASTER_DEVICE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: flannel-master-device
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_FLANNEL_UNINSTALL_ON_EXIT
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: flannel-uninstall-on-exit
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_CLUSTERMESH_CONFIG
|
||||||
|
value: /var/lib/cilium/clustermesh/
|
||||||
|
- name: CILIUM_CNI_CHAINING_MODE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: cni-chaining-mode
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_CUSTOM_CNI_CONF
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: custom-cni-conf
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
{{ with .Networking.Cilium }}
|
||||||
|
image: "docker.io/cilium/cilium:{{ .Version }}"
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
lifecycle:
|
||||||
|
postStart:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- /cni-install.sh
|
||||||
|
preStop:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- /cni-uninstall.sh
|
||||||
|
livenessProbe:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- cilium
|
||||||
|
- status
|
||||||
|
- --brief
|
||||||
|
failureThreshold: 10
|
||||||
|
# The initial delay for the liveness probe is intentionally large to
|
||||||
|
# avoid an endless kill & restart cycle if in the event that the initial
|
||||||
|
# bootstrapping takes longer than expected.
|
||||||
|
initialDelaySeconds: 120
|
||||||
|
periodSeconds: 30
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 5
|
||||||
|
name: cilium-agent
|
||||||
|
readinessProbe:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- cilium
|
||||||
|
- status
|
||||||
|
- --brief
|
||||||
|
failureThreshold: 3
|
||||||
|
initialDelaySeconds: 5
|
||||||
|
periodSeconds: 30
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 5
|
||||||
|
securityContext:
|
||||||
|
capabilities:
|
||||||
|
add:
|
||||||
|
- NET_ADMIN
|
||||||
|
- SYS_MODULE
|
||||||
|
privileged: true
|
||||||
|
volumeMounts:
|
||||||
|
- mountPath: /sys/fs/bpf
|
||||||
|
name: bpf-maps
|
||||||
|
- mountPath: /var/run/cilium
|
||||||
|
name: cilium-run
|
||||||
|
- mountPath: /host/opt/cni/bin
|
||||||
|
name: cni-path
|
||||||
|
- mountPath: /host/etc/cni/net.d
|
||||||
|
name: etc-cni-netd
|
||||||
|
- mountPath: /var/lib/cilium/clustermesh
|
||||||
|
name: clustermesh-secrets
|
||||||
|
readOnly: true
|
||||||
|
- mountPath: /tmp/cilium/config-map
|
||||||
|
name: cilium-config-path
|
||||||
|
readOnly: true
|
||||||
|
# Needed to be able to load kernel modules
|
||||||
|
- mountPath: /lib/modules
|
||||||
|
name: lib-modules
|
||||||
|
readOnly: true
|
||||||
|
- mountPath: /run/xtables.lock
|
||||||
|
name: xtables-lock
|
||||||
|
hostNetwork: true
|
||||||
|
initContainers:
|
||||||
|
- command:
|
||||||
|
- /init-container.sh
|
||||||
|
env:
|
||||||
|
- name: CILIUM_ALL_STATE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: clean-cilium-state
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_BPF_STATE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: clean-cilium-bpf-state
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_WAIT_BPF_MOUNT
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: wait-bpf-mount
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
image: "docker.io/cilium/cilium:{{ .Version }}"
|
||||||
|
## end of `with .Networking.Cilium`
|
||||||
|
#{{ end }}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
name: clean-cilium-state
|
||||||
|
securityContext:
|
||||||
|
capabilities:
|
||||||
|
add:
|
||||||
|
- NET_ADMIN
|
||||||
|
privileged: true
|
||||||
|
volumeMounts:
|
||||||
|
- mountPath: /sys/fs/bpf
|
||||||
|
name: bpf-maps
|
||||||
|
- mountPath: /var/run/cilium
|
||||||
|
name: cilium-run
|
||||||
|
restartPolicy: Always
|
||||||
|
serviceAccount: cilium
|
||||||
|
serviceAccountName: cilium
|
||||||
|
terminationGracePeriodSeconds: 1
|
||||||
|
tolerations:
|
||||||
|
- operator: Exists
|
||||||
|
volumes:
|
||||||
|
# To keep state between restarts / upgrades
|
||||||
|
- hostPath:
|
||||||
|
path: /var/run/cilium
|
||||||
|
type: DirectoryOrCreate
|
||||||
|
name: cilium-run
|
||||||
|
# To keep state between restarts / upgrades for bpf maps
|
||||||
|
- hostPath:
|
||||||
|
path: /sys/fs/bpf
|
||||||
|
type: DirectoryOrCreate
|
||||||
|
name: bpf-maps
|
||||||
|
# To install cilium cni plugin in the host
|
||||||
|
- hostPath:
|
||||||
|
path: /opt/cni/bin
|
||||||
|
type: DirectoryOrCreate
|
||||||
|
name: cni-path
|
||||||
|
# To install cilium cni configuration in the host
|
||||||
|
- hostPath:
|
||||||
|
path: /etc/cni/net.d
|
||||||
|
type: DirectoryOrCreate
|
||||||
|
name: etc-cni-netd
|
||||||
|
# To be able to load kernel modules
|
||||||
|
- hostPath:
|
||||||
|
path: /lib/modules
|
||||||
|
name: lib-modules
|
||||||
|
# To access iptables concurrently with other processes (e.g. kube-proxy)
|
||||||
|
- hostPath:
|
||||||
|
path: /run/xtables.lock
|
||||||
|
type: FileOrCreate
|
||||||
|
name: xtables-lock
|
||||||
|
# To read the clustermesh configuration
|
||||||
|
- name: clustermesh-secrets
|
||||||
|
secret:
|
||||||
|
defaultMode: 420
|
||||||
|
optional: true
|
||||||
|
secretName: cilium-clustermesh
|
||||||
|
# To read the configuration from the config map
|
||||||
|
- configMap:
|
||||||
|
name: cilium-config
|
||||||
|
name: cilium-config-path
|
||||||
|
updateStrategy:
|
||||||
|
rollingUpdate:
|
||||||
|
maxUnavailable: 2
|
||||||
|
type: RollingUpdate
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
io.cilium/app: operator
|
||||||
|
name: cilium-operator
|
||||||
|
name: cilium-operator
|
||||||
|
namespace: kube-system
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
io.cilium/app: operator
|
||||||
|
name: cilium-operator
|
||||||
|
strategy:
|
||||||
|
rollingUpdate:
|
||||||
|
maxSurge: 1
|
||||||
|
maxUnavailable: 1
|
||||||
|
type: RollingUpdate
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
io.cilium/app: operator
|
||||||
|
name: cilium-operator
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- args:
|
||||||
|
- --debug=$(CILIUM_DEBUG)
|
||||||
|
command:
|
||||||
|
- cilium-operator
|
||||||
|
env:
|
||||||
|
- name: CILIUM_K8S_NAMESPACE
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
apiVersion: v1
|
||||||
|
fieldPath: metadata.namespace
|
||||||
|
- name: K8S_NODE_NAME
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
apiVersion: v1
|
||||||
|
fieldPath: spec.nodeName
|
||||||
|
- name: CILIUM_DEBUG
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: debug
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_CLUSTER_NAME
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: cluster-name
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_CLUSTER_ID
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: cluster-id
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_IPAM
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: ipam
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_DISABLE_ENDPOINT_CRD
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: disable-endpoint-crd
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_KVSTORE
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: kvstore
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: CILIUM_KVSTORE_OPT
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
key: kvstore-opt
|
||||||
|
name: cilium-config
|
||||||
|
optional: true
|
||||||
|
- name: AWS_ACCESS_KEY_ID
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: AWS_ACCESS_KEY_ID
|
||||||
|
name: cilium-aws
|
||||||
|
optional: true
|
||||||
|
- name: AWS_SECRET_ACCESS_KEY
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: AWS_SECRET_ACCESS_KEY
|
||||||
|
name: cilium-aws
|
||||||
|
optional: true
|
||||||
|
- name: AWS_DEFAULT_REGION
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: AWS_DEFAULT_REGION
|
||||||
|
name: cilium-aws
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
{{ with .Networking.Cilium }}
|
||||||
|
image: "docker.io/cilium/operator:{{ .Version }}"
|
||||||
|
{{ end }}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
name: cilium-operator
|
||||||
|
livenessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /healthz
|
||||||
|
port: 9234
|
||||||
|
scheme: HTTP
|
||||||
|
initialDelaySeconds: 60
|
||||||
|
periodSeconds: 10
|
||||||
|
timeoutSeconds: 3
|
||||||
|
hostNetwork: true
|
||||||
|
restartPolicy: Always
|
||||||
|
serviceAccount: cilium-operator
|
||||||
|
serviceAccountName: cilium-operator
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ spec:
|
||||||
- id: k8s-1.7
|
- id: k8s-1.7
|
||||||
kubernetesVersion: '>=1.7.0 <1.12.0'
|
kubernetesVersion: '>=1.7.0 <1.12.0'
|
||||||
manifest: networking.cilium.io/k8s-1.7.yaml
|
manifest: networking.cilium.io/k8s-1.7.yaml
|
||||||
manifestHash: 26096db7dfad3f26c8b2fc92cd619d7dbc8c8ecd
|
manifestHash: 54942553181df199c9be734897ad7047395edc15
|
||||||
name: networking.cilium.io
|
name: networking.cilium.io
|
||||||
selector:
|
selector:
|
||||||
role.kubernetes.io/networking: "1"
|
role.kubernetes.io/networking: "1"
|
||||||
|
|
@ -115,7 +115,7 @@ spec:
|
||||||
- id: k8s-1.12
|
- id: k8s-1.12
|
||||||
kubernetesVersion: '>=1.12.0'
|
kubernetesVersion: '>=1.12.0'
|
||||||
manifest: networking.cilium.io/k8s-1.12.yaml
|
manifest: networking.cilium.io/k8s-1.12.yaml
|
||||||
manifestHash: e4886cb88b110e5509929088f83b6d23cf1bbaa0
|
manifestHash: 54942553181df199c9be734897ad7047395edc15
|
||||||
name: networking.cilium.io
|
name: networking.cilium.io
|
||||||
selector:
|
selector:
|
||||||
role.kubernetes.io/networking: "1"
|
role.kubernetes.io/networking: "1"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue