forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kubernetes#49119 from kad/n-addons-repo
Automatic merge from submit-queue (batch tested with PRs 50693, 50831, 47506, 49119, 50871) kubeadm: Implement support for using images from CI builds **What this PR does / why we need it**: Implements support for CI images in kubeadm **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes kubernetes/kubeadm#337 **Special notes for your reviewer**: **Release note**: ```release-note - kubeadm now supports "ci/latest-1.8" or "ci-cross/latest-1.8" and similar labels. ```
- Loading branch information
Showing
11 changed files
with
439 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
279 changes: 279 additions & 0 deletions
279
cmd/kubeadm/app/apis/kubeadm/v1alpha1/zz_generated.conversion.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,279 @@ | ||
| // +build !ignore_autogenerated | ||
|
|
||
| /* | ||
| Copyright 2017 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // This file was autogenerated by conversion-gen. Do not edit it manually! | ||
|
|
||
| package v1alpha1 | ||
|
|
||
| import ( | ||
| conversion "k8s.io/apimachinery/pkg/conversion" | ||
| runtime "k8s.io/apimachinery/pkg/runtime" | ||
| kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" | ||
| time "time" | ||
| unsafe "unsafe" | ||
| ) | ||
|
|
||
| func init() { | ||
| localSchemeBuilder.Register(RegisterConversions) | ||
| } | ||
|
|
||
| // RegisterConversions adds conversion functions to the given scheme. | ||
| // Public to allow building arbitrary schemes. | ||
| func RegisterConversions(scheme *runtime.Scheme) error { | ||
| return scheme.AddGeneratedConversionFuncs( | ||
| Convert_v1alpha1_API_To_kubeadm_API, | ||
| Convert_kubeadm_API_To_v1alpha1_API, | ||
| Convert_v1alpha1_Etcd_To_kubeadm_Etcd, | ||
| Convert_kubeadm_Etcd_To_v1alpha1_Etcd, | ||
| Convert_v1alpha1_MasterConfiguration_To_kubeadm_MasterConfiguration, | ||
| Convert_kubeadm_MasterConfiguration_To_v1alpha1_MasterConfiguration, | ||
| Convert_v1alpha1_Networking_To_kubeadm_Networking, | ||
| Convert_kubeadm_Networking_To_v1alpha1_Networking, | ||
| Convert_v1alpha1_NodeConfiguration_To_kubeadm_NodeConfiguration, | ||
| Convert_kubeadm_NodeConfiguration_To_v1alpha1_NodeConfiguration, | ||
| Convert_v1alpha1_TokenDiscovery_To_kubeadm_TokenDiscovery, | ||
| Convert_kubeadm_TokenDiscovery_To_v1alpha1_TokenDiscovery, | ||
| ) | ||
| } | ||
|
|
||
| func autoConvert_v1alpha1_API_To_kubeadm_API(in *API, out *kubeadm.API, s conversion.Scope) error { | ||
| out.AdvertiseAddress = in.AdvertiseAddress | ||
| out.BindPort = in.BindPort | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_v1alpha1_API_To_kubeadm_API is an autogenerated conversion function. | ||
| func Convert_v1alpha1_API_To_kubeadm_API(in *API, out *kubeadm.API, s conversion.Scope) error { | ||
| return autoConvert_v1alpha1_API_To_kubeadm_API(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_kubeadm_API_To_v1alpha1_API(in *kubeadm.API, out *API, s conversion.Scope) error { | ||
| out.AdvertiseAddress = in.AdvertiseAddress | ||
| out.BindPort = in.BindPort | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_kubeadm_API_To_v1alpha1_API is an autogenerated conversion function. | ||
| func Convert_kubeadm_API_To_v1alpha1_API(in *kubeadm.API, out *API, s conversion.Scope) error { | ||
| return autoConvert_kubeadm_API_To_v1alpha1_API(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_v1alpha1_Etcd_To_kubeadm_Etcd(in *Etcd, out *kubeadm.Etcd, s conversion.Scope) error { | ||
| out.Endpoints = *(*[]string)(unsafe.Pointer(&in.Endpoints)) | ||
| out.CAFile = in.CAFile | ||
| out.CertFile = in.CertFile | ||
| out.KeyFile = in.KeyFile | ||
| out.DataDir = in.DataDir | ||
| out.ExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.ExtraArgs)) | ||
| out.Image = in.Image | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_v1alpha1_Etcd_To_kubeadm_Etcd is an autogenerated conversion function. | ||
| func Convert_v1alpha1_Etcd_To_kubeadm_Etcd(in *Etcd, out *kubeadm.Etcd, s conversion.Scope) error { | ||
| return autoConvert_v1alpha1_Etcd_To_kubeadm_Etcd(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_kubeadm_Etcd_To_v1alpha1_Etcd(in *kubeadm.Etcd, out *Etcd, s conversion.Scope) error { | ||
| if in.Endpoints == nil { | ||
| out.Endpoints = make([]string, 0) | ||
| } else { | ||
| out.Endpoints = *(*[]string)(unsafe.Pointer(&in.Endpoints)) | ||
| } | ||
| out.CAFile = in.CAFile | ||
| out.CertFile = in.CertFile | ||
| out.KeyFile = in.KeyFile | ||
| out.DataDir = in.DataDir | ||
| out.ExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.ExtraArgs)) | ||
| out.Image = in.Image | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_kubeadm_Etcd_To_v1alpha1_Etcd is an autogenerated conversion function. | ||
| func Convert_kubeadm_Etcd_To_v1alpha1_Etcd(in *kubeadm.Etcd, out *Etcd, s conversion.Scope) error { | ||
| return autoConvert_kubeadm_Etcd_To_v1alpha1_Etcd(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_v1alpha1_MasterConfiguration_To_kubeadm_MasterConfiguration(in *MasterConfiguration, out *kubeadm.MasterConfiguration, s conversion.Scope) error { | ||
| if err := Convert_v1alpha1_API_To_kubeadm_API(&in.API, &out.API, s); err != nil { | ||
| return err | ||
| } | ||
| if err := Convert_v1alpha1_Etcd_To_kubeadm_Etcd(&in.Etcd, &out.Etcd, s); err != nil { | ||
| return err | ||
| } | ||
| if err := Convert_v1alpha1_Networking_To_kubeadm_Networking(&in.Networking, &out.Networking, s); err != nil { | ||
| return err | ||
| } | ||
| out.KubernetesVersion = in.KubernetesVersion | ||
| out.CloudProvider = in.CloudProvider | ||
| out.NodeName = in.NodeName | ||
| out.AuthorizationModes = *(*[]string)(unsafe.Pointer(&in.AuthorizationModes)) | ||
| out.Token = in.Token | ||
| out.TokenTTL = time.Duration(in.TokenTTL) | ||
| out.APIServerExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.APIServerExtraArgs)) | ||
| out.ControllerManagerExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.ControllerManagerExtraArgs)) | ||
| out.SchedulerExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.SchedulerExtraArgs)) | ||
| out.APIServerCertSANs = *(*[]string)(unsafe.Pointer(&in.APIServerCertSANs)) | ||
| out.CertificatesDir = in.CertificatesDir | ||
| out.ImageRepository = in.ImageRepository | ||
| out.UnifiedControlPlaneImage = in.UnifiedControlPlaneImage | ||
| out.FeatureFlags = *(*map[string]bool)(unsafe.Pointer(&in.FeatureFlags)) | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_v1alpha1_MasterConfiguration_To_kubeadm_MasterConfiguration is an autogenerated conversion function. | ||
| func Convert_v1alpha1_MasterConfiguration_To_kubeadm_MasterConfiguration(in *MasterConfiguration, out *kubeadm.MasterConfiguration, s conversion.Scope) error { | ||
| return autoConvert_v1alpha1_MasterConfiguration_To_kubeadm_MasterConfiguration(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_kubeadm_MasterConfiguration_To_v1alpha1_MasterConfiguration(in *kubeadm.MasterConfiguration, out *MasterConfiguration, s conversion.Scope) error { | ||
| if err := Convert_kubeadm_API_To_v1alpha1_API(&in.API, &out.API, s); err != nil { | ||
| return err | ||
| } | ||
| if err := Convert_kubeadm_Etcd_To_v1alpha1_Etcd(&in.Etcd, &out.Etcd, s); err != nil { | ||
| return err | ||
| } | ||
| if err := Convert_kubeadm_Networking_To_v1alpha1_Networking(&in.Networking, &out.Networking, s); err != nil { | ||
| return err | ||
| } | ||
| out.KubernetesVersion = in.KubernetesVersion | ||
| out.CloudProvider = in.CloudProvider | ||
| out.NodeName = in.NodeName | ||
| if in.AuthorizationModes == nil { | ||
| out.AuthorizationModes = make([]string, 0) | ||
| } else { | ||
| out.AuthorizationModes = *(*[]string)(unsafe.Pointer(&in.AuthorizationModes)) | ||
| } | ||
| out.Token = in.Token | ||
| out.TokenTTL = time.Duration(in.TokenTTL) | ||
| out.APIServerExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.APIServerExtraArgs)) | ||
| out.ControllerManagerExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.ControllerManagerExtraArgs)) | ||
| out.SchedulerExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.SchedulerExtraArgs)) | ||
| if in.APIServerCertSANs == nil { | ||
| out.APIServerCertSANs = make([]string, 0) | ||
| } else { | ||
| out.APIServerCertSANs = *(*[]string)(unsafe.Pointer(&in.APIServerCertSANs)) | ||
| } | ||
| out.CertificatesDir = in.CertificatesDir | ||
| out.ImageRepository = in.ImageRepository | ||
| // INFO: in.CIImageRepository opted out of conversion generation | ||
| out.UnifiedControlPlaneImage = in.UnifiedControlPlaneImage | ||
| out.FeatureFlags = *(*map[string]bool)(unsafe.Pointer(&in.FeatureFlags)) | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_kubeadm_MasterConfiguration_To_v1alpha1_MasterConfiguration is an autogenerated conversion function. | ||
| func Convert_kubeadm_MasterConfiguration_To_v1alpha1_MasterConfiguration(in *kubeadm.MasterConfiguration, out *MasterConfiguration, s conversion.Scope) error { | ||
| return autoConvert_kubeadm_MasterConfiguration_To_v1alpha1_MasterConfiguration(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_v1alpha1_Networking_To_kubeadm_Networking(in *Networking, out *kubeadm.Networking, s conversion.Scope) error { | ||
| out.ServiceSubnet = in.ServiceSubnet | ||
| out.PodSubnet = in.PodSubnet | ||
| out.DNSDomain = in.DNSDomain | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_v1alpha1_Networking_To_kubeadm_Networking is an autogenerated conversion function. | ||
| func Convert_v1alpha1_Networking_To_kubeadm_Networking(in *Networking, out *kubeadm.Networking, s conversion.Scope) error { | ||
| return autoConvert_v1alpha1_Networking_To_kubeadm_Networking(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_kubeadm_Networking_To_v1alpha1_Networking(in *kubeadm.Networking, out *Networking, s conversion.Scope) error { | ||
| out.ServiceSubnet = in.ServiceSubnet | ||
| out.PodSubnet = in.PodSubnet | ||
| out.DNSDomain = in.DNSDomain | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_kubeadm_Networking_To_v1alpha1_Networking is an autogenerated conversion function. | ||
| func Convert_kubeadm_Networking_To_v1alpha1_Networking(in *kubeadm.Networking, out *Networking, s conversion.Scope) error { | ||
| return autoConvert_kubeadm_Networking_To_v1alpha1_Networking(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_v1alpha1_NodeConfiguration_To_kubeadm_NodeConfiguration(in *NodeConfiguration, out *kubeadm.NodeConfiguration, s conversion.Scope) error { | ||
| out.CACertPath = in.CACertPath | ||
| out.DiscoveryFile = in.DiscoveryFile | ||
| out.DiscoveryToken = in.DiscoveryToken | ||
| out.DiscoveryTokenAPIServers = *(*[]string)(unsafe.Pointer(&in.DiscoveryTokenAPIServers)) | ||
| out.NodeName = in.NodeName | ||
| out.TLSBootstrapToken = in.TLSBootstrapToken | ||
| out.Token = in.Token | ||
| out.DiscoveryTokenCACertHashes = *(*[]string)(unsafe.Pointer(&in.DiscoveryTokenCACertHashes)) | ||
| out.DiscoveryTokenUnsafeSkipCAVerification = in.DiscoveryTokenUnsafeSkipCAVerification | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_v1alpha1_NodeConfiguration_To_kubeadm_NodeConfiguration is an autogenerated conversion function. | ||
| func Convert_v1alpha1_NodeConfiguration_To_kubeadm_NodeConfiguration(in *NodeConfiguration, out *kubeadm.NodeConfiguration, s conversion.Scope) error { | ||
| return autoConvert_v1alpha1_NodeConfiguration_To_kubeadm_NodeConfiguration(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_kubeadm_NodeConfiguration_To_v1alpha1_NodeConfiguration(in *kubeadm.NodeConfiguration, out *NodeConfiguration, s conversion.Scope) error { | ||
| out.CACertPath = in.CACertPath | ||
| out.DiscoveryFile = in.DiscoveryFile | ||
| out.DiscoveryToken = in.DiscoveryToken | ||
| if in.DiscoveryTokenAPIServers == nil { | ||
| out.DiscoveryTokenAPIServers = make([]string, 0) | ||
| } else { | ||
| out.DiscoveryTokenAPIServers = *(*[]string)(unsafe.Pointer(&in.DiscoveryTokenAPIServers)) | ||
| } | ||
| out.NodeName = in.NodeName | ||
| out.TLSBootstrapToken = in.TLSBootstrapToken | ||
| out.Token = in.Token | ||
| if in.DiscoveryTokenCACertHashes == nil { | ||
| out.DiscoveryTokenCACertHashes = make([]string, 0) | ||
| } else { | ||
| out.DiscoveryTokenCACertHashes = *(*[]string)(unsafe.Pointer(&in.DiscoveryTokenCACertHashes)) | ||
| } | ||
| out.DiscoveryTokenUnsafeSkipCAVerification = in.DiscoveryTokenUnsafeSkipCAVerification | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_kubeadm_NodeConfiguration_To_v1alpha1_NodeConfiguration is an autogenerated conversion function. | ||
| func Convert_kubeadm_NodeConfiguration_To_v1alpha1_NodeConfiguration(in *kubeadm.NodeConfiguration, out *NodeConfiguration, s conversion.Scope) error { | ||
| return autoConvert_kubeadm_NodeConfiguration_To_v1alpha1_NodeConfiguration(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_v1alpha1_TokenDiscovery_To_kubeadm_TokenDiscovery(in *TokenDiscovery, out *kubeadm.TokenDiscovery, s conversion.Scope) error { | ||
| out.ID = in.ID | ||
| out.Secret = in.Secret | ||
| out.Addresses = *(*[]string)(unsafe.Pointer(&in.Addresses)) | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_v1alpha1_TokenDiscovery_To_kubeadm_TokenDiscovery is an autogenerated conversion function. | ||
| func Convert_v1alpha1_TokenDiscovery_To_kubeadm_TokenDiscovery(in *TokenDiscovery, out *kubeadm.TokenDiscovery, s conversion.Scope) error { | ||
| return autoConvert_v1alpha1_TokenDiscovery_To_kubeadm_TokenDiscovery(in, out, s) | ||
| } | ||
|
|
||
| func autoConvert_kubeadm_TokenDiscovery_To_v1alpha1_TokenDiscovery(in *kubeadm.TokenDiscovery, out *TokenDiscovery, s conversion.Scope) error { | ||
| out.ID = in.ID | ||
| out.Secret = in.Secret | ||
| if in.Addresses == nil { | ||
| out.Addresses = make([]string, 0) | ||
| } else { | ||
| out.Addresses = *(*[]string)(unsafe.Pointer(&in.Addresses)) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_kubeadm_TokenDiscovery_To_v1alpha1_TokenDiscovery is an autogenerated conversion function. | ||
| func Convert_kubeadm_TokenDiscovery_To_v1alpha1_TokenDiscovery(in *kubeadm.TokenDiscovery, out *TokenDiscovery, s conversion.Scope) error { | ||
| return autoConvert_kubeadm_TokenDiscovery_To_v1alpha1_TokenDiscovery(in, out, s) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.