github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90385 from neolit123/1.19-remove-kubeadm-from-pkg-api-testing

Browse Source 
pkg/api/testing: remove kubeadm references
This commit is contained in:
Kubernetes Prow Robot
2020-04-23 19:20:21 -07:00
committed by GitHub
parent a62cfe8451 cbe2add519
commit 0c0984abdb
2 changed files with 49 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/testing/.import-restrictions
View File

@@ -1,12 +0,0 @@
{
"Rules": [
{
"SelectorRegexp": "k8s[.]io/kubernetes/cmd",
"AllowedPrefixes": [
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
],
"ForbiddenPrefixes": [
]
}
]
}

4
pkg/api/testing/defaulting_test.go
View File

@@ -95,10 +95,6 @@ func TestDefaulting(t *testing.T) {
{Group: "discovery.k8s.io", Version: "v1alpha1", Kind: "EndpointSliceList"}: {},
{Group: "discovery.k8s.io", Version: "v1beta1", Kind: "EndpointSlice"}: {},
{Group: "discovery.k8s.io", Version: "v1beta1", Kind: "EndpointSliceList"}: {},
{Group: "kubeadm.k8s.io", Version: "v1alpha1", Kind: "MasterConfiguration"}: {},
// This object contains only int fields which currently breaks the defaulting test because
// it's pretty stupid. Once we add non integer fields, we should uncomment this.
// {Group: "kubeadm.k8s.io", Version: "v1alpha1", Kind: "NodeConfiguration"}: {},
{Group: "extensions", Version: "v1beta1", Kind: "DaemonSet"}: {},
{Group: "extensions", Version: "v1beta1", Kind: "DaemonSetList"}: {},
{Group: "apps", Version: "v1beta2", Kind: "DaemonSet"}: {},