From 949a0aa5e7d81fef689ca941e682055ebfed79cb Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Wed, 19 Jul 2023 22:39:13 -0700 Subject: [PATCH] v1alpha3: remove unused ConfigStore --- pkg/apis/kops/cluster.go | 2 -- pkg/apis/kops/v1alpha2/cluster.go | 1 + pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 5 ++--- pkg/apis/kops/v1alpha3/cluster.go | 2 -- pkg/apis/kops/v1alpha3/zz_generated.conversion.go | 2 -- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkg/apis/kops/cluster.go b/pkg/apis/kops/cluster.go index 2d29379b17b44..38d3b10a39e3b 100644 --- a/pkg/apis/kops/cluster.go +++ b/pkg/apis/kops/cluster.go @@ -72,8 +72,6 @@ type ClusterSpec struct { SecretStore string `json:"secretStore,omitempty"` // KeyStore is the VFS path to where SSL keys and certificates are stored KeyStore string `json:"keyStore,omitempty"` - // ConfigStore is unused. - ConfigStore string `json:"configStore,omitempty"` // 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 // kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone. diff --git a/pkg/apis/kops/v1alpha2/cluster.go b/pkg/apis/kops/v1alpha2/cluster.go index a336936d3d9a6..66d9d4f4a7e94 100644 --- a/pkg/apis/kops/v1alpha2/cluster.go +++ b/pkg/apis/kops/v1alpha2/cluster.go @@ -100,6 +100,7 @@ type ClusterSpec struct { // KeyStore is the VFS path to where SSL keys and certificates are stored KeyStore string `json:"keyStore,omitempty"` // ConfigStore is unused. + // +k8s:conversion-gen=false ConfigStore string `json:"configStore,omitempty"` // 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 diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 0c1369df164c2..0a2be720c1886 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -2364,7 +2364,7 @@ func autoConvert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out * // INFO: in.Topology opted out of conversion generation out.SecretStore = in.SecretStore out.KeyStore = in.KeyStore - out.ConfigStore = in.ConfigStore + // INFO: in.ConfigStore opted out of conversion generation out.DNSZone = in.DNSZone if in.DNSControllerGossipConfig != nil { 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.SecretStore = in.SecretStore out.KeyStore = in.KeyStore - out.ConfigStore = in.ConfigStore out.DNSZone = in.DNSZone if in.DNSControllerGossipConfig != nil { 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 { - // INFO: in.ControlPlane opted out of conversion generation + // INFO: in.Masters opted out of conversion generation // INFO: in.Nodes opted out of conversion generation if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion diff --git a/pkg/apis/kops/v1alpha3/cluster.go b/pkg/apis/kops/v1alpha3/cluster.go index 2b7d3161d54bf..341ce7a1f9d17 100644 --- a/pkg/apis/kops/v1alpha3/cluster.go +++ b/pkg/apis/kops/v1alpha3/cluster.go @@ -68,8 +68,6 @@ type ClusterSpec struct { SecretStore string `json:"secretStore,omitempty"` // KeyStore is the VFS path to where SSL keys and certificates are stored KeyStore string `json:"keyStore,omitempty"` - // ConfigStore is unused. - ConfigStore string `json:"configStore,omitempty"` // 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 // kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone. diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index b59594816bfc5..c0d54bde5eb9c 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -2593,7 +2593,6 @@ func autoConvert_v1alpha3_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out * out.KubernetesVersion = in.KubernetesVersion out.SecretStore = in.SecretStore out.KeyStore = in.KeyStore - out.ConfigStore = in.ConfigStore out.DNSZone = in.DNSZone if in.DNSControllerGossipConfig != nil { 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.SecretStore = in.SecretStore out.KeyStore = in.KeyStore - out.ConfigStore = in.ConfigStore out.DNSZone = in.DNSZone if in.DNSControllerGossipConfig != nil { in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig