github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #102528 from soltysh/cronjob_ga

Browse Source 
Clean apply's prune and kube addons with batch/v1 CronJob
This commit is contained in:
Kubernetes Prow Robot
2021-06-02 08:02:31 -07:00
committed by GitHub
parent 63c75f3766 1619e8eb95
commit b2b4cb1725
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/addon-manager/kube-addons.sh
View File

@@ -46,7 +46,7 @@ if [ -z "${KUBECTL_PRUNE_WHITELIST_OVERRIDE:-}" ]; then
core/v1/Secret core/v1/Secret
core/v1/Service core/v1/Service
batch/v1/Job batch/v1/Job
batch/v1beta1/CronJob batch/v1/CronJob
apps/v1/DaemonSet apps/v1/DaemonSet
apps/v1/Deployment apps/v1/Deployment
apps/v1/ReplicaSet apps/v1/ReplicaSet

2
staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go
View File

@@ -184,7 +184,7 @@ func getRESTMappings(mapper meta.RESTMapper, pruneResources *[]pruneResource) (n
{"", "v1", "Secret", true}, {"", "v1", "Secret", true},
{"", "v1", "Service", true}, {"", "v1", "Service", true},
{"batch", "v1", "Job", true}, {"batch", "v1", "Job", true},
{"batch", "v1beta1", "CronJob", true}, {"batch", "v1", "CronJob", true},
{"networking.k8s.io", "v1", "Ingress", true}, {"networking.k8s.io", "v1", "Ingress", true},
{"apps", "v1", "DaemonSet", true}, {"apps", "v1", "DaemonSet", true},
{"apps", "v1", "Deployment", true}, {"apps", "v1", "Deployment", true},