kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v1alpha3: remove unused ConfigStore

This commit is contained in:
John Gardiner Myers 2023-07-19 22:39:13 -07:00
parent a959435079
commit 4a7abcef51
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/kops/cluster.go
View File

@ -72,8 +72,6 @@ type ClusterSpec struct {
SecretStore string `json:"secretStore,omitempty"` SecretStore string `json:"secretStore,omitempty"`
// KeyStore is the VFS path to where SSL keys and certificates are stored // KeyStore is the VFS path to where SSL keys and certificates are stored
KeyStore string `json:"keyStore,omitempty"` KeyStore string `json:"keyStore,omitempty"`
// ConfigStore is unused.
ConfigStore string `json:"configStore,omitempty"`
// DNSZone is the DNS zone we should use when configuring DNS // DNSZone is the DNS zone we should use when configuring DNS
// This is because some clouds let us define a managed zone foo.bar, and then have // This is because some clouds let us define a managed zone foo.bar, and then have
// kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone. // kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone.

1
pkg/apis/kops/v1alpha2/cluster.go
View File

@ -100,6 +100,7 @@ type ClusterSpec struct {
// KeyStore is the VFS path to where SSL keys and certificates are stored // KeyStore is the VFS path to where SSL keys and certificates are stored
KeyStore string `json:"keyStore,omitempty"` KeyStore string `json:"keyStore,omitempty"`
// ConfigStore is unused. // ConfigStore is unused.
// +k8s:conversion-gen=false
ConfigStore string `json:"configStore,omitempty"` ConfigStore string `json:"configStore,omitempty"`
// DNSZone is the DNS zone we should use when configuring DNS // DNSZone is the DNS zone we should use when configuring DNS
// This is because some clouds let us define a managed zone foo.bar, and then have // This is because some clouds let us define a managed zone foo.bar, and then have

5
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -2364,7 +2364,7 @@ func autoConvert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
// INFO: in.Topology opted out of conversion generation // INFO: in.Topology opted out of conversion generation
out.SecretStore = in.SecretStore out.SecretStore = in.SecretStore
out.KeyStore = in.KeyStore out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore // INFO: in.ConfigStore opted out of conversion generation
out.DNSZone = in.DNSZone out.DNSZone = in.DNSZone
if in.DNSControllerGossipConfig != nil { if in.DNSControllerGossipConfig != nil {
in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig
@ -2713,7 +2713,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha2_ClusterSpec(in *kops.ClusterSpec,
out.KubernetesVersion = in.KubernetesVersion out.KubernetesVersion = in.KubernetesVersion
out.SecretStore = in.SecretStore out.SecretStore = in.SecretStore
out.KeyStore = in.KeyStore out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone out.DNSZone = in.DNSZone
if in.DNSControllerGossipConfig != nil { if in.DNSControllerGossipConfig != nil {
in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig
@ -7161,7 +7160,7 @@ func Convert_kops_TerraformSpec_To_v1alpha2_TerraformSpec(in *kops.TerraformSpec
} }
func autoConvert_v1alpha2_TopologySpec_To_kops_TopologySpec(in *TopologySpec, out *kops.TopologySpec, s conversion.Scope) error { func autoConvert_v1alpha2_TopologySpec_To_kops_TopologySpec(in *TopologySpec, out *kops.TopologySpec, s conversion.Scope) error {
// INFO: in.ControlPlane opted out of conversion generation // INFO: in.Masters opted out of conversion generation
// INFO: in.Nodes opted out of conversion generation // INFO: in.Nodes opted out of conversion generation
if in.Bastion != nil { if in.Bastion != nil {
in, out := &in.Bastion, &out.Bastion in, out := &in.Bastion, &out.Bastion

2
pkg/apis/kops/v1alpha3/cluster.go
View File

@ -68,8 +68,6 @@ type ClusterSpec struct {
SecretStore string `json:"secretStore,omitempty"` SecretStore string `json:"secretStore,omitempty"`
// KeyStore is the VFS path to where SSL keys and certificates are stored // KeyStore is the VFS path to where SSL keys and certificates are stored
KeyStore string `json:"keyStore,omitempty"` KeyStore string `json:"keyStore,omitempty"`
// ConfigStore is unused.
ConfigStore string `json:"configStore,omitempty"`
// DNSZone is the DNS zone we should use when configuring DNS // DNSZone is the DNS zone we should use when configuring DNS
// This is because some clouds let us define a managed zone foo.bar, and then have // This is because some clouds let us define a managed zone foo.bar, and then have
// kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone. // kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone.

2
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -2593,7 +2593,6 @@ func autoConvert_v1alpha3_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
out.KubernetesVersion = in.KubernetesVersion out.KubernetesVersion = in.KubernetesVersion
out.SecretStore = in.SecretStore out.SecretStore = in.SecretStore
out.KeyStore = in.KeyStore out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone out.DNSZone = in.DNSZone
if in.DNSControllerGossipConfig != nil { if in.DNSControllerGossipConfig != nil {
in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig
@ -2927,7 +2926,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha3_ClusterSpec(in *kops.ClusterSpec,
out.KubernetesVersion = in.KubernetesVersion out.KubernetesVersion = in.KubernetesVersion
out.SecretStore = in.SecretStore out.SecretStore = in.SecretStore
out.KeyStore = in.KeyStore out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone out.DNSZone = in.DNSZone
if in.DNSControllerGossipConfig != nil { if in.DNSControllerGossipConfig != nil {
in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig