Skip to content

Commit

Permalink
fix: Run "go mod vendor" and "go mod tidy"
Browse files Browse the repository at this point in the history
Updated the vendor files.
Increased time functional tests wait for VM start.

Signed-off-by: Andrej Krejcir <[email protected]>
  • Loading branch information
akrejcir committed Feb 22, 2023
1 parent 0304c6e commit 35aba1c
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 131 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ require (
k8s.io/utils v0.0.0-20211116205334-6203023598ed
kubevirt.io/api v0.58.0
kubevirt.io/client-go v0.58.0
sigs.k8s.io/yaml v1.3.0
)

require (
Expand Down Expand Up @@ -66,7 +67,6 @@ require (
kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace k8s.io/client-go => k8s.io/client-go v0.23.5
2 changes: 1 addition & 1 deletion tests/proxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ var _ = Describe("Token", func() {
vmi, err := ApiClient.VirtualMachineInstance(vm.Namespace).Get(vm.Name, &metav1.GetOptions{})
g.Expect(err).ToNot(HaveOccurred())
g.Expect(vmi.Status.Phase).To(Equal(kubevirtcorev1.Running))
}, time.Minute, time.Second).Should(Succeed())
}, 10*time.Minute, time.Second).Should(Succeed())

// Get the vnc token
tokenUrl, err := url.JoinPath(httpsUrlBase, testNamespace, vmiName, tokenEndpoint)
Expand Down
2 changes: 1 addition & 1 deletion tests/tlsconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package tests
import (
"context"
"crypto/tls"
"sigs.k8s.io/yaml"
"time"

. "github.com/onsi/ginkgo/v2"
Expand All @@ -13,6 +12,7 @@ import (
ocpconfigv1 "github.com/openshift/api/config/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/yaml"

"github.com/kubevirt/vm-console-proxy/pkg/console"
)
Expand Down
127 changes: 0 additions & 127 deletions vendor/k8s.io/apimachinery/pkg/util/rand/rand.go

This file was deleted.

1 change: 0 additions & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ k8s.io/apimachinery/pkg/util/managedfields
k8s.io/apimachinery/pkg/util/mergepatch
k8s.io/apimachinery/pkg/util/naming
k8s.io/apimachinery/pkg/util/net
k8s.io/apimachinery/pkg/util/rand
k8s.io/apimachinery/pkg/util/runtime
k8s.io/apimachinery/pkg/util/sets
k8s.io/apimachinery/pkg/util/strategicpatch
Expand Down

0 comments on commit 35aba1c

Please sign in to comment.