From d5ccb4820c2f185dcc55155f4008af1bab1e92b3 Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Thu, 4 Jun 2020 17:09:15 +0300 Subject: [PATCH] Vendor gardener/gardener@v1.5.2 ```improvement operator An issue preventing `extensionsv1alpha1.BackupEntry` to be deleted is now fixed. ``` Signed-off-by: ialidzhikov --- go.mod | 2 +- go.sum | 4 ++-- .../extensions/pkg/controller/backupentry/reconciler.go | 4 +++- .../gardener/gardener/pkg/apis/core/v1beta1/helper/errors.go | 4 ++-- vendor/modules.txt | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 41de99982..b329d9635 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f github.com/frankban/quicktest v1.9.0 // indirect github.com/gardener/etcd-druid v0.3.0 - github.com/gardener/gardener v1.5.1 + github.com/gardener/gardener v1.5.2 github.com/gardener/gardener-extension-networking-calico v1.7.1-0.20200522070525-f9aa28d3c83a github.com/gardener/machine-controller-manager v0.27.0 github.com/go-logr/logr v0.1.0 diff --git a/go.sum b/go.sum index 4ba76ea55..0beaedf11 100644 --- a/go.sum +++ b/go.sum @@ -152,8 +152,8 @@ github.com/gardener/external-dns-management v0.7.7/go.mod h1:egCe/FPOsUbXA4WV0ne github.com/gardener/gardener v1.1.2/go.mod h1:CP9I0tCDVXTLPkJv/jUtXVUh948kSNKEGUg0haLz9gk= github.com/gardener/gardener v1.3.1/go.mod h1:936P5tQbg6ViiW8BVC9ELM95sFrk4DgobKrxMNtn/LU= github.com/gardener/gardener v1.4.1-0.20200519155656-a8ccc6cc779a/go.mod h1:t9oESM37bAMIuezi9I0H0I8+++8jy8BUPitcf4ERRXY= -github.com/gardener/gardener v1.5.1 h1:sI/DY72/N1d+t8TmdgmkrpsdDhnkWcnjBW1MbkGvr40= -github.com/gardener/gardener v1.5.1/go.mod h1:V+RVjUftDzhmb2ztBpf0uzyo1xoBjoDn0KKe0z+8IE0= +github.com/gardener/gardener v1.5.2 h1:uv1m8kJMnh66yFj2gDUMYHbU1GNbXWKvRTlfy9MfI54= +github.com/gardener/gardener v1.5.2/go.mod h1:V+RVjUftDzhmb2ztBpf0uzyo1xoBjoDn0KKe0z+8IE0= github.com/gardener/gardener-extension-networking-calico v1.7.1-0.20200522070525-f9aa28d3c83a h1:jBvyEhkRzW11Nz2y9IIQAo9HUaCvCqxEko5Nf9NRYUI= github.com/gardener/gardener-extension-networking-calico v1.7.1-0.20200522070525-f9aa28d3c83a/go.mod h1:bmD89OLvEBbXLlznsHe90ZlgTU+OrKErwHb6NWlSTvY= github.com/gardener/gardener-resource-manager v0.10.0/go.mod h1:0pKTHOhvU91eQB0EYr/6Ymd7lXc/5Hi8P8tF/gpV0VQ= diff --git a/vendor/github.com/gardener/gardener/extensions/pkg/controller/backupentry/reconciler.go b/vendor/github.com/gardener/gardener/extensions/pkg/controller/backupentry/reconciler.go index 463d3a523..c0714bb7e 100644 --- a/vendor/github.com/gardener/gardener/extensions/pkg/controller/backupentry/reconciler.go +++ b/vendor/github.com/gardener/gardener/extensions/pkg/controller/backupentry/reconciler.go @@ -94,7 +94,9 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err shootTechnicalID, _ := ExtractShootDetailsFromBackupEntryName(be.Name) shoot, err := extensionscontroller.GetShoot(r.ctx, r.client, shootTechnicalID) - if err != nil { + // As BackupEntry continues to exist post deletion of a Shoot, + // we do not want to block its deletion when the Cluster is not found. + if client.IgnoreNotFound(err) != nil { return reconcile.Result{}, err } diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/helper/errors.go b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/helper/errors.go index a1e260e22..215cbb442 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/helper/errors.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/helper/errors.go @@ -53,9 +53,9 @@ var ( unauthorizedRegexp = regexp.MustCompile(`(?i)(Unauthorized|InvalidClientTokenId|SignatureDoesNotMatch|Authentication failed|AuthFailure|AuthorizationFailed|invalid character|invalid_grant|invalid_client|Authorization Profile was not found|cannot fetch token|no active subscriptions|InvalidAccessKeyId|InvalidSecretAccessKey|query returned no results)`) quotaExceededRegexp = regexp.MustCompile(`(?i)(LimitExceeded|Quota)`) insufficientPrivilegesRegexp = regexp.MustCompile(`(?i)(AccessDenied|Forbidden|deny|denied|OperationNotAllowed)`) - dependenciesRegexp = regexp.MustCompile(`(?i)(PendingVerification|Access Not Configured|accessNotConfigured|DependencyViolation|OptInRequired|DeleteConflict|Conflict|inactive billing state|ReadOnlyDisabledSubscription|is already being used|InUseSubnetCannotBeDeleted|VnetInUse|timeout while waiting for state to become)`) + dependenciesRegexp = regexp.MustCompile(`(?i)(PendingVerification|Access Not Configured|accessNotConfigured|DependencyViolation|OptInRequired|DeleteConflict|Conflict|inactive billing state|ReadOnlyDisabledSubscription|is already being used|InUseSubnetCannotBeDeleted|VnetInUse|timeout while waiting for state to become|InvalidCidrBlock)`) resourcesDepletedRegexp = regexp.MustCompile(`(?i)(not available in the current hardware cluster|InsufficientInstanceCapacity|SkuNotAvailable|ZonalAllocationFailed)`) - configurationProblemRegexp = regexp.MustCompile(`(?i)(AzureBastionSubnet|not supported in your requested Availability Zone|InvalidParameterValue|notFound|NetcfgInvalidSubnet|InvalidSubnet|Invalid value|KubeletHasInsufficientMemory|KubeletHasDiskPressure|KubeletHasInsufficientPID|violates constraint|no attached internet gateway found|Your query returned no results)`) + configurationProblemRegexp = regexp.MustCompile(`(?i)(AzureBastionSubnet|not supported in your requested Availability Zone|InvalidParameterValue|notFound|NetcfgInvalidSubnet|InvalidSubnet|Invalid value|KubeletHasInsufficientMemory|KubeletHasDiskPressure|KubeletHasInsufficientPID|violates constraint|no attached internet gateway found|Your query returned no results|PrivateEndpointNetworkPoliciesCannotBeEnabledOnPrivateEndpointSubnet)`) ) // DetermineError determines the Garden error code for the given error and creates a new error with the given message. diff --git a/vendor/modules.txt b/vendor/modules.txt index 641f19a5a..aad3be748 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -91,7 +91,7 @@ github.com/gardener/etcd-druid/api/v1alpha1 github.com/gardener/external-dns-management/pkg/apis/dns github.com/gardener/external-dns-management/pkg/apis/dns/v1alpha1 github.com/gardener/external-dns-management/pkg/client/dns/clientset/versioned/scheme -# github.com/gardener/gardener v1.5.1 +# github.com/gardener/gardener v1.5.2 ## explicit github.com/gardener/gardener/.github github.com/gardener/gardener/.github/ISSUE_TEMPLATE