diff --git a/Gopkg.lock b/Gopkg.lock index d62a7f77a55..92d7eafe15f 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -375,11 +375,11 @@ revision = "fb8b55a1072436a51b153de9acf5bf5525efcf83" [[projects]] - digest = "1:14f70ac5f181ccb012cddc7c72ac28709497155340b2fad822bd15d9a8722d93" + digest = "1:c2edaeee2250d3886f1e2223a8c6698498ecdc467a72949888f89dc1dde89045" name = "github.com/openshift/hive" packages = ["contrib/pkg/awstagdeprovision"] pruneopts = "NUT" - revision = "8c7844d9b61c35f53bab561f5ce4d879fef86ec6" + revision = "2349f175d3e4fc6542dec79add881a59f2d7b1b8" [[projects]] digest = "1:93b1d84c5fa6d1ea52f4114c37714cddd84d5b78f151b62bb101128dd51399bf" @@ -839,10 +839,12 @@ "k8s.io/apimachinery/pkg/api/errors", "k8s.io/apimachinery/pkg/apis/meta/v1", "k8s.io/apimachinery/pkg/runtime", + "k8s.io/apimachinery/pkg/util/net", "k8s.io/apimachinery/pkg/util/sets", "k8s.io/apimachinery/pkg/util/wait", "k8s.io/apimachinery/pkg/watch", "k8s.io/client-go/kubernetes", + "k8s.io/client-go/rest", "k8s.io/client-go/tools/clientcmd", "k8s.io/client-go/tools/clientcmd/api/v1", "k8s.io/client-go/tools/watch", diff --git a/Gopkg.toml b/Gopkg.toml index 075ff6e5263..d6c122fb809 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -67,7 +67,7 @@ ignored = ["github.com/openshift/installer/tests*"] [[constraint]] name = "github.com/openshift/hive" - revision = "8c7844d9b61c35f53bab561f5ce4d879fef86ec6" + revision = "2349f175d3e4fc6542dec79add881a59f2d7b1b8" [[constraint]] name = "k8s.io/utils" diff --git a/vendor/github.com/openshift/hive/contrib/pkg/awstagdeprovision/awstagdeprovision.go b/vendor/github.com/openshift/hive/contrib/pkg/awstagdeprovision/awstagdeprovision.go index 5eb68866d9e..f99d82981dd 100644 --- a/vendor/github.com/openshift/hive/contrib/pkg/awstagdeprovision/awstagdeprovision.go +++ b/vendor/github.com/openshift/hive/contrib/pkg/awstagdeprovision/awstagdeprovision.go @@ -1157,7 +1157,8 @@ func deleteS3Buckets(session *session.Session, filter AWSFilter, clusterName str awsObjects, err := bucketsToAWSObjects(results.Buckets, s3Client, logger) if err != nil { - return false, fmt.Errorf("error converting buckets to internal objects: %v", err) + logger.Debugf("error converting s3 buckets to native AWS objects: %v", err) + return false, nil } filteredObjects := filterObjects(awsObjects, filter) @@ -1381,7 +1382,7 @@ func deleteRoute53(session *session.Session, filters AWSFilter, clusterName stri awsZones, err := r53ZonesToAWSObjects(allZones.HostedZones, r53Client) if err != nil { logger.Debugf("error converting r53Zones to native AWS objects: %v", err) - return false, fmt.Errorf("error converting route53 zones to internal AWS objects: %v", err) + return false, nil } filteredZones := filterObjects(awsZones, filters)