Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow configuration of enable-remote-node-identity #8731

Merged
merged 1 commit into from
Mar 19, 2020
Merged

Allow configuration of enable-remote-node-identity #8731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2730,6 +2730,10 @@ spec:
description: EnablePrometheusMetrics enables the Cilium "/metrics"
endpoint for both the agent and the operator.
type: boolean
enableRemoteNodeIdentity:
description: 'EnableRemoteNodeIdentity enables the remote-node-identity
added in Cilium 1.7.0. Default: false'
type: boolean
enableTracing:
description: EnableTracing is not implemented and may be removed
in the future. Setting this has no effect.
Expand Down Expand Up @@ -2938,6 +2942,7 @@ spec:
- clusterName
- cniBinPath
- enableNodePort
- enableRemoteNodeIdentity
- enableipv4
- enableipv6
- monitorAggregation
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/kops/networking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,9 @@ type CiliumNetworkingSpec struct {
// The cluster is operated by cilium-etcd-operator.
// Default: false
EtcdManaged bool `json:"etcdManaged,omitempty"`
// EnableRemoteNodeIdentity enables the remote-node-identity added in Cilium 1.7.0.
// Default: false
EnableRemoteNodeIdentity bool `json:"enableRemoteNodeIdentity"`

// RemoveCbrBridge is not implemented and may be removed in the future.
// Setting this has no effect.
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/kops/v1alpha1/networking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,9 @@ type CiliumNetworkingSpec struct {
// The cluster is operated by cilium-etcd-operator.
// Default: false
EtcdManaged bool `json:"etcdManaged,omitempty"`
// EnableRemoteNodeIdentity enables the remote-node-identity added in Cilium 1.7.0.
// Default: false
EnableRemoteNodeIdentity bool `json:"enableRemoteNodeIdentity"`

// RemoveCbrBridge is not implemented and may be removed in the future.
// Setting this has no effect.
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions pkg/apis/kops/v1alpha2/networking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,9 @@ type CiliumNetworkingSpec struct {
// The cluster is operated by cilium-etcd-operator.
// Default: false
EtcdManaged bool `json:"etcdManaged,omitempty"`
// EnableRemoteNodeIdentity enables the remote-node-identity added in Cilium 1.7.0.
// Default: false
EnableRemoteNodeIdentity bool `json:"enableRemoteNodeIdentity"`

// RemoveCbrBridge is not implemented and may be removed in the future.
// Setting this has no effect.
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ data:
auto-direct-node-routes: "{{- if .AutoDirectNodeRoutes -}}true{{- else -}}false{{- end -}}"
enable-node-port: "{{- if .EnableNodePort -}}true{{- else -}}false{{- end -}}"
kube-proxy-replacement: "{{- if .EnableNodePort -}}strict{{- else -}}partial{{- end -}}"
enable-remote-node-identity: "{{- if .EnableRemoteNodeIdentity -}}true{{- else -}}false{{- end -}}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it okay that this field is present even if running cilium <1.7.0 ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. Cilium just ignores it.

{{ with .Ipam }}
ipam: {{ . }}
{{ if eq . "eni" }}
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {

if b.cluster.Spec.Networking.Cilium != nil {
key := "networking.cilium.io"
version := "1.7.0-kops.2"
version := "1.7.1-kops.1"

{
id := "k8s-1.7"
Expand Down
6 changes: 3 additions & 3 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ spec:
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: 1.7.0-kops.2
version: 1.7.1-kops.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: networking.cilium.io/k8s-1.12.yaml
manifestHash: e70d13053043ca311108cd90521f30d75c558cc7
manifestHash: a897a4b5d8f69f704c33c90487016f87b3737ffd
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: 1.7.0-kops.2
version: 1.7.1-kops.1