Skip to content

Commit a9f450d

Browse files
authored
Merge pull request #18152 from rifelpet/cilium-enable-host-firewall
Add EnableHostFirewall field to CiliumNetworkingSpec
2 parents 9d65247 + 356ef2f commit a9f450d

39 files changed

Lines changed: 66 additions & 11 deletions

File tree

k8s/crds/kops.k8s.io_clusters.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5598,6 +5598,11 @@ spec:
55985598
EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints.
55995599
Default: true
56005600
type: boolean
5601+
enableHostFirewall:
5602+
description: |-
5603+
EnableHostFirewall enables the host firewall in the Cilium agent.
5604+
Default: false
5605+
type: boolean
56015606
enableHostReachableServices:
56025607
description: |-
56035608
EnableHostReachableServices configures Cilium to enable services to be

pkg/apis/kops/networking.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,9 @@ type CiliumNetworkingSpec struct {
397397
// EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints.
398398
// Default: true
399399
EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"`
400+
// EnableHostFirewall enables the host firewall in the Cilium agent.
401+
// Default: false
402+
EnableHostFirewall *bool `json:"enableHostFirewall,omitempty"`
400403
// EnablePrometheusMetrics enables the Cilium "/metrics" endpoint for both the agent and the operator.
401404
EnablePrometheusMetrics bool `json:"enablePrometheusMetrics,omitempty"`
402405
// EnableEncryption enables Cilium Encryption.

pkg/apis/kops/v1alpha2/networking.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,9 @@ type CiliumNetworkingSpec struct {
395395
// EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints.
396396
// Default: true
397397
EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"`
398+
// EnableHostFirewall enables the host firewall in the Cilium agent.
399+
// Default: false
400+
EnableHostFirewall *bool `json:"enableHostFirewall,omitempty"`
398401
// EnableTracing is unused.
399402
// +k8s:conversion-gen=false
400403
EnableTracing bool `json:"enableTracing,omitempty"`

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

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha3/networking.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,9 @@ type CiliumNetworkingSpec struct {
345345
// EnableEndpointHealthChecking enables connectivity health checking between virtual endpoints.
346346
// Default: true
347347
EnableEndpointHealthChecking *bool `json:"enableEndpointHealthChecking,omitempty"`
348+
// EnableHostFirewall enables the host firewall in the Cilium agent.
349+
// Default: false
350+
EnableHostFirewall *bool `json:"enableHostFirewall,omitempty"`
348351
// EnablePrometheusMetrics enables the Cilium "/metrics" endpoint for both the agent and the operator.
349352
EnablePrometheusMetrics bool `json:"enablePrometheusMetrics,omitempty"`
350353
// EnableEncryption enables Cilium Encryption.

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

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/model/components/cilium.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ func (b *CiliumOptionsBuilder) BuildOptions(o *kops.Cluster) error {
4747
c.EnableEndpointHealthChecking = fi.PtrTo(true)
4848
}
4949

50+
if c.EnableHostFirewall == nil {
51+
c.EnableHostFirewall = fi.PtrTo(false)
52+
}
53+
5054
if c.IdentityAllocationMode == "" {
5155
c.IdentityAllocationMode = "crd"
5256
}

0 commit comments

Comments
 (0)