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

Merge pull request #90367 from julianvmodesto/conformance-diff-dry-run

Browse Source 
Promote diff and dry-run to conformance
This commit is contained in:
Kubernetes Prow Robot 2020-05-20 16:44:19 -07:00 committed by GitHub
commit 62a4cb930b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/conformance/testdata/conformance.yaml vendored
View File

@ -1359,6 +1359,14 @@
proper information.
release: v1.9
file: test/e2e/kubectl/kubectl.go
- testname: Kubectl, diff Deployment
codename: '[sig-cli] Kubectl client Kubectl diff should check if kubectl diff finds
a difference for Deployments [Conformance]'
description: Create a Deployment with httpd image. Declare the same Deployment with
a different image, busybox. Diff of live Deployment with declared Deployment MUST
include the difference between live and declared image.
release: v1.19
file: test/e2e/kubectl/kubectl.go
- testname: Kubectl, create service, replication controller
codename: '[sig-cli] Kubectl client Kubectl expose should create services for rc [Conformance]'
description: Create a Pod running agnhost listening to port 6379. Using kubectl
@ -1416,6 +1424,15 @@
with one container running the specified image.
release: v1.9
file: test/e2e/kubectl/kubectl.go
- testname: Kubectl, server-side dry-run Pod
codename: '[sig-cli] Kubectl client Kubectl server-side dry-run should check if
kubectl can dry-run update Pods [Conformance]'
description: The command 'kubectl run' must create a pod with the specified image
name. After, the command 'kubectl replace --dry-run=server' should update the
Pod with the new image name and server-side dry-run enabled. The image name must
not change.
release: v1.19
file: test/e2e/kubectl/kubectl.go
- testname: Kubectl, version
codename: '[sig-cli] Kubectl client Kubectl version should check is all data is
printed [Conformance]'

8
test/e2e/kubectl/kubectl.go
View File

@ -865,11 +865,11 @@ metadata:
ginkgo.Describe("Kubectl diff", func() {
/*
Release : v1.18
Release : v1.19
Testname: Kubectl, diff Deployment
Description: Create a Deployment with httpd image. Declare the same Deployment with a different image, busybox. Diff of live Deployment with declared Deployment MUST include the difference between live and declared image.
*/
ginkgo.It("should find diff in Deployment", func() {
framework.ConformanceIt("should check if kubectl diff finds a difference for Deployments", func() {
ginkgo.By("create deployment with httpd image")
deployment := commonutils.SubstituteImageName(string(readTestFileOrDie(httpdDeployment3Filename)))
framework.RunKubectlOrDieInput(ns, deployment, "create", "-f", "-")
@ -896,11 +896,11 @@ metadata:
ginkgo.Describe("Kubectl server-side dry-run", func() {
/*
Release : v1.18
Release : v1.19
Testname: Kubectl, server-side dry-run Pod
Description: The command 'kubectl run' must create a pod with the specified image name. After, the command 'kubectl replace --dry-run=server' should update the Pod with the new image name and server-side dry-run enabled. The image name must not change.
*/
ginkgo.It("should dry-run update the Pod", func() {
framework.ConformanceIt("should check if kubectl can dry-run update Pods", func() {
ginkgo.By("running the image " + httpdImage)
podName := "e2e-test-httpd-pod"
nsFlag := fmt.Sprintf("--namespace=%v", ns)