From 2ca1d7ddd7cef4476008858ccd56a2eac32e646c Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sun, 21 Nov 2021 22:37:15 -0800 Subject: [PATCH] Update autogenerated files --- k8s/crds/kops.k8s.io_clusters.yaml | 6 ++++++ pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 4 ++++ pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go | 10 ++++++++++ pkg/apis/kops/v1alpha3/zz_generated.conversion.go | 4 ++++ pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go | 10 ++++++++++ pkg/apis/kops/zz_generated.deepcopy.go | 10 ++++++++++ upup/models/BUILD.bazel | 2 ++ 7 files changed, 46 insertions(+) diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index 2c86d94d27..1a01740cbe 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -524,6 +524,9 @@ spec: description: ConfigureCloudRoutes enables CIDRs allocated with to be configured on the cloud provider. type: boolean + enableLeaderMigration: + description: EnableLeaderMigration enables controller leader migration. + type: boolean image: description: Image is the OCI image of the cloud controller manager. type: string @@ -1884,6 +1887,9 @@ spec: sync loop in the attach-detach controller. This can cause volumes to become mismatched with pods type: boolean + enableLeaderMigration: + description: EnableLeaderMigration enables controller leader migration. + type: boolean enableProfiling: description: EnableProfiling enables profiling via web interface host:port/debug/pprof/ diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 5fb023db91..33e3e90d05 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -2167,6 +2167,7 @@ func autoConvert_v1alpha2_CloudControllerManagerConfig_To_kops_CloudControllerMa out.LeaderElection = nil } out.UseServiceAccountCredentials = in.UseServiceAccountCredentials + out.EnableLeaderMigration = in.EnableLeaderMigration return nil } @@ -2195,6 +2196,7 @@ func autoConvert_kops_CloudControllerManagerConfig_To_v1alpha2_CloudControllerMa out.LeaderElection = nil } out.UseServiceAccountCredentials = in.UseServiceAccountCredentials + out.EnableLeaderMigration = in.EnableLeaderMigration return nil } @@ -4968,6 +4970,7 @@ func autoConvert_v1alpha2_KubeControllerManagerConfig_To_kops_KubeControllerMana out.AuthorizationAlwaysAllowPaths = in.AuthorizationAlwaysAllowPaths out.ExternalCloudVolumePlugin = in.ExternalCloudVolumePlugin out.EnableProfiling = in.EnableProfiling + out.EnableLeaderMigration = in.EnableLeaderMigration return nil } @@ -5037,6 +5040,7 @@ func autoConvert_kops_KubeControllerManagerConfig_To_v1alpha2_KubeControllerMana out.AuthorizationAlwaysAllowPaths = in.AuthorizationAlwaysAllowPaths out.ExternalCloudVolumePlugin = in.ExternalCloudVolumePlugin out.EnableProfiling = in.EnableProfiling + out.EnableLeaderMigration = in.EnableLeaderMigration return nil } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index d721060804..408da369fe 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -782,6 +782,11 @@ func (in *CloudControllerManagerConfig) DeepCopyInto(out *CloudControllerManager *out = new(bool) **out = **in } + if in.EnableLeaderMigration != nil { + in, out := &in.EnableLeaderMigration, &out.EnableLeaderMigration + *out = new(bool) + **out = **in + } return } @@ -3114,6 +3119,11 @@ func (in *KubeControllerManagerConfig) DeepCopyInto(out *KubeControllerManagerCo *out = new(bool) **out = **in } + if in.EnableLeaderMigration != nil { + in, out := &in.EnableLeaderMigration, &out.EnableLeaderMigration + *out = new(bool) + **out = **in + } return } diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index 352a707725..cd1e53e3bd 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -2045,6 +2045,7 @@ func autoConvert_v1alpha3_CloudControllerManagerConfig_To_kops_CloudControllerMa out.LeaderElection = nil } out.UseServiceAccountCredentials = in.UseServiceAccountCredentials + out.EnableLeaderMigration = in.EnableLeaderMigration return nil } @@ -2073,6 +2074,7 @@ func autoConvert_kops_CloudControllerManagerConfig_To_v1alpha3_CloudControllerMa out.LeaderElection = nil } out.UseServiceAccountCredentials = in.UseServiceAccountCredentials + out.EnableLeaderMigration = in.EnableLeaderMigration return nil } @@ -4826,6 +4828,7 @@ func autoConvert_v1alpha3_KubeControllerManagerConfig_To_kops_KubeControllerMana out.AuthorizationAlwaysAllowPaths = in.AuthorizationAlwaysAllowPaths out.ExternalCloudVolumePlugin = in.ExternalCloudVolumePlugin out.EnableProfiling = in.EnableProfiling + out.EnableLeaderMigration = in.EnableLeaderMigration return nil } @@ -4895,6 +4898,7 @@ func autoConvert_kops_KubeControllerManagerConfig_To_v1alpha3_KubeControllerMana out.AuthorizationAlwaysAllowPaths = in.AuthorizationAlwaysAllowPaths out.ExternalCloudVolumePlugin = in.ExternalCloudVolumePlugin out.EnableProfiling = in.EnableProfiling + out.EnableLeaderMigration = in.EnableLeaderMigration return nil } diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go index ebc8f80ca3..ae85ac87e8 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go @@ -728,6 +728,11 @@ func (in *CloudControllerManagerConfig) DeepCopyInto(out *CloudControllerManager *out = new(bool) **out = **in } + if in.EnableLeaderMigration != nil { + in, out := &in.EnableLeaderMigration, &out.EnableLeaderMigration + *out = new(bool) + **out = **in + } return } @@ -3055,6 +3060,11 @@ func (in *KubeControllerManagerConfig) DeepCopyInto(out *KubeControllerManagerCo *out = new(bool) **out = **in } + if in.EnableLeaderMigration != nil { + in, out := &in.EnableLeaderMigration, &out.EnableLeaderMigration + *out = new(bool) + **out = **in + } return } diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 6ee4c6ca2d..7b0c957f37 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -820,6 +820,11 @@ func (in *CloudControllerManagerConfig) DeepCopyInto(out *CloudControllerManager *out = new(bool) **out = **in } + if in.EnableLeaderMigration != nil { + in, out := &in.EnableLeaderMigration, &out.EnableLeaderMigration + *out = new(bool) + **out = **in + } return } @@ -3229,6 +3234,11 @@ func (in *KubeControllerManagerConfig) DeepCopyInto(out *KubeControllerManagerCo *out = new(bool) **out = **in } + if in.EnableLeaderMigration != nil { + in, out := &in.EnableLeaderMigration, &out.EnableLeaderMigration + *out = new(bool) + **out = **in + } return } diff --git a/upup/models/BUILD.bazel b/upup/models/BUILD.bazel index 78352f6ea9..c0e899e02b 100644 --- a/upup/models/BUILD.bazel +++ b/upup/models/BUILD.bazel @@ -53,6 +53,8 @@ go_library( "cloudup/resources/addons/nvidia.addons.k8s.io/k8s-1.16.yaml", "cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.22.yaml.template", "cloudup/resources/addons/external-dns.addons.k8s.io/k8s-1.19.yaml.template", + "cloudup/resources/addons/leader-migration.rbac.addons.k8s.io/k8s-1.23.yaml", + "cloudup/resources/addons/leader-migration.rbac.addons.k8s.io/k8s-1.25.yaml", ], importpath = "k8s.io/kops/upup/models", visibility = ["//visibility:public"],