diff --git a/Gopkg.lock b/Gopkg.lock index dce05418b..a3568c222 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -189,7 +189,7 @@ [[projects]] branch = "master" - digest = "1:8603951e0c3d0de1771e337b01c51390406327d376d011db7259f4ffe96b9e36" + digest = "1:fed1b4f0a2767d0741007ada6edf3b0667e098f9bd2f55e840d095bc977c4f32" name = "github.com/gardener/controller-manager-library" packages = [ "pkg/controllermanager", @@ -213,7 +213,7 @@ "pkg/utils", ] pruneopts = "NUT" - revision = "4a4f421e7029ad35d50a7b1299baf3e6da32b818" + revision = "1a1296828114306bd05a746d422f4c963df092c6" [[projects]] digest = "1:260f7ebefc63024c8dfe2c9f1a2935a89fa4213637a1f522f592f80c001cc441" diff --git a/vendor/github.com/gardener/controller-manager-library/pkg/controllermanager/controller/classes.go b/vendor/github.com/gardener/controller-manager-library/pkg/controllermanager/controller/classes.go index 62effe429..773d7c8ef 100644 --- a/vendor/github.com/gardener/controller-manager-library/pkg/controllermanager/controller/classes.go +++ b/vendor/github.com/gardener/controller-manager-library/pkg/controllermanager/controller/classes.go @@ -57,9 +57,6 @@ func NewTargetClassesByOption(c Interface, opt string, anno string, classes *Cla } func NewTargetClasses(c Interface, value string, anno string, classes *Classes, def string) *Classes { - if c != nil { - value, _ = c.GetStringOption(value) - } if value == "" { if !classes.Contains(def) || classes.Main() != def { value = classes.Main() diff --git a/vendor/github.com/gardener/controller-manager-library/pkg/resources/access/realms.go b/vendor/github.com/gardener/controller-manager-library/pkg/resources/access/realms.go index e5cc89dfc..4da06a514 100644 --- a/vendor/github.com/gardener/controller-manager-library/pkg/resources/access/realms.go +++ b/vendor/github.com/gardener/controller-manager-library/pkg/resources/access/realms.go @@ -18,6 +18,8 @@ package access import ( + "fmt" + "github.com/gardener/controller-manager-library/pkg/resources" "github.com/gardener/controller-manager-library/pkg/utils" @@ -73,6 +75,20 @@ func (this *Realms) String() string { return this.realms.String() } +func (this *Realms) AnnotationValue() string { + sep := "" + data := "" + for k := range this.realms { + data = fmt.Sprintf("%s%s%s", data, sep, k) + sep = "," + } + return data +} + +func (this *Realms) IsDefault() bool { + return this.Size() == 0 || (this.Size() == 1 && this.Contains("")) +} + func (this *Realms) Size() int { return len(this.realms) }