Skip to content

Commit

Permalink
fix some unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
sbueringer committed Jun 28, 2024
1 parent b2308d0 commit e03d9f1
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 10 deletions.
37 changes: 37 additions & 0 deletions bootstrap/kubeadm/types/upstreamv1beta1/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ limitations under the License.
package upstreamv1beta1

import (
"unsafe"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
"sigs.k8s.io/controller-runtime/pkg/conversion"

Expand Down Expand Up @@ -75,6 +78,23 @@ func Convert_upstreamv1beta1_DNS_To_v1beta1_DNS(in *DNS, out *bootstrapv1.DNS, s
return autoConvert_upstreamv1beta1_DNS_To_v1beta1_DNS(in, out, s)
}

func Convert_upstreamv1beta1_Discovery_To_v1beta1_Discovery(in *Discovery, out *bootstrapv1.Discovery, s apimachineryconversion.Scope) error {
out.BootstrapToken = (*bootstrapv1.BootstrapTokenDiscovery)(unsafe.Pointer(in.BootstrapToken)) //nolint:gosec
out.File = (*bootstrapv1.FileDiscovery)(unsafe.Pointer(in.File)) //nolint:gosec
if in.File != nil {
in, out := &in.File, &out.File
*out = new(bootstrapv1.FileDiscovery)
if err := Convert_upstreamv1beta1_FileDiscovery_To_v1beta1_FileDiscovery(*in, *out, s); err != nil {
return err
}
} else {
out.File = nil
}
out.TLSBootstrapToken = in.TLSBootstrapToken
out.Timeout = (*metav1.Duration)(unsafe.Pointer(in.Timeout)) //nolint:gosec
return nil
}

// Custom conversion from the hub version, CABPK v1beta1, to this API, kubeadm v1beta1.

func Convert_v1beta1_InitConfiguration_To_upstreamv1beta1_InitConfiguration(in *bootstrapv1.InitConfiguration, out *InitConfiguration, s apimachineryconversion.Scope) error {
Expand All @@ -91,3 +111,20 @@ func Convert_v1beta1_NodeRegistrationOptions_To_upstreamv1beta1_NodeRegistration
// NodeRegistrationOptions.IgnorePreflightErrors and ImagePullPolicy does not exist in kubeadm v1beta1, dropping those info.
return autoConvert_v1beta1_NodeRegistrationOptions_To_upstreamv1beta1_NodeRegistrationOptions(in, out, s)
}

func Convert_v1beta1_Discovery_To_upstreamv1beta1_Discovery(in *bootstrapv1.Discovery, out *Discovery, s apimachineryconversion.Scope) error {
out.BootstrapToken = (*BootstrapTokenDiscovery)(unsafe.Pointer(in.BootstrapToken)) //nolint:gosec
out.File = (*FileDiscovery)(unsafe.Pointer(in.File)) //nolint:gosec
if in.File != nil {
in, out := &in.File, &out.File
*out = new(FileDiscovery)
if err := Convert_v1beta1_FileDiscovery_To_upstreamv1beta1_FileDiscovery(*in, *out, s); err != nil {
return err
}
} else {
out.File = nil
}
out.TLSBootstrapToken = in.TLSBootstrapToken
out.Timeout = (*metav1.Duration)(unsafe.Pointer(in.Timeout)) //nolint:gosec
return nil
}
10 changes: 0 additions & 10 deletions bootstrap/kubeadm/types/upstreamv1beta1/zz_generated.conversion.go

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

0 comments on commit e03d9f1

Please sign in to comment.