Skip to content

Commit e45d74d

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#67780 from luxas/move_kubelet_config_pkg
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Move kubelet internal ComponentConfig types to `pkg/kubelet/apis/config` **What this PR does / why we need it**: This PR is split out from the main PR of kubernetes#67263, in order to make merging each scoped piece of the puzzle easier and smoother. This PR simply moves the `k8s.io/kubernetes/pkg/apis/kubeletconfig` as-is to `k8s.io/kubernetes/pkg/apis/config` as agreed in the KEP. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref: kubernetes/community#2354 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` @kubernetes/sig-node-pr-reviews /assign @mtaufen @thockin @liggitt
2 parents 55859a6 + 844487a commit e45d74d

File tree

106 files changed

+731
-731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+731
-731
lines changed

api/api-rules/violation_exceptions.list

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ API rule violation: names_match,k8s.io/kubernetes/pkg/apis/componentconfig/v1alp
167167
API rule violation: names_match,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,VolumeConfiguration,EnableDynamicProvisioning
168168
API rule violation: names_match,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,VolumeConfiguration,PersistentVolumeRecyclerConfiguration
169169
API rule violation: names_match,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,VolumeConfiguration,FlexVolumePluginDir
170-
API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1,KubeletConfiguration,ResolverConfig
171-
API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1,KubeletConfiguration,IPTablesMasqueradeBit
172-
API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1,KubeletConfiguration,IPTablesDropBit
170+
API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1,KubeletConfiguration,ResolverConfig
171+
API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1,KubeletConfiguration,IPTablesMasqueradeBit
172+
API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1,KubeletConfiguration,IPTablesDropBit
173173
API rule violation: names_match,k8s.io/metrics/pkg/apis/custom_metrics/v1beta1,MetricValue,WindowSeconds
174174
API rule violation: names_match,k8s.io/metrics/pkg/apis/external_metrics/v1beta1,ExternalMetricValue,WindowSeconds

cmd/kubeadm/app/apis/kubeadm/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ go_library(
1818
],
1919
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm",
2020
deps = [
21-
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
21+
"//pkg/kubelet/apis/config:go_default_library",
2222
"//pkg/proxy/apis/config:go_default_library",
2323
"//staging/src/k8s.io/api/core/v1:go_default_library",
2424
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ go_library(
1313
deps = [
1414
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
1515
"//cmd/kubeadm/app/componentconfigs:go_default_library",
16-
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
17-
"//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library",
16+
"//pkg/kubelet/apis/config:go_default_library",
17+
"//pkg/kubelet/apis/config/v1beta1:go_default_library",
1818
"//pkg/proxy/apis/config:go_default_library",
1919
"//staging/src/k8s.io/api/core/v1:go_default_library",
2020
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1"
2828
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
2929
"k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs"
30-
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
31-
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
30+
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
31+
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
3232
kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"
3333
utilpointer "k8s.io/utils/pointer"
3434
)

cmd/kubeadm/app/apis/kubeadm/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"k8s.io/api/core/v1"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24-
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
24+
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
2525
kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"
2626
)
2727

cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ go_library(
2121
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
2222
"//cmd/kubeadm/app/componentconfigs:go_default_library",
2323
"//cmd/kubeadm/app/constants:go_default_library",
24-
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
25-
"//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library",
26-
"//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library",
24+
"//pkg/kubelet/apis/config:go_default_library",
25+
"//pkg/kubelet/apis/config/scheme:go_default_library",
26+
"//pkg/kubelet/apis/config/v1beta1:go_default_library",
2727
"//pkg/proxy/apis/config:go_default_library",
2828
"//pkg/proxy/apis/config/scheme:go_default_library",
2929
"//pkg/proxy/apis/config/v1alpha1:go_default_library",

cmd/kubeadm/app/apis/kubeadm/v1alpha2/conversion.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1"
2424
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
2525
"k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs"
26-
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
27-
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
26+
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
27+
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
2828
kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"
2929
)
3030

cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"k8s.io/apimachinery/pkg/runtime"
2525
kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1"
2626
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
27-
kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme"
28-
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
27+
kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme"
28+
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
2929
kubeproxyscheme "k8s.io/kubernetes/pkg/proxy/apis/config/scheme"
3030
utilpointer "k8s.io/utils/pointer"
3131
)

cmd/kubeadm/app/apis/kubeadm/v1alpha2/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1"
23-
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
23+
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
2424
)
2525

2626
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)