Skip to content

Commit e41516d

Browse files
Merge pull request #1152 from sanchezl/cherry-pick-1136-to-release-4.14
[release-4.14] OCPBUGS-44002: Continuous pull-secret updates / slow initialization on build01 (test platform infrastructure)
2 parents 591b883 + 6b2aa6d commit e41516d

File tree

11 files changed

+1420
-0
lines changed

11 files changed

+1420
-0
lines changed

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ require (
4242
github.com/prometheus/common v0.44.0
4343
github.com/spf13/cobra v1.6.1
4444
github.com/stretchr/testify v1.9.0
45+
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
4546
golang.org/x/net v0.27.0
4647
golang.org/x/oauth2 v0.8.0
4748
golang.org/x/time v0.3.0

go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,7 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
11771177
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
11781178
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
11791179
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
1180+
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw=
11801181
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
11811182
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
11821183
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=

pkg/operator/imageconfig.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import (
88
"strings"
99
"time"
1010

11+
"golang.org/x/exp/slices"
12+
1113
"k8s.io/apimachinery/pkg/api/errors"
1214
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1315
"k8s.io/apimachinery/pkg/labels"
@@ -254,6 +256,9 @@ func (icc *ImageConfigController) getRouteHostnames() ([]string, error) {
254256
// downstream controllers that watch this array
255257
sort.Strings(routeNames)
256258

259+
// remove duplicates
260+
routeNames = slices.Compact(routeNames)
261+
257262
// make sure the default route hostname comes first in the list because the
258263
// first entry will be used as the public repository hostname by the cluster
259264
// configuration

vendor/golang.org/x/exp/LICENSE

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

vendor/golang.org/x/exp/PATENTS

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

vendor/golang.org/x/exp/constraints/constraints.go

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

vendor/golang.org/x/exp/slices/slices.go

Lines changed: 223 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)