From 77aab657cc4d1f43048014562ccb6246029b4f5f Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Thu, 21 May 2020 15:47:33 +0200 Subject: [PATCH] Copy comments --- k8s/crds/kops.k8s.io_clusters.yaml | 2 +- pkg/apis/kops/networking.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index 5d8841f738..a58936b5d7 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -3132,7 +3132,7 @@ spec: type: object classic: description: ClassicNetworkingSpec is the specification of classic - networking mode, integrated into kubernetes Support been removed + networking mode, integrated into kubernetes. Support been removed since kops 1.4. type: object cni: diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go index 3b4ba5ee07..28b4f33b67 100644 --- a/pkg/apis/kops/networking.go +++ b/pkg/apis/kops/networking.go @@ -37,7 +37,8 @@ type NetworkingSpec struct { GCE *GCENetworkingSpec `json:"gce,omitempty"` } -// ClassicNetworkingSpec is the specification of classic networking mode, integrated into kubernetes +// ClassicNetworkingSpec is the specification of classic networking mode, integrated into kubernetes. +// Support been removed since kops 1.4. type ClassicNetworkingSpec struct { } @@ -45,14 +46,13 @@ type ClassicNetworkingSpec struct { type KubenetNetworkingSpec struct { } -// ExternalNetworkingSpec is the specification for networking that is implemented by a Daemonset -// It also uses kubenet +// ExternalNetworkingSpec is the specification for networking that is implemented by a Daemonset. +// Uses the kubenet networking provider. type ExternalNetworkingSpec struct { } -// CNINetworkingSpec is the specification for networking that is implemented by a Daemonset -// Networking is not managed by kops - we can create options here that directly configure e.g. weave -// but this is useful for arbitrary network modes or for modes that don't need additional configuration. +// CNINetworkingSpec is the specification for networking that is implemented by a Daemonset. +// Uses the CNI networking interface. type CNINetworkingSpec struct { UsesSecondaryIP bool `json:"usesSecondaryIP,omitempty"` }