mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
Merge pull request #58664 from hzxuzhonghu/code-gen
Automatic merge from submit-queue (batch tested with PRs 58259, 58664). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix generator_for_scheme: remove blank new line **What this PR does / why we need it**: 1. remove new blank line in `AddToScheme`80e344644e/pkg/client/clientset_generated/internalclientset/fake/register.go (L81-L83)
2. remove new blank line in `Install`3d69cea1e5/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/register.go (L44-L47)
**Special notes for your reviewer**: the first commit changes the code generator for schema register.c8c9ca77af
**Release note**: ```release-note NONE ```
This commit is contained in:
commit
32913ab0cd
@ -79,5 +79,4 @@ func AddToScheme(scheme *runtime.Scheme) {
|
||||
schedulinginternalversion.AddToScheme(scheme)
|
||||
settingsinternalversion.AddToScheme(scheme)
|
||||
storageinternalversion.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -49,5 +49,4 @@ func init() {
|
||||
// correctly.
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
apiextensionsv1beta1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -49,5 +49,4 @@ func init() {
|
||||
// correctly.
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
apiextensionsv1beta1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -49,5 +49,4 @@ func init() {
|
||||
// correctly.
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
apiextensionsinternalversion.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -43,5 +43,4 @@ func init() {
|
||||
// Install registers the API group and adds types to a scheme
|
||||
func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
|
||||
apiextensions.Install(groupFactoryRegistry, registry, scheme)
|
||||
|
||||
}
|
||||
|
@ -103,5 +103,4 @@ func AddToScheme(scheme *runtime.Scheme) {
|
||||
storagev1beta1.AddToScheme(scheme)
|
||||
storagev1.AddToScheme(scheme)
|
||||
storagev1alpha1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -103,5 +103,4 @@ func AddToScheme(scheme *runtime.Scheme) {
|
||||
storagev1beta1.AddToScheme(scheme)
|
||||
storagev1.AddToScheme(scheme)
|
||||
storagev1alpha1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -51,5 +51,4 @@ func init() {
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
exampleinternalversion.AddToScheme(scheme)
|
||||
secondexampleinternalversion.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -45,5 +45,4 @@ func init() {
|
||||
func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
|
||||
example.Install(groupFactoryRegistry, registry, scheme)
|
||||
secondexample.Install(groupFactoryRegistry, registry, scheme)
|
||||
|
||||
}
|
||||
|
@ -51,5 +51,4 @@ func init() {
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
examplev1.AddToScheme(scheme)
|
||||
secondexamplev1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -51,5 +51,4 @@ func init() {
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
examplev1.AddToScheme(scheme)
|
||||
secondexamplev1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -51,5 +51,4 @@ func init() {
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
examplev1.AddToScheme(scheme)
|
||||
secondexamplev1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -51,5 +51,4 @@ func init() {
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
examplev1.AddToScheme(scheme)
|
||||
secondexamplev1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -149,9 +149,12 @@ func init() {
|
||||
|
||||
// Install registers the API group and adds types to a scheme
|
||||
func Install(groupFactoryRegistry $.announcedAPIGroupFactoryRegistry|raw$, registry *$.registeredAPIRegistrationManager|raw$, scheme *$.runtimeScheme|raw$) {
|
||||
$range .allInstallGroups$ $.InstallPackageAlias$.Install(groupFactoryRegistry, registry, scheme)
|
||||
$end$
|
||||
$if .customRegister$ExtraInstall(groupFactoryRegistry, registry, scheme)$end$
|
||||
$- range .allInstallGroups$
|
||||
$.InstallPackageAlias$.Install(groupFactoryRegistry, registry, scheme)
|
||||
$- end$
|
||||
$if .customRegister$
|
||||
ExtraInstall(groupFactoryRegistry, registry, scheme)
|
||||
$end -$
|
||||
}
|
||||
`
|
||||
|
||||
@ -178,8 +181,11 @@ func init() {
|
||||
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
|
||||
// correctly.
|
||||
func AddToScheme(scheme *$.runtimeScheme|raw$) {
|
||||
$range .allGroupVersions$ $.PackageAlias$.AddToScheme(scheme)
|
||||
$end$
|
||||
$if .customRegister$ExtraAddToScheme(scheme)$end$
|
||||
$- range .allGroupVersions$
|
||||
$.PackageAlias$.AddToScheme(scheme)
|
||||
$- end$
|
||||
$if .customRegister$
|
||||
ExtraAddToScheme(scheme)
|
||||
$end -$
|
||||
}
|
||||
`
|
||||
|
@ -51,5 +51,4 @@ func init() {
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
apiregistrationv1beta1.AddToScheme(scheme)
|
||||
apiregistrationv1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -51,5 +51,4 @@ func init() {
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
apiregistrationv1beta1.AddToScheme(scheme)
|
||||
apiregistrationv1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -49,5 +49,4 @@ func init() {
|
||||
// correctly.
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
apiregistrationinternalversion.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -43,5 +43,4 @@ func init() {
|
||||
// Install registers the API group and adds types to a scheme
|
||||
func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
|
||||
apiregistration.Install(groupFactoryRegistry, registry, scheme)
|
||||
|
||||
}
|
||||
|
@ -51,5 +51,4 @@ func init() {
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
metricsv1alpha1.AddToScheme(scheme)
|
||||
metricsv1beta1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -51,5 +51,4 @@ func init() {
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
metricsv1alpha1.AddToScheme(scheme)
|
||||
metricsv1beta1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -49,5 +49,4 @@ func init() {
|
||||
// correctly.
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
wardleinternalversion.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -43,5 +43,4 @@ func init() {
|
||||
// Install registers the API group and adds types to a scheme
|
||||
func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
|
||||
wardle.Install(groupFactoryRegistry, registry, scheme)
|
||||
|
||||
}
|
||||
|
@ -49,5 +49,4 @@ func init() {
|
||||
// correctly.
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
wardlev1alpha1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -49,5 +49,4 @@ func init() {
|
||||
// correctly.
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
wardlev1alpha1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -49,5 +49,4 @@ func init() {
|
||||
// correctly.
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
samplecontrollerv1alpha1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
@ -49,5 +49,4 @@ func init() {
|
||||
// correctly.
|
||||
func AddToScheme(scheme *runtime.Scheme) {
|
||||
samplecontrollerv1alpha1.AddToScheme(scheme)
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user