Skip to content

Commit

Permalink
chore: bump k8s deps to v1.29.4 in test/e2e
Browse files Browse the repository at this point in the history 
Signed-off-by: Anish Ramasekar <[email protected]>
  • Loading branch information
@aramase
aramase committed May 2, 2024
1 parent 147c575 commit 4a2a7a5
Show file tree
Hide file tree
Showing 7 changed files with 389 additions and 688 deletions.
29 changes: 15 additions & 14 deletions test/e2e/e2e.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var (
}
)

var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
var _ = ginkgo.SynchronizedBeforeSuite(func(ctx context.Context) []byte {
var err error
c, err = framework.LoadClientset()
if err != nil {
Expand All @@ -43,7 +43,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
// Delete any namespaces except those created by the system. This ensures no
// lingering resources are left over from a previous test run.
if framework.TestContext.CleanStart {
deleted, err := framework.DeleteNamespaces(c, nil, /* deleteFilter */
deleted, err := framework.DeleteNamespaces(ctx, c, nil, /* deleteFilter */
[]string{
metav1.NamespaceSystem,
metav1.NamespaceDefault,
Expand All @@ -54,20 +54,21 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
framework.Failf("error deleting orphaned namespaces: %v", err)
}

if err := framework.WaitForNamespacesDeleted(c, deleted, 5*time.Minute); err != nil {
if err := framework.WaitForNamespacesDeleted(ctx, c, deleted, 5*time.Minute); err != nil {
framework.Failf("error deleting orphaned namespaces %v: %v", deleted, err)
}
}

timeouts := framework.NewTimeoutContext()
// ensure all nodes are schedulable
framework.ExpectNoError(e2enode.WaitForAllNodesSchedulable(c, framework.TestContext.NodeSchedulableTimeout))
framework.ExpectNoError(e2enode.WaitForAllNodesSchedulable(ctx, c, timeouts.NodeSchedulable))

// Ensure all pods are running and ready before starting tests
podStartupTimeout := framework.TestContext.SystemPodsStartupTimeout
podStartupTimeout := timeouts.SystemPodsStartup
for _, namespace := range coreNamespaces {
if err := e2epod.WaitForPodsRunningReady(c, namespace, int32(framework.TestContext.MinStartupPods), int32(framework.TestContext.AllowedNotReadyNodes), podStartupTimeout, map[string]string{}); err != nil {
e2edebug.DumpAllNamespaceInfo(c, namespace)
e2ekubectl.LogFailedContainers(c, namespace, framework.Logf)
if err := e2epod.WaitForPodsRunningReady(ctx, c, namespace, int32(framework.TestContext.MinStartupPods), int32(framework.TestContext.AllowedNotReadyNodes), podStartupTimeout); err != nil {
e2edebug.DumpAllNamespaceInfo(ctx, c, namespace)
e2ekubectl.LogFailedContainers(ctx, c, namespace, framework.Logf)
framework.Failf("error waiting for all pods to be running and ready: %v", err)
}
}
Expand All @@ -83,13 +84,13 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
return nil
}, func(data []byte) {})

var _ = ginkgo.SynchronizedAfterSuite(func() {
var _ = ginkgo.SynchronizedAfterSuite(func(ctx context.Context) {
framework.Logf("Running AfterSuite actions on all node")
}, func() {
collectPodLogs()
}, func(ctx context.Context) {
collectPodLogs(ctx)
})

func collectPodLogs() {
func collectPodLogs(ctx context.Context) {
var wg sync.WaitGroup
var since time.Time
if os.Getenv("SOAK_CLUSTER") == "true" {
Expand Down Expand Up @@ -126,9 +127,9 @@ func collectPodLogs() {

var log string
if since.IsZero() {
log, err = e2epod.GetPodLogs(c, namespace, pod.Name, container.Name)
log, err = e2epod.GetPodLogs(ctx, c, namespace, pod.Name, container.Name)
} else {
log, err = e2epod.GetPodLogsSince(c, namespace, pod.Name, container.Name, since)
log, err = e2epod.GetPodLogsSince(ctx, c, namespace, pod.Name, container.Name, since)
}
if err != nil {
framework.Logf("error when getting logs from pod %s/%s, container %s: %v", namespace, pod.Name, container.Name, err)
Expand Down
190 changes: 108 additions & 82 deletions test/e2e/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,122 +3,148 @@ module github.com/Azure/azure-workload-identity/test/e2e
go 1.22

replace (
k8s.io/api => k8s.io/api v0.26.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.3
k8s.io/apimachinery => k8s.io/apimachinery v0.26.3
k8s.io/apiserver => k8s.io/apiserver v0.26.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.3
k8s.io/client-go => k8s.io/client-go v0.26.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.3
k8s.io/code-generator => k8s.io/code-generator v0.26.3
k8s.io/component-base => k8s.io/component-base v0.26.3
k8s.io/component-helpers => k8s.io/component-helpers v0.26.3
k8s.io/controller-manager => k8s.io/controller-manager v0.26.3
k8s.io/cri-api => k8s.io/cri-api v0.26.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.3
k8s.io/kubectl => k8s.io/kubectl v0.26.3
k8s.io/kubelet => k8s.io/kubelet v0.26.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.3
k8s.io/metrics => k8s.io/metrics v0.26.3
k8s.io/mount-utils => k8s.io/mount-utils v0.26.3
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.3
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.3
k8s.io/sample-controller => k8s.io/sample-controller v0.26.3
k8s.io/api => k8s.io/api v0.29.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.4
k8s.io/apimachinery => k8s.io/apimachinery v0.29.4
k8s.io/apiserver => k8s.io/apiserver v0.29.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.4
k8s.io/client-go => k8s.io/client-go v0.29.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.4
k8s.io/code-generator => k8s.io/code-generator v0.29.4
k8s.io/component-base => k8s.io/component-base v0.29.4
k8s.io/component-helpers => k8s.io/component-helpers v0.29.4
k8s.io/controller-manager => k8s.io/controller-manager v0.29.4
k8s.io/cri-api => k8s.io/cri-api v0.29.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.4
k8s.io/kubectl => k8s.io/kubectl v0.29.4
k8s.io/kubelet => k8s.io/kubelet v0.29.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.4
k8s.io/metrics => k8s.io/metrics v0.29.4
k8s.io/mount-utils => k8s.io/mount-utils v0.29.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.4
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.4
k8s.io/sample-controller => k8s.io/sample-controller v0.29.4
)

require (
github.com/onsi/ginkgo/v2 v2.9.5
github.com/onsi/gomega v1.27.6
k8s.io/api v0.26.3
k8s.io/apimachinery v0.26.3
k8s.io/client-go v0.26.3
k8s.io/kubernetes v1.26.7
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.30.0
k8s.io/api v0.29.4
k8s.io/apimachinery v0.29.4
k8s.io/client-go v0.29.4
k8s.io/kubernetes v1.29.4
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
)

require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.17.7 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/tools v0.9.1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.56.3 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/grpc v1.61.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.26.3 // indirect
k8s.io/component-base v0.26.3 // indirect
k8s.io/component-helpers v0.26.3 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/apiextensions-apiserver v0.0.0 // indirect
k8s.io/apiserver v0.29.4 // indirect
k8s.io/cloud-provider v0.0.0 // indirect
k8s.io/component-base v0.29.4 // indirect
k8s.io/component-helpers v0.29.4 // indirect
k8s.io/controller-manager v0.29.4 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kms v0.29.4 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/kubelet v0.0.0 // indirect
k8s.io/pod-security-admission v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 4a2a7a5

Please sign in to comment.