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.

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

[release-4.7] Bug 2054669: UPSTREAM: 89885: SQUASH: Retry fetching clouds.conf #1178

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 18 additions & 1 deletion staging/src/k8s.io/legacy-cloud-providers/openstack/openstack.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
netutil "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers"
corelistersv1 "k8s.io/client-go/listers/core/v1"
certutil "k8s.io/client-go/util/cert"
"k8s.io/client-go/util/retry"
cloudprovider "k8s.io/cloud-provider"
nodehelpers "k8s.io/cloud-provider/node/helpers"
"k8s.io/klog/v2"
Expand Down Expand Up @@ -279,7 +281,22 @@ func (os *OpenStack) setConfigFromSecret() error {
return fmt.Errorf("secret lister is not initialized")
}

secret, err := os.secretLister.Secrets(os.secretNamespace).Get(os.secretName)
var secret *v1.Secret
err := retry.OnError(
wait.Backoff{
Duration: time.Second,
Factor: 1.5,
Jitter: 1,
Steps: 10,
},
func(_ error) bool {
return true
},
func() (err error) {
secret, err = os.secretLister.Secrets(os.secretNamespace).Get(os.secretName)
return err
},
)
if err != nil {
klog.Errorf("cannot get secret %s in namespace %s. error: %q", os.secretName, os.secretNamespace, err)
return err
Expand Down