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

rebase: update kubernetes deps to 1.27.1 #3752

Closed
wants to merge 6 commits into from
Closed

rebase: update kubernetes deps to 1.27.1 #3752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84b07b9
rebase: update kubernetes deps to 1.27
riya-singhal31 Apr 17, 2023
b041de4
cleanup: ErrWaitTimeout is deprecated in k8s 1.27
riya-singhal31 Apr 28, 2023
8475028
ci: new Ceph packages require /etc/selinux/config
nixpanic Apr 28, 2023
189a108
rebase: update controller-runtime to current `main`
nixpanic Apr 28, 2023
8a0b0b3
cleanup: remove unused import "errors"
nixpanic Apr 28, 2023
905f5fd
e2e: pass context when creating a new Namespace
nixpanic Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions e2e/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package e2e

import (
"context"
"errors"
"fmt"
"os"
"time"
Expand Down Expand Up @@ -175,7 +174,7 @@ func waitForDeploymentComplete(clientSet kubernetes.Interface, name, ns string,
return false, nil
})

if errors.Is(err, wait.ErrWaitTimeout) {
if wait.Interrupted(err) {
err = fmt.Errorf("%s", reason)
}
if err != nil {
Expand Down
5 changes: 2 additions & 3 deletions e2e/rbd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package e2e

import (
"context"
"errors"
"fmt"
"strings"
"time"
Expand Down Expand Up @@ -596,7 +595,7 @@ var _ = Describe("RBD", func() {
validateRBDImageCount(f, 1, defaultRBDPool)
validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType)
// create namespace for reattach PVC, deletion will be taken care by framework
ns, err := f.CreateNamespace(reattachPVCNamespace, nil)
ns, err := f.CreateNamespace(context.TODO(), reattachPVCNamespace, nil)
if err != nil {
framework.Failf("failed to create namespace: %v", err)
}
Expand Down Expand Up @@ -1912,7 +1911,7 @@ var _ = Describe("RBD", func() {
return true, nil
})

if errors.Is(err, wait.ErrWaitTimeout) {
if wait.Interrupted(err) {
framework.Failf("timed out waiting for the rbd-nbd process: %s", reason)
}
if err != nil {
Expand Down
3 changes: 1 addition & 2 deletions e2e/rbd_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package e2e
import (
"context"
"encoding/json"
"errors"
"fmt"
"regexp"
"strings"
Expand Down Expand Up @@ -1047,7 +1046,7 @@ func waitToRemoveImagesFromTrash(f *framework.Framework, poolName string, t int)
return false, nil
})

if errors.Is(err, wait.ErrWaitTimeout) {
if wait.Interrupted(err) {
err = errReason
}

Expand Down
111 changes: 63 additions & 48 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,25 @@ require (
//
// when updating k8s.io/kubernetes, make sure to update the replace section too
//
k8s.io/api v0.26.3
k8s.io/apimachinery v0.26.3
k8s.io/api v0.27.1
k8s.io/apimachinery v0.27.1
k8s.io/client-go v12.0.0+incompatible
k8s.io/cloud-provider v0.26.2
k8s.io/klog/v2 v2.100.1
k8s.io/kubernetes v1.26.2
k8s.io/mount-utils v0.26.2
k8s.io/cloud-provider v0.27.1
k8s.io/klog/v2 v2.90.1
k8s.io/kubernetes v1.27.1
k8s.io/mount-utils v0.27.1
k8s.io/pod-security-admission v0.0.0
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/controller-runtime v0.14.6
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/controller-runtime v0.13.1-0.20230427153817-0ef07535542b
)

require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/ansel1/merry v1.6.2 // indirect
github.com/ansel1/merry/v2 v2.0.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/armon/go-metrics v0.3.10 // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
Expand All @@ -61,6 +64,8 @@ require (
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.4.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
Expand All @@ -72,17 +77,20 @@ require (
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gemalto/flume v0.13.0 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.2.4 // 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/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // 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/snappy v0.0.4 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
Expand Down Expand Up @@ -124,11 +132,15 @@ require (
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // 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
Expand All @@ -141,26 +153,31 @@ require (
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.7.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/api v0.110.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.26.2 // indirect
k8s.io/apiserver v0.26.2 // indirect
k8s.io/component-base v0.26.2 // indirect
k8s.io/component-helpers v0.26.2 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/apiextensions-apiserver v0.27.1 // indirect
k8s.io/apiserver v0.27.1 // indirect
k8s.io/component-base v0.27.1 // indirect
k8s.io/component-helpers v0.27.1 // indirect
k8s.io/controller-manager v0.27.1 // indirect
k8s.io/kms v0.27.1 // indirect
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/kubelet v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Expand All @@ -170,38 +187,36 @@ replace (
github.com/ceph/ceph-csi/api => ./api

// Required for kubernetes 1.26
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0
//
// k8s.io/kubernetes depends on these k8s.io packages, but unversioned
//
k8s.io/api => k8s.io/api v0.26.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.2
k8s.io/apimachinery => k8s.io/apimachinery v0.26.3
k8s.io/apiserver => k8s.io/apiserver v0.26.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.2
k8s.io/client-go => k8s.io/client-go v0.26.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.2
k8s.io/code-generator => k8s.io/code-generator v0.26.2
k8s.io/component-base => k8s.io/component-base v0.26.2
k8s.io/component-helpers => k8s.io/component-helpers v0.26.2
k8s.io/controller-manager => k8s.io/controller-manager v0.26.2
k8s.io/cri-api => k8s.io/cri-api v0.26.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.2
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.2
k8s.io/kubectl => k8s.io/kubectl v0.26.2
k8s.io/kubelet => k8s.io/kubelet v0.26.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.2
k8s.io/metrics => k8s.io/metrics v0.26.2
k8s.io/mount-utils => k8s.io/mount-utils v0.26.2
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.2
k8s.io/api => k8s.io/api v0.27.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.1
k8s.io/apimachinery => k8s.io/apimachinery v0.27.1
k8s.io/apiserver => k8s.io/apiserver v0.27.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.1
k8s.io/client-go => k8s.io/client-go v0.27.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.1
k8s.io/code-generator => k8s.io/code-generator v0.27.1
k8s.io/component-base => k8s.io/component-base v0.27.1
k8s.io/component-helpers => k8s.io/component-helpers v0.27.1
k8s.io/controller-manager => k8s.io/controller-manager v0.27.1
k8s.io/cri-api => k8s.io/cri-api v0.27.1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.1
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.1
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.1
k8s.io/kubectl => k8s.io/kubectl v0.27.1
k8s.io/kubelet => k8s.io/kubelet v0.27.1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.1
k8s.io/metrics => k8s.io/metrics v0.27.1
k8s.io/mount-utils => k8s.io/mount-utils v0.27.1
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.1
// layeh.com seems to be misbehaving
layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
)
Expand Down
Loading