Skip to content

Bug 1948953: UPSTREAM: <carry>: Set informer for openstack #662

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 25, 2021
Merged

Bug 1948953: UPSTREAM: <carry>: Set informer for openstack #662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions plugin/pkg/admission/storage/persistentvolume/label/admission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ import (
"io"
"sync"

genericadmissioninitializer "k8s.io/apiserver/pkg/admission/initializer"

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apiserver/pkg/admission"
"k8s.io/client-go/informers"
cloudprovider "k8s.io/cloud-provider"
cloudvolume "k8s.io/cloud-provider/volume"
volumehelpers "k8s.io/cloud-provider/volume/helpers"
Expand All @@ -51,12 +54,14 @@ func Register(plugins *admission.Plugins) {
}

var _ = admission.Interface(&persistentVolumeLabel{})
var _ = genericadmissioninitializer.WantsExternalKubeInformerFactory(&persistentVolumeLabel{})

type persistentVolumeLabel struct {
*admission.Handler

mutex sync.Mutex
cloudConfig []byte
sharedInformer informers.SharedInformerFactory
awsPVLabeler cloudprovider.PVLabeler
gcePVLabeler cloudprovider.PVLabeler
azurePVLabeler cloudprovider.PVLabeler
Expand Down Expand Up @@ -86,6 +91,20 @@ func (l *persistentVolumeLabel) SetCloudConfig(cloudConfig []byte) {
l.cloudConfig = cloudConfig
}

func (l *persistentVolumeLabel) SetExternalKubeInformerFactory(f informers.SharedInformerFactory) {
secretInformer := f.Core().V1().Secrets()
l.sharedInformer = f
l.SetReadyFunc(secretInformer.Informer().HasSynced)
}

// ValidateInitialization ensures lister is set.
func (l *persistentVolumeLabel) ValidateInitialization() error {
if l.sharedInformer == nil {
return fmt.Errorf("missing shared informer")
}
return nil
}

func nodeSelectorRequirementKeysExistInNodeSelectorTerms(reqs []api.NodeSelectorRequirement, terms []api.NodeSelectorTerm) bool {
for _, req := range reqs {
for _, term := range terms {
Expand Down Expand Up @@ -396,6 +415,11 @@ func (l *persistentVolumeLabel) getOpenStackPVLabeler() (cloudprovider.PVLabeler
return nil, err
}

cloudProviderWithInformer, ok := cloudProvider.(cloudprovider.InformerUser)
if ok {
cloudProviderWithInformer.SetInformers(l.sharedInformer)
}

openStackPVLabeler, ok := cloudProvider.(cloudprovider.PVLabeler)
if !ok {
return nil, errors.New("OpenStack cloud provider does not implement PV labeling")
Expand Down