Skip to content

Commit 0559127

Browse files
committed
test/test-framework,hack/generate/gen-test-framework.sh: regenerate test-framework for k8s 1.16
1 parent 219c711 commit 0559127

File tree

3 files changed

+384
-242
lines changed

3 files changed

+384
-242
lines changed

hack/generate/gen-test-framework.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ cd test/test-framework
1313

1414
# Ensure test-framework is up-to-date with current Go project dependencies.
1515
# NOTE: the SDK dependency version still needs updating on a new release.
16+
echo "$(../../build/operator-sdk print-deps)" > go.mod
1617
sdk_version="$(go list -m -f '{{.Version}}' github.com/operator-framework/operator-sdk)"
17-
../../build/operator-sdk print-deps > go.mod
1818
sed -i 's|github.com/operator-framework/operator-sdk\s*master||g' go.mod
1919
echo -e "\nreplace github.com/operator-framework/operator-sdk => ../../" >> go.mod
2020
go mod edit -require "github.com/operator-framework/operator-sdk@${sdk_version}"

test/test-framework/go.mod

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,37 @@ module github.com/operator-framework/operator-sdk/test/test-framework
33
go 1.13
44

55
require (
6-
github.com/operator-framework/operator-sdk v0.12.1-0.20191114194531-79e6369540c6
7-
github.com/spf13/pflag v1.0.3
6+
github.com/operator-framework/operator-sdk v0.12.1-0.20191119193908-3b2f6845f05b
7+
github.com/spf13/pflag v1.0.5
88
k8s.io/api v0.0.0
99
k8s.io/apimachinery v0.0.0
10-
k8s.io/client-go v11.0.0+incompatible
11-
sigs.k8s.io/controller-runtime v0.3.0
10+
k8s.io/client-go v12.0.0+incompatible
11+
sigs.k8s.io/controller-runtime v0.4.0
1212
)
1313

14-
// Pinned to kubernetes-1.15.4
14+
// Pinned to kubernetes-1.16.2
1515
replace (
16-
k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
17-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
18-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
19-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
20-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
21-
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
22-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
23-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
24-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
25-
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
26-
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
27-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
28-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
29-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
30-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
31-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918202713-c34a54b3ec8e
32-
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918202550-958285cf3eef
33-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
34-
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
35-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
16+
k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a
17+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
18+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
19+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
20+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5
21+
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
22+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191016115326-20453efc2458
23+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191016115129-c07a134afb42
24+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
25+
k8s.io/component-base => k8s.io/component-base v0.0.0-20191016111319-039242c015a9
26+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
27+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191016115521-756ffa5af0bd
28+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191016112429-9587704a8ad4
29+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191016114939-2b2b218dc1df
30+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191016114407-2e83b6f20229
31+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191016114748-65049c67a58b
32+
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
33+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191016114556-7841ed97f1b2
34+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191016115753-cf0698c3a16b
35+
k8s.io/metrics => k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e
36+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
3637
)
3738

3839
replace github.com/operator-framework/operator-sdk => ../../

0 commit comments

Comments
 (0)