Add option to use etcd managed by cilium-etcd-operator as kvstore

kubernetes · Feb 25, 2020 · 641ab56 · 641ab56
1 parent 45918a2
commit 641ab56
Show file tree

Hide file tree

Showing 7 changed files with 318 additions and 0 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -2618,6 +2618,8 @@ spec:
                       type: boolean
                     envoyLog:
                       type: string
+                    etcdManaged:
+                      type: boolean
                     ipam:
                       type: string
                     ipv4ClusterCidrMaskSize:

diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
@@ -215,6 +215,7 @@ type CiliumNetworkingSpec struct {
 	EnableTracing            bool              `json:"enableTracing,omitempty"`
 	EnablePrometheusMetrics  bool              `json:"enablePrometheusMetrics,omitempty"`
 	EnvoyLog                 string            `json:"envoyLog,omitempty"`
+	EtcdManaged              bool              `json:"etcdManaged,omitempty"`
 	Ipv4ClusterCIDRMaskSize  int               `json:"ipv4ClusterCidrMaskSize,omitempty"`
 	Ipv4Node                 string            `json:"ipv4Node,omitempty"`
 	Ipv4Range                string            `json:"ipv4Range,omitempty"`

diff --git a/pkg/apis/kops/v1alpha1/networking.go b/pkg/apis/kops/v1alpha1/networking.go
@@ -212,6 +212,7 @@ type CiliumNetworkingSpec struct {
 	EnablePrometheusMetrics  bool              `json:"enablePrometheusMetrics,omitempty"`
 	EnableTracing            bool              `json:"enableTracing,omitempty"`
 	EnvoyLog                 string            `json:"envoyLog,omitempty"`
+	EtcdManaged              bool              `json:"etcdManaged,omitempty"`
 	Ipv4ClusterCIDRMaskSize  int               `json:"ipv4ClusterCidrMaskSize,omitempty"`
 	Ipv4Node                 string            `json:"ipv4Node,omitempty"`
 	Ipv4Range                string            `json:"ipv4Range,omitempty"`

diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go
@@ -213,6 +213,7 @@ type CiliumNetworkingSpec struct {
 	EnablePrometheusMetrics  bool              `json:"enablePrometheusMetrics,omitempty"`
 	EnableTracing            bool              `json:"enableTracing,omitempty"`
 	EnvoyLog                 string            `json:"envoyLog,omitempty"`
+	EtcdManaged              bool              `json:"etcdManaged,omitempty"`
 	Ipv4ClusterCIDRMaskSize  int               `json:"ipv4ClusterCidrMaskSize,omitempty"`
 	Ipv4Node                 string            `json:"ipv4Node,omitempty"`
 	Ipv4Range                string            `json:"ipv4Range,omitempty"`

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go