Skip to content
This repository has been archived by the owner on Nov 20, 2021. It is now read-only.

Commit

Permalink
add missing conversions and remove extra labels field from v1alpha1
Browse files Browse the repository at this point in the history
  • Loading branch information
rbtr authored and ChrisRx committed Jan 4, 2021
1 parent 894c4bb commit bc6be4a
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 23 deletions.
8 changes: 8 additions & 0 deletions pkg/config/v1alpha1/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,14 @@ func Convert_v1alpha2_KubeAPIServerConfiguration_To_v1alpha1_KubeAPIServerConfig
return autoConvert_v1alpha2_KubeAPIServerConfiguration_To_v1alpha1_KubeAPIServerConfiguration(in, out, s)
}

func Convert_v1alpha2_KubeControllerManagerConfiguration_To_v1alpha1_KubeControllerManagerConfiguration(in *v1alpha2.KubeControllerManagerConfiguration, out *KubeControllerManagerConfiguration, s conversion.Scope) error {
return autoConvert_v1alpha2_KubeControllerManagerConfiguration_To_v1alpha1_KubeControllerManagerConfiguration(in, out, s)
}

func Convert_v1alpha2_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConfiguration(in *v1alpha2.KubeSchedulerConfiguration, out *KubeSchedulerConfiguration, s conversion.Scope) error {
return autoConvert_v1alpha2_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConfiguration(in, out, s)
}

func Convert_v1alpha1_NodeConfiguration_To_v1alpha2_NodeConfiguration(in *NodeConfiguration, out *v1alpha2.NodeConfiguration, s conversion.Scope) error {
// KubeProxyMode moved to ControlPlaneConfiguration and conversion is
// handled there
Expand Down
3 changes: 0 additions & 3 deletions pkg/config/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,18 @@ type KubeAPIServerConfiguration struct {
ExtraVolumes []HostPathMount `json:"extraVolumes,omitempty"`
FeatureGates map[string]bool `json:"featureGates,omitempty"`
ExtraSANs []string `json:"extraSans,omitempty"`
ExtraLabels map[string]string `json:"extraLabels,omitempty"`
}

type KubeControllerManagerConfiguration struct {
ExtraArgs map[string]string `json:"extraArgs,omitempty"`
ExtraVolumes []HostPathMount `json:"extraVolumes,omitempty"`
FeatureGates map[string]bool `json:"featureGates,omitempty"`
ExtraLabels map[string]string `json:"extraLabels,omitempty"`
}

type KubeSchedulerConfiguration struct {
ExtraArgs map[string]string `json:"extraArgs,omitempty"`
ExtraVolumes []HostPathMount `json:"extraVolumes,omitempty"`
FeatureGates map[string]bool `json:"featureGates,omitempty"`
ExtraLabels map[string]string `json:"extraLabels,omitempty"`
}

// APIEndpoint represents a reachable Kubernetes API endpoint.
Expand Down
33 changes: 13 additions & 20 deletions pkg/config/v1alpha1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions pkg/config/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit bc6be4a

Please sign in to comment.