github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

kubectl: update set command description to include cronjob resource (#102503)

Browse Source 
* kubectl: update set command description to include cronjob resource

* kubectl: update set command description to include statefulset resource

* kubectl: update set env description to remove job from resources that can update container env

* kubectl set tests: add cronjob resource and remove job resource

* go fmt
This commit is contained in:
nobuhikosawai 2021-07-09 00:50:54 +09:00 committed by GitHub
parent e1f971d5c2
commit 41c5bca349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go
View File

@ -45,7 +45,7 @@ import (
var ( var (
validEnvNameRegexp = regexp.MustCompile("[^a-zA-Z0-9_]") validEnvNameRegexp = regexp.MustCompile("[^a-zA-Z0-9_]")
envResources = ` envResources = `
pod (po), replicationcontroller (rc), deployment (deploy), daemonset (ds), job, replicaset (rs)` pod (po), replicationcontroller (rc), deployment (deploy), daemonset (ds), statefulset (sts), cronjob (cj), replicaset (rs)`
envLong = templates.LongDesc(i18n.T(` envLong = templates.LongDesc(i18n.T(`
Update environment variables on a pod template. Update environment variables on a pod template.

26
staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go
View File

@ -435,16 +435,20 @@ func TestSetEnvRemote(t *testing.T) {
args: []string{"statefulset", "nginx", "env=prod"}, args: []string{"statefulset", "nginx", "env=prod"},
}, },
{ {
name: "test batchv1 Job", name: "set image batchv1 CronJob",
object: &batchv1.Job{ object: &batchv1.CronJob{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: batchv1.JobSpec{ Spec: batchv1.CronJobSpec{
Template: corev1.PodTemplateSpec{ JobTemplate: batchv1.JobTemplateSpec{
Spec: corev1.PodSpec{ Spec: batchv1.JobSpec{
Containers: []corev1.Container{ Template: corev1.PodTemplateSpec{
{ Spec: corev1.PodSpec{
Name: "nginx", Containers: []corev1.Container{
Image: "nginx", {
Name: "nginx",
Image: "nginx",
},
},
}, },
}, },
}, },
@ -452,8 +456,8 @@ func TestSetEnvRemote(t *testing.T) {
}, },
}, },
groupVersion: batchv1.SchemeGroupVersion, groupVersion: batchv1.SchemeGroupVersion,
path: "/namespaces/test/jobs/nginx", path: "/namespaces/test/cronjobs/nginx",
args: []string{"job", "nginx", "env=prod"}, args: []string{"cronjob", "nginx", "env=prod"},
}, },
{ {
name: "test corev1 replication controller", name: "test corev1 replication controller",

2
staging/src/k8s.io/kubectl/pkg/cmd/set/set_image.go
View File

@ -66,7 +66,7 @@ type SetImageOptions struct {
var ( var (
imageResources = i18n.T(` imageResources = i18n.T(`
pod (po), replicationcontroller (rc), deployment (deploy), daemonset (ds), replicaset (rs)`) pod (po), replicationcontroller (rc), deployment (deploy), daemonset (ds), statefulset (sts), cronjob (cj), replicaset (rs)`)
imageLong = templates.LongDesc(i18n.T(` imageLong = templates.LongDesc(i18n.T(`
Update existing container image(s) of resources. Update existing container image(s) of resources.

38
staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go
View File

@ -559,22 +559,26 @@ func TestSetImageRemote(t *testing.T) {
args: []string{"statefulset", "nginx", "*=thingy"}, args: []string{"statefulset", "nginx", "*=thingy"},
}, },
{ {
name: "set image batchv1 Job", name: "set image batchv1 CronJob",
object: &batchv1.Job{ object: &batchv1.CronJob{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"}, ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: batchv1.JobSpec{ Spec: batchv1.CronJobSpec{
Template: corev1.PodTemplateSpec{ JobTemplate: batchv1.JobTemplateSpec{
Spec: corev1.PodSpec{ Spec: batchv1.JobSpec{
Containers: []corev1.Container{ Template: corev1.PodTemplateSpec{
{ Spec: corev1.PodSpec{
Name: "nginx", Containers: []corev1.Container{
Image: "nginx", {
}, Name: "nginx",
}, Image: "nginx",
InitContainers: []corev1.Container{ },
{ },
Name: "busybox", InitContainers: []corev1.Container{
Image: "busybox", {
Name: "busybox",
Image: "busybox",
},
},
}, },
}, },
}, },
@ -582,8 +586,8 @@ func TestSetImageRemote(t *testing.T) {
}, },
}, },
groupVersion: batchv1.SchemeGroupVersion, groupVersion: batchv1.SchemeGroupVersion,
path: "/namespaces/test/jobs/nginx", path: "/namespaces/test/cronjobs/nginx",
args: []string{"job", "nginx", "*=thingy"}, args: []string{"cronjob", "nginx", "*=thingy"},
}, },
{ {
name: "set image corev1.ReplicationController", name: "set image corev1.ReplicationController",