Skip to content

Commit 874b178

Browse files
njhalenjhale
committed
chore(modules): pin k8s 1.14
1 parent 4b7a384 commit 874b178

File tree

4 files changed

+51
-66
lines changed

4 files changed

+51
-66
lines changed

‎Makefile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ MOCKGEN := ./scripts/generate_mocks.sh
1313
# mockgen := $(GOBIN)/mockgen
1414
IMAGE_REPO := quay.io/operator-framework/olm
1515
IMAGE_TAG ?= "dev"
16-
KUBE_DEPS := api apiserver apimachinery apiextensions-apiserver kube-aggregator code-generator cli-runtime
17-
KUBE_RELEASE := release-1.14
1816
SPECIFIC_UNIT_TEST := $(if $(TEST),-run $(TEST),)
1917
export GO111MODULE=on
2018

@@ -56,7 +54,7 @@ build-linux: build_cmd=build
5654
build-linux: arch_flags=GOOS=linux GOARCH=386
5755
build-linux: clean $(CMDS)
5856

59-
$(CMDS): version_flags=-ldflags "-w -X $(PKG)/pkg/version.GitCommit=`git rev-parse --short HEAD` -X $(PKG)/pkg/version.OLMVersion=`cat OLM_VERSION`"
57+
$(CMDS): version_flags=-ldflags "-X $(PKG)/pkg/version.GitCommit=`git rev-parse --short HEAD` -X $(PKG)/pkg/version.OLMVersion=`cat OLM_VERSION`"
6058
$(CMDS):
6159
CGO_ENABLED=0 $(arch_flags) go $(build_cmd) $(MOD_FLAGS) $(version_flags) -o bin/$(shell basename $@) $@
6260

@@ -100,13 +98,7 @@ e2e-local-docker:
10098
. ./scripts/build_local.sh
10199
. ./scripts/run_e2e_docker.sh $(TEST)
102100

103-
# kube dependencies all should be at the same release and should match up with client go
104-
# go.mod currently doesn't support specifying a branch name to track, and kube isn't publishing good version tags
105-
$(KUBE_DEPS):
106-
go get -m k8s.io/kubernetes@v`echo $(KUBE_RELEASE) | cut -d "-" -f2`
107-
go get -m k8s.io/$@@$(KUBE_RELEASE)
108-
109-
vendor: $(KUBE_DEPS)
101+
vendor:
110102
go mod tidy
111103
go mod vendor
112104

‎cmd/package-server/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
log "github.com/sirupsen/logrus"
99
"github.com/spf13/cobra"
10-
"k8s.io/apiserver/pkg/util/logs"
10+
"k8s.io/component-base/logs"
1111

1212
"github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server"
1313
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/signals"

‎go.mod

Lines changed: 48 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,78 +2,72 @@ module github.com/operator-framework/operator-lifecycle-manager
22

33
go 1.12
44

5+
replace (
6+
// Pin openshift version to 4.2 (uses kube 1.14)
7+
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190717200738-0390d1e77d64+incompatible
8+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190627172412-c44a8b61b9f4
9+
10+
// Pin kube version to 1.14
11+
k8s.io/api => k8s.io/api v0.0.0-20190704095032-f4ca3d3bdf1d
12+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190704104557-6209bbe9f7a9
13+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190704094733-8f6ac2502e51
14+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190704101451-e5f5c6e528cd
15+
k8s.io/client-go => k8s.io/client-go v11.0.1-0.20190521191137-11646d1007e0+incompatible
16+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190704094409-6c2a4329ac29
17+
k8s.io/component-base => k8s.io/component-base v0.0.0-20190704100636-f0322db00a10
18+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190704101955-e796fd6d55e0
19+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
20+
k8s.io/kubernetes => k8s.io/kubernetes v1.14.5-beta.0.0.20190708100021-7936da50c68f
21+
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2
22+
)
23+
524
require (
6-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
725
github.com/blang/semver v3.5.1+incompatible
8-
github.com/coreos/etcd v3.3.12+incompatible // indirect
9-
github.com/coreos/go-semver v0.2.0
10-
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
26+
github.com/coreos/go-semver v0.3.0
27+
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
1128
github.com/docker/distribution v2.7.1+incompatible // indirect
12-
github.com/docker/docker v0.7.3-0.20190409004836-2e1cfbca03da // indirect
13-
github.com/emicklei/go-restful v2.9.3+incompatible // indirect
29+
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
30+
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
1431
github.com/ghodss/yaml v1.0.0
15-
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect
16-
github.com/go-openapi/analysis v0.17.2 // indirect
17-
github.com/go-openapi/errors v0.17.2 // indirect
18-
github.com/go-openapi/jsonpointer v0.19.0 // indirect
19-
github.com/go-openapi/jsonreference v0.19.0 // indirect
20-
github.com/go-openapi/loads v0.17.2 // indirect
21-
github.com/go-openapi/runtime v0.17.2 // indirect
22-
github.com/go-openapi/spec v0.19.0
23-
github.com/go-openapi/swag v0.17.2 // indirect
32+
github.com/go-openapi/spec v0.19.2
33+
github.com/go-openapi/validate v0.19.2 // indirect
2434
github.com/gogo/protobuf v1.2.0 // indirect
2535
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
26-
github.com/golang/mock v1.2.1-0.20190329180013-73dc87cad333
36+
github.com/golang/mock v1.3.1
2737
github.com/google/btree v1.0.0 // indirect
28-
github.com/google/go-cmp v0.2.0 // indirect
2938
github.com/google/gofuzz v1.0.0 // indirect
3039
github.com/googleapis/gnostic v0.3.0 // indirect
31-
github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
40+
github.com/grpc-ecosystem/grpc-gateway v1.9.4 // indirect
3241
github.com/json-iterator/go v1.1.6 // indirect
3342
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
34-
github.com/maxbrunsfeld/counterfeiter/v6 v6.0.2
43+
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.1
3544
github.com/mitchellh/hashstructure v1.0.0
36-
github.com/onsi/ginkgo v1.8.0 // indirect
37-
github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible
38-
github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a
45+
github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 // indirect
46+
github.com/openshift/api v0.0.0-00010101000000-000000000000
47+
github.com/openshift/client-go v0.0.0-00010101000000-000000000000
3948
github.com/operator-framework/operator-registry v1.1.1
4049
github.com/pkg/errors v0.8.1
4150
github.com/prometheus/client_golang v0.9.2
42-
github.com/sirupsen/logrus v1.4.1
43-
github.com/spf13/cobra v0.0.3
44-
github.com/stretchr/testify v1.2.2
51+
github.com/sirupsen/logrus v1.4.2
52+
github.com/spf13/cobra v0.0.5
53+
github.com/stretchr/testify v1.3.0
4554
go.uber.org/atomic v1.4.0 // indirect
4655
go.uber.org/zap v1.10.0 // indirect
47-
golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5 // indirect
48-
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect
4956
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
50-
google.golang.org/appengine v1.5.0 // indirect
51-
google.golang.org/grpc v1.19.1
52-
gotest.tools v2.2.0+incompatible // indirect
53-
k8s.io/api v0.0.0-20190313235455-40a48860b5ab
54-
k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed
55-
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
56-
k8s.io/apiserver v0.0.0-20190531031430-24fd0f18bc21
57-
k8s.io/client-go v11.0.0+incompatible
58-
k8s.io/code-generator v0.0.0-20190311093542-50b561225d70
57+
gonum.org/v1/gonum v0.0.0-20190710053202-4340aa3071a0 // indirect
58+
google.golang.org/grpc v1.22.0
59+
k8s.io/api v0.0.0-20190717022910-653c86b0609b
60+
k8s.io/apiextensions-apiserver v0.0.0-20181204003618-e419c5771cdc
61+
k8s.io/apimachinery v0.0.0-20190717022731-0bb8574e0887
62+
k8s.io/apiserver v0.0.0-20181026151315-13cfe3978170
63+
k8s.io/client-go v8.0.0+incompatible
64+
k8s.io/code-generator v0.0.0-20181203235156-f8cba74510f3
65+
k8s.io/component-base v0.0.0-20190717023551-b4f50308a616
5966
k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect
60-
k8s.io/klog v0.2.0 // indirect
61-
k8s.io/kube-aggregator v0.0.0-20190404125450-f5e124c822d6
62-
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c
63-
k8s.io/kubernetes v1.14.3
64-
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
67+
k8s.io/kube-aggregator v0.0.0-20181204002017-122bac39d429
68+
k8s.io/kube-openapi v0.0.0-20181031203759-72693cb1fadd
69+
k8s.io/kubernetes v1.11.8-beta.0.0.20190124204751-3a10094374f2
70+
k8s.io/utils v0.0.0-20190712204705-3dccf664f023 // indirect
71+
sigs.k8s.io/structured-merge-diff v0.0.0-00010101000000-000000000000 // indirect
6572
sigs.k8s.io/yaml v1.1.0 // indirect
6673
)
67-
68-
replace (
69-
// pin kube dependencies to release-1.12 branch
70-
github.com/evanphx/json-patch => github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550
71-
k8s.io/api => k8s.io/api v0.0.0-20181128191700-6db15a15d2d3
72-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190221101132-cda7b6cfba78
73-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc
74-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190402012035-5e1c1f41ee34
75-
k8s.io/client-go => k8s.io/client-go v0.0.0-20190228133956-77e032213d34
76-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181128191024-b1289fc74931
77-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190221095344-e77f03c95d65
78-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
79-
)

‎pkg/package-server/apiserver/config.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ func (c *Config) Complete(informers informers.SharedInformerFactory) completedCo
4545
c.GenericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(generic.Scheme))
4646
c.GenericConfig.OpenAPIConfig.Info.Title = "Package API server"
4747
c.GenericConfig.OpenAPIConfig.Info.Version = strings.Split(c.GenericConfig.Version.String(), "-")[0]
48-
c.GenericConfig.SwaggerConfig = genericapiserver.DefaultSwaggerConfig()
4948

5049
return completedConfig{
5150
CompletedConfig: c.GenericConfig.Complete(informers),

0 commit comments

Comments
 (0)