Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 5 commits into from Jul 8, 2021
+38 −30
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60296ea
kubectl: update set command description to include cronjob resource
nobuhikosawai Jun 1, 2021
bae5f82
kubectl: update set command description to include statefulset resource
nobuhikosawai Jun 12, 2021
452f16b
kubectl: update set env description to remove job from resources that…
nobuhikosawai Jun 12, 2021
0638f9d
kubectl set tests: add cronjob resource and remove job resource
nobuhikosawai Jun 12, 2021
76c3fba
go fmt
nobuhikosawai Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ import (
var (
validEnvNameRegexp = regexp.MustCompile("[^a-zA-Z0-9_]")
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(`
Update environment variables on a pod template.
Expand Down
26 changes: 15 additions & 11 deletions staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go
View file
Open in desktop
Expand Up @@ -435,25 +435,29 @@ func TestSetEnvRemote(t *testing.T) {
args: []string{"statefulset", "nginx", "env=prod"},
},
{
name: "test batchv1 Job",
object: &batchv1.Job{
name: "set image batchv1 CronJob",
object: &batchv1.CronJob{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: batchv1.JobSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "nginx",
Image: "nginx",
Spec: batchv1.CronJobSpec{
JobTemplate: batchv1.JobTemplateSpec{
Spec: batchv1.JobSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "nginx",
Image: "nginx",
},
},
},
},
},
},
},
},
groupVersion: batchv1.SchemeGroupVersion,
path: "/namespaces/test/jobs/nginx",
args: []string{"job", "nginx", "env=prod"},
path: "/namespaces/test/cronjobs/nginx",
args: []string{"cronjob", "nginx", "env=prod"},
},
{
name: "test corev1 replication controller",
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kubectl/pkg/cmd/set/set_image.go
View file
Open in desktop
Expand Up @@ -66,7 +66,7 @@ type SetImageOptions struct {

var (
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(`
Update existing container image(s) of resources.
Expand Down
38 changes: 21 additions & 17 deletions staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go
View file
Open in desktop
Expand Up @@ -559,31 +559,35 @@ func TestSetImageRemote(t *testing.T) {
args: []string{"statefulset", "nginx", "*=thingy"},
},
{
name: "set image batchv1 Job",
object: &batchv1.Job{
name: "set image batchv1 CronJob",
object: &batchv1.CronJob{
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
Spec: batchv1.JobSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "nginx",
Image: "nginx",
},
},
InitContainers: []corev1.Container{
{
Name: "busybox",
Image: "busybox",
Spec: batchv1.CronJobSpec{
JobTemplate: batchv1.JobTemplateSpec{
Spec: batchv1.JobSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "nginx",
Image: "nginx",
},
},
InitContainers: []corev1.Container{
{
Name: "busybox",
Image: "busybox",
},
},
},
},
},
},
},
},
groupVersion: batchv1.SchemeGroupVersion,
path: "/namespaces/test/jobs/nginx",
args: []string{"job", "nginx", "*=thingy"},
path: "/namespaces/test/cronjobs/nginx",
args: []string{"cronjob", "nginx", "*=thingy"},
},
{
name: "set image corev1.ReplicationController",
Expand Down