Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

test: don’t timeout k8s resource deletes in E2E #2063

Merged
merged 2 commits into from Oct 1, 2019
Merged

test: don’t timeout k8s resource deletes in E2E #2063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b635cb
test: don’t timeout k8s resource deletes in E2E
jackfrancis Sep 30, 2019
232d193
fix: broken reference
jackfrancis Sep 30, 2019
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
6 changes: 3 additions & 3 deletions test/e2e/kubernetes/deployment/deployment.go
View file
Open in desktop
Expand Up @@ -299,12 +299,12 @@ func (d *Deployment) Describe() error {

// Delete will delete a deployment in a given namespace
func (d *Deployment) Delete(retries int) error {
var commandTimeout time.Duration
var zeroValueDuration time.Duration
var kubectlOutput []byte
var kubectlError error
for i := 0; i < retries; i++ {
cmd := exec.Command("k", "delete", "deploy", "-n", d.Metadata.Namespace, d.Metadata.Name)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, commandTimeout)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, zeroValueDuration)
if kubectlError != nil {
log.Printf("Error while trying to delete deployment %s in namespace %s:%s\n", d.Metadata.Namespace, d.Metadata.Name, string(kubectlOutput))
continue
Expand All @@ -319,7 +319,7 @@ func (d *Deployment) Delete(retries int) error {
if d.Metadata.HasHPA {
for i := 0; i < retries; i++ {
cmd := exec.Command("k", "delete", "hpa", "-n", d.Metadata.Namespace, d.Metadata.Name)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, commandTimeout)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, zeroValueDuration)
if kubectlError != nil {
log.Printf("Deployment %s has associated HPA but unable to delete in namespace %s:%s\n", d.Metadata.Namespace, d.Metadata.Name, string(kubectlOutput))
continue
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/kubernetes/hpa/hpa.go
View file
Open in desktop
Expand Up @@ -139,12 +139,12 @@ func (h *HPA) Describe() error {

// Delete will delete a HPA in a given namespace
func (h *HPA) Delete(retries int) error {
var commandTimeout time.Duration
var zeroValueDuration time.Duration
var kubectlOutput []byte
var kubectlError error
for i := 0; i < retries; i++ {
cmd := exec.Command("k", "delete", "hpa", "-n", h.Metadata.Namespace, h.Metadata.Name)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, commandTimeout)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, zeroValueDuration)
if kubectlError != nil {
log.Printf("Error while trying to delete service %s in namespace %s:%s\n", h.Metadata.Namespace, h.Metadata.Name, string(kubectlOutput))
continue
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/kubernetes/persistentvolumeclaims/persistentvolumeclaims.go
View file
Open in desktop
Expand Up @@ -186,12 +186,12 @@ func (pvc *PersistentVolumeClaim) Describe() error {

// Delete will delete a PersistentVolumeClaim in a given namespace
func (pvc *PersistentVolumeClaim) Delete(retries int) error {
var commandTimeout time.Duration
var zeroValueDuration time.Duration
var kubectlOutput []byte
var kubectlError error
for i := 0; i < retries; i++ {
cmd := exec.Command("k", "delete", "pvc", "-n", pvc.Metadata.Namespace, pvc.Metadata.Name)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, commandTimeout)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, zeroValueDuration)
if kubectlError != nil {
log.Printf("Error while trying to delete PVC %s in namespace %s:%s\n", pvc.Metadata.Name, pvc.Metadata.Namespace, string(kubectlOutput))
continue
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/kubernetes/pod/pod.go
View file
Open in desktop
Expand Up @@ -25,7 +25,6 @@ import (

const (
testDir string = "testdirectory"
deleteTimeout = 5 * time.Minute
validatePodNotExistRetries = 3
)

Expand Down Expand Up @@ -794,11 +793,12 @@ func (p *Pod) Exec(c ...string) ([]byte, error) {

// Delete will delete a Pod in a given namespace
func (p *Pod) Delete(retries int) error {
var zeroValueDuration time.Duration
var kubectlOutput []byte
var kubectlError error
for i := 0; i < retries; i++ {
cmd := exec.Command("k", "delete", "po", "-n", p.Metadata.Namespace, p.Metadata.Name)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, deleteTimeout)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, zeroValueDuration)
if kubectlError != nil {
log.Printf("Error while trying to delete Pod %s in namespace %s:%s\n", p.Metadata.Namespace, p.Metadata.Name, string(kubectlOutput))
continue
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/kubernetes/service/service.go
View file
Open in desktop
Expand Up @@ -151,12 +151,12 @@ func GetAllByPrefix(prefix, namespace string) ([]Service, error) {

// Delete will delete a service in a given namespace
func (s *Service) Delete(retries int) error {
var commandTimeout time.Duration
var zeroValueDuration time.Duration
var kubectlOutput []byte
var kubectlError error
for i := 0; i < retries; i++ {
cmd := exec.Command("k", "delete", "svc", "-n", s.Metadata.Namespace, s.Metadata.Name)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, commandTimeout)
kubectlOutput, kubectlError = util.RunAndLogCommand(cmd, zeroValueDuration)
if kubectlError != nil {
log.Printf("Error while trying to delete service %s in namespace %s:%s\n", s.Metadata.Namespace, s.Metadata.Name, kubectlError)
log.Printf("%s\n", string(kubectlOutput))
Expand Down