Skip to content

Commit 62b9d59

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #19702 from deads2k/sscs-01-dep
switch to using vendored version of SSCS and library-go
2 parents eb8f237 + 32bbd5c commit 62b9d59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1015
-69
lines changed

‎glide.lock

+13-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎glide.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ import:
4343
version: master
4444
- package: github.com/openshift/imagebuilder
4545
version: master
46+
- package: github.com/openshift/library-go
47+
version: master
48+
- package: github.com/openshift/service-serving-cert-signer
49+
version: release-3.10
4650

4751
# forks third
4852
# master

‎hack/import-restrictions.json

-19
Original file line numberDiff line numberDiff line change
@@ -382,25 +382,6 @@
382382
]
383383
},
384384

385-
{
386-
"checkedPackageRoots": [
387-
"github.com/openshift/origin/pkg/service/controller/servingcert"
388-
],
389-
"allowedImportPackageRoots": [
390-
"vendor/k8s.io/apimachinery",
391-
"vendor/k8s.io/api",
392-
"vendor/k8s.io/client-go",
393-
394-
"github.com/openshift/origin/pkg/service/controller/servingcert"
395-
],
396-
"allowedImportPackages": [
397-
"vendor/github.com/golang/glog",
398-
"github.com/openshift/origin/pkg/cmd/server/crypto",
399-
"github.com/openshift/origin/pkg/controller"
400-
401-
]
402-
},
403-
404385
{
405386
"checkedPackageRoots": [
406387
"github.com/openshift/origin/pkg/oc"

‎pkg/cmd/infra/router/template.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
2828
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
2929

30-
"github.com/openshift/origin/pkg/cmd/server/crypto"
30+
"github.com/openshift/library-go/pkg/crypto"
3131
"github.com/openshift/origin/pkg/cmd/util"
3232
cmdversion "github.com/openshift/origin/pkg/cmd/version"
3333
projectinternalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset"

‎pkg/cmd/openshift-controller-manager/controller/service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"time"
66

7+
"github.com/openshift/library-go/pkg/crypto"
78
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
8-
"github.com/openshift/origin/pkg/cmd/server/crypto"
9-
servingcertcontroller "github.com/openshift/origin/pkg/service/controller/servingcert"
9+
servingcertcontroller "github.com/openshift/service-serving-cert-signer/pkg/controller/servingcert"
1010
)
1111

1212
func RunServiceServingCertsController(ctx ControllerContext) (bool, error) {

‎pkg/cmd/openshift-controller-manager/controller/standalone_apiserver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
clientgoclientset "k8s.io/client-go/kubernetes"
2121
"k8s.io/kubernetes/pkg/api/legacyscheme"
2222

23+
"github.com/openshift/library-go/pkg/crypto"
2324
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
24-
"github.com/openshift/origin/pkg/cmd/server/crypto"
2525
cmdutil "github.com/openshift/origin/pkg/cmd/util"
2626
)
2727

‎pkg/cmd/server/admin/create_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1515
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1616

17-
"github.com/openshift/origin/pkg/cmd/server/crypto"
17+
"github.com/openshift/library-go/pkg/crypto"
1818
)
1919

2020
const CreateClientCommandName = "create-api-client-config"

‎pkg/cmd/server/admin/create_clientcert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"k8s.io/apiserver/pkg/authentication/user"
1010

11-
"github.com/openshift/origin/pkg/cmd/server/crypto"
11+
"github.com/openshift/library-go/pkg/crypto"
1212
)
1313

1414
type CreateClientCertOptions struct {

‎pkg/cmd/server/admin/create_kubeconfig.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1717
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1818

19+
"github.com/openshift/library-go/pkg/crypto"
1920
"github.com/openshift/origin/pkg/client/config"
20-
"github.com/openshift/origin/pkg/cmd/server/crypto"
2121
"k8s.io/client-go/tools/clientcmd"
2222
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
2323
)

‎pkg/cmd/server/admin/create_mastercerts.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1919
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
2020

21-
"github.com/openshift/origin/pkg/cmd/server/crypto"
21+
"github.com/openshift/library-go/pkg/crypto"
2222
"github.com/openshift/origin/pkg/util/parallel"
2323
)
2424

‎pkg/cmd/server/admin/create_nodeconfig.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
2020
"k8s.io/kubernetes/pkg/master/ports"
2121

22+
"github.com/openshift/library-go/pkg/crypto"
2223
"github.com/openshift/origin/pkg/cmd/flagtypes"
2324
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
2425
latestconfigapi "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
25-
"github.com/openshift/origin/pkg/cmd/server/crypto"
2626
cmdutil "github.com/openshift/origin/pkg/cmd/util"
2727
"github.com/openshift/origin/pkg/cmd/util/variable"
2828
)

‎pkg/cmd/server/admin/create_servercert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1313
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1414

15-
"github.com/openshift/origin/pkg/cmd/server/crypto"
15+
"github.com/openshift/library-go/pkg/crypto"
1616
)
1717

1818
const CreateServerCertCommandName = "create-server-cert"

‎pkg/cmd/server/admin/create_signercert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1212
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1313

14-
"github.com/openshift/origin/pkg/cmd/server/crypto"
14+
"github.com/openshift/library-go/pkg/crypto"
1515
)
1616

1717
const CreateSignerCertCommandName = "create-signer-cert"

‎pkg/cmd/server/admin/signer_cert_args.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/spf13/cobra"
99
"github.com/spf13/pflag"
1010

11-
"github.com/openshift/origin/pkg/cmd/server/crypto"
11+
"github.com/openshift/library-go/pkg/crypto"
1212
cmdutil "github.com/openshift/origin/pkg/cmd/util"
1313
)
1414

‎pkg/cmd/server/apis/config/validation/validation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
utilvalidation "k8s.io/apimachinery/pkg/util/validation"
1414
"k8s.io/apimachinery/pkg/util/validation/field"
1515

16+
"github.com/openshift/library-go/pkg/crypto"
1617
"github.com/openshift/origin/pkg/cmd/server/apis/config"
1718
"github.com/openshift/origin/pkg/cmd/server/apis/config/validation/common"
18-
"github.com/openshift/origin/pkg/cmd/server/crypto"
1919
cmdutil "github.com/openshift/origin/pkg/cmd/util"
2020
cmdflags "github.com/openshift/origin/pkg/cmd/util/flags"
2121
)

‎pkg/cmd/server/kubernetes/master/master_config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ import (
7070
rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
7171
kversion "k8s.io/kubernetes/pkg/version"
7272

73+
"github.com/openshift/library-go/pkg/crypto"
7374
"github.com/openshift/origin/pkg/api"
7475
oauthorizer "github.com/openshift/origin/pkg/authorization/authorizer"
7576
"github.com/openshift/origin/pkg/authorization/authorizer/scope"
7677
"github.com/openshift/origin/pkg/cmd/flagtypes"
7778
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
78-
"github.com/openshift/origin/pkg/cmd/server/crypto"
7979
"github.com/openshift/origin/pkg/cmd/server/election"
8080
nodeclient "github.com/openshift/origin/pkg/cmd/server/kubernetes/node/client"
8181
cmdutil "github.com/openshift/origin/pkg/cmd/util"

‎pkg/cmd/server/kubernetes/node/options/options.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"sort"
77
"strings"
88

9-
"github.com/openshift/origin/pkg/cmd/server/crypto"
109
"k8s.io/apimachinery/pkg/util/sets"
1110
utilfeature "k8s.io/apiserver/pkg/util/feature"
1211
"k8s.io/kubernetes/pkg/features"
1312

13+
"github.com/openshift/library-go/pkg/crypto"
1414
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
1515
cmdutil "github.com/openshift/origin/pkg/cmd/util"
1616
"github.com/openshift/origin/pkg/cmd/util/variable"

‎pkg/cmd/server/origin/oauth_apiserver_adapter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
utilflag "k8s.io/apiserver/pkg/util/flag"
99

1010
routeclient "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
11-
"github.com/openshift/origin/pkg/cmd/server/crypto"
11+
"github.com/openshift/library-go/pkg/crypto"
1212
"github.com/openshift/origin/pkg/oauthserver/oauthserver"
1313
)
1414

‎pkg/cmd/server/start/start_allinone.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
2222
"k8s.io/kubernetes/pkg/master/ports"
2323

24+
"github.com/openshift/library-go/pkg/crypto"
2425
"github.com/openshift/origin/pkg/cmd/server/admin"
2526
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
26-
"github.com/openshift/origin/pkg/cmd/server/crypto"
2727
"github.com/openshift/origin/pkg/cmd/server/origin"
2828
tsbcmd "github.com/openshift/origin/pkg/templateservicebroker/cmd/server"
2929
"k8s.io/apimachinery/pkg/util/wait"

‎pkg/cmd/server/start/start_master.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import (
2424
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
2525
kubelettypes "k8s.io/kubernetes/pkg/kubelet/types"
2626

27+
"github.com/openshift/library-go/pkg/crypto"
2728
"github.com/openshift/origin/pkg/cmd/server/admin"
2829
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
2930
configapilatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
3031
"github.com/openshift/origin/pkg/cmd/server/apis/config/validation"
31-
"github.com/openshift/origin/pkg/cmd/server/crypto"
3232
"github.com/openshift/origin/pkg/cmd/server/etcd"
3333
"github.com/openshift/origin/pkg/cmd/server/etcd/etcdserver"
3434
"github.com/openshift/origin/pkg/cmd/server/origin"

‎pkg/cmd/server/start/start_node.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import (
2424
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
2525
"k8s.io/kubernetes/pkg/master/ports"
2626

27+
"github.com/openshift/library-go/pkg/crypto"
2728
"github.com/openshift/origin/pkg/cmd/server/admin"
2829
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
2930
configapilatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
3031
"github.com/openshift/origin/pkg/cmd/server/apis/config/validation"
3132
"github.com/openshift/origin/pkg/cmd/server/apis/config/validation/common"
32-
"github.com/openshift/origin/pkg/cmd/server/crypto"
3333
"github.com/openshift/origin/pkg/cmd/server/kubernetes/network"
3434
networkoptions "github.com/openshift/origin/pkg/cmd/server/kubernetes/network/options"
3535
"github.com/openshift/origin/pkg/cmd/server/kubernetes/node"

‎pkg/controller/OWNERS

-11
This file was deleted.

‎pkg/controller/doc.go

-2
This file was deleted.

‎test/integration/front_proxy_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import (
1919
kapi "k8s.io/kubernetes/pkg/apis/core"
2020

2121
projectapiv1 "github.com/openshift/api/project/v1"
22+
"github.com/openshift/library-go/pkg/crypto"
2223
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
2324
authorizationclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset"
2425
"github.com/openshift/origin/pkg/cmd/server/admin"
2526
"github.com/openshift/origin/pkg/cmd/server/apis/config"
2627
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
27-
"github.com/openshift/origin/pkg/cmd/server/crypto"
2828
projectapi "github.com/openshift/origin/pkg/project/apis/project"
2929
projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset"
3030
testutil "github.com/openshift/origin/test/util"

‎test/integration/node_authorizer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"k8s.io/kubernetes/pkg/apis/policy"
1818
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
1919

20+
"github.com/openshift/library-go/pkg/crypto"
2021
"github.com/openshift/origin/pkg/cmd/server/admin"
21-
"github.com/openshift/origin/pkg/cmd/server/crypto"
2222
testutil "github.com/openshift/origin/test/util"
2323
testserver "github.com/openshift/origin/test/util/server"
2424
)

‎test/integration/oauth_basicauth_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
restclient "k8s.io/client-go/rest"
1616

17+
"github.com/openshift/library-go/pkg/crypto"
1718
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
18-
"github.com/openshift/origin/pkg/cmd/server/crypto"
1919
"github.com/openshift/origin/pkg/cmd/util"
2020
"github.com/openshift/origin/pkg/oc/util/tokencmd"
2121
userclient "github.com/openshift/origin/pkg/user/generated/internalclientset/typed/user/internalversion"

‎test/integration/service_serving_cert_signer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
testutil "github.com/openshift/origin/test/util"
1313
testserver "github.com/openshift/origin/test/util/server"
1414

15-
"github.com/openshift/origin/pkg/service/controller/servingcert"
15+
"github.com/openshift/service-serving-cert-signer/pkg/controller/servingcert"
1616
)
1717

1818
func TestServiceServingCertSigner(t *testing.T) {

‎test/integration/tls_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"crypto/tls"
55
"testing"
66

7-
"github.com/openshift/origin/pkg/cmd/server/crypto"
7+
"github.com/openshift/library-go/pkg/crypto"
88
testserver "github.com/openshift/origin/test/util/server"
99
)
1010

‎test/util/server/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
kapi "k8s.io/kubernetes/pkg/apis/core"
2828
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
2929

30+
"github.com/openshift/library-go/pkg/crypto"
3031
authorizationclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset"
3132
"github.com/openshift/origin/pkg/cmd/server/admin"
3233
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
@@ -42,7 +43,6 @@ import (
4243
// install all APIs
4344

4445
_ "github.com/openshift/origin/pkg/api/install"
45-
"github.com/openshift/origin/pkg/cmd/server/crypto"
4646
_ "k8s.io/kubernetes/pkg/apis/core/install"
4747
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
4848
)

‎vendor/github.com/openshift/library-go/.gitignore

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/library-go/.travis.yml

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)