Skip to content

Commit cdfe39d

Browse files
Merge pull request #180 from mfojtik/bump-for-rolebinding
bump(*): library-go pickup for rolebinding fix
2 parents 4eba8b8 + 2e9b99e commit cdfe39d

File tree

6 files changed

+58
-42
lines changed

6 files changed

+58
-42
lines changed

glide.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/operator/operatorclient/operatorclient.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package operatorclient
22

33
import (
4+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
45
"k8s.io/client-go/tools/cache"
56

67
operatorv1 "github.com/openshift/api/operator/v1"
@@ -17,6 +18,15 @@ func (c *OperatorClient) Informer() cache.SharedIndexInformer {
1718
return c.Informers.Operator().V1().KubeControllerManagers().Informer()
1819
}
1920

21+
func (c *OperatorClient) GetStaticPodOperatorStateWithQuorum() (*operatorv1.StaticPodOperatorSpec, *operatorv1.StaticPodOperatorStatus, string, error) {
22+
instance, err := c.Client.KubeControllerManagers().Get("cluster", metav1.GetOptions{})
23+
if err != nil {
24+
return nil, nil, "", err
25+
}
26+
27+
return &instance.Spec.StaticPodOperatorSpec, &instance.Status.StaticPodOperatorStatus, instance.ResourceVersion, nil
28+
}
29+
2030
func (c *OperatorClient) GetStaticPodOperatorState() (*operatorv1.StaticPodOperatorSpec, *operatorv1.StaticPodOperatorStatus, string, error) {
2131
instance, err := c.Informers.Operator().V1().KubeControllerManagers().Lister().Get("cluster")
2232
if err != nil {

vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/rbac.go

Lines changed: 28 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/revision/revision_controller.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/operator/v1helpers/interfaces.go

Lines changed: 13 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/operator/v1helpers/test_helpers.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)