Skip to content

Commit 84de2a9

Browse files
estrozestroz
committed
Merge branch 'update-controller-runtime-0.1.10' into crd-validation
2 parents d8108ef + 292770e commit 84de2a9

10 files changed

+228
-261
lines changed

‎Gopkg.lock

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

‎Gopkg.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
[[override]]
22
name = "k8s.io/kubernetes"
3-
version = "=1.12.3"
3+
version = "=1.13.1"
44

55
[[override]]
66
name = "k8s.io/api"
7-
version = "kubernetes-1.12.3"
7+
version = "kubernetes-1.13.1"
88

99
[[override]]
1010
name = "k8s.io/apimachinery"
11-
version = "kubernetes-1.12.3"
11+
version = "kubernetes-1.13.1"
1212

1313
[[override]]
1414
name = "k8s.io/apiextensions-apiserver"
15-
version = "kubernetes-1.12.3"
15+
version = "kubernetes-1.13.1"
1616

1717
[[override]]
1818
name = "k8s.io/apiserver"
19-
version = "kubernetes-1.12.3"
19+
version = "kubernetes-1.13.1"
2020

2121
[[override]]
2222
name = "k8s.io/client-go"
23-
version = "kubernetes-1.12.3"
23+
version = "kubernetes-1.13.1"
2424

2525
[[override]]
2626
name = "k8s.io/cli-runtime"
27-
version = "kubernetes-1.12.3"
27+
version = "kubernetes-1.13.1"
2828

2929
[[override]]
30-
name = "k8s.io/kube-openapi"
30+
name = "k8s.io/kube-openapi"
3131
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
3232

3333
[[constraint]]
3434
name = "sigs.k8s.io/controller-runtime"
35-
version = "=v0.1.8"
35+
version = "=v0.1.10"
3636

3737
[[constraint]]
3838
name = "github.com/sergi/go-diff"
@@ -49,7 +49,7 @@
4949
[[override]]
5050
name = "k8s.io/kube-aggregator"
5151
# Required for operator-lifecycle-manager version compatibility.
52-
version = "kubernetes-1.12.3"
52+
version = "kubernetes-1.13.1"
5353

5454
[[constraint]]
5555
name = "github.com/sirupsen/logrus"

‎pkg/scaffold/ansible/gopkgtoml.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ const gopkgTomlTmpl = `[[constraint]]
4040
4141
[[override]]
4242
name = "k8s.io/api"
43-
version = "kubernetes-1.12.3"
43+
version = "kubernetes-1.13.1"
4444
4545
[[override]]
4646
name = "k8s.io/apimachinery"
47-
version = "kubernetes-1.12.3"
47+
version = "kubernetes-1.13.1"
4848
4949
[[override]]
5050
name = "k8s.io/client-go"
51-
version = "kubernetes-1.12.3"
51+
version = "kubernetes-1.13.1"
5252
5353
[prune]
5454
go-tests = true

‎pkg/scaffold/cmd_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
4545
"github.com/example-inc/app-operator/pkg/apis"
4646
"github.com/example-inc/app-operator/pkg/controller"
47+
4748
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
4849
"github.com/operator-framework/operator-sdk/pkg/leader"
4950
"github.com/operator-framework/operator-sdk/pkg/metrics"

‎pkg/scaffold/controller_kind.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import (
5757
"sigs.k8s.io/controller-runtime/pkg/handler"
5858
"sigs.k8s.io/controller-runtime/pkg/manager"
5959
"sigs.k8s.io/controller-runtime/pkg/reconcile"
60-
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
60+
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
6161
"sigs.k8s.io/controller-runtime/pkg/source"
6262
)
6363

‎pkg/scaffold/controller_kind_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import (
4343
"context"
4444
4545
appv1alpha1 "github.com/example-inc/app-operator/pkg/apis/app/v1alpha1"
46+
4647
corev1 "k8s.io/api/core/v1"
4748
"k8s.io/apimachinery/pkg/api/errors"
4849
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎pkg/scaffold/cr_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestCrCustomSpec(t *testing.T) {
4343
t.Fatal(err)
4444
}
4545
s, buf := setupScaffoldAndWriter()
46-
err = s.Execute(appConfig, &Cr{
46+
err = s.Execute(appConfig, &CR{
4747
Resource: r,
4848
Spec: "# Custom spec here\ncustomSize: 6",
4949
})

‎pkg/scaffold/gopkgtoml.go

+16-12
Original file line numberDiff line numberDiff line change
@@ -56,44 +56,48 @@ required = [
5656
5757
[[override]]
5858
name = "k8s.io/code-generator"
59-
# revision for tag "kubernetes-1.12.3"
60-
revision = "3dcf91f64f638563e5106f21f50c31fa361c918d"
59+
# revision for tag "kubernetes-1.13.1"
60+
revision = "c2090bec4d9b1fb25de3812f868accc2bc9ecbae"
6161
6262
[[override]]
6363
name = "k8s.io/kube-openapi"
6464
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
6565
66+
[[override]]
67+
name = "github.com/go-openapi/spec"
68+
branch = "master"
69+
6670
[[override]]
6771
name = "sigs.k8s.io/controller-tools"
68-
version = "=v0.1.8"
72+
version = "=v0.1.9"
6973
7074
[[override]]
7175
name = "k8s.io/api"
72-
# revision for tag "kubernetes-1.12.3"
73-
revision = "b503174bad5991eb66f18247f52e41c3258f6348"
76+
# revision for tag "kubernetes-1.13.1"
77+
revision = "05914d821849570fba9eacfb29466f2d8d3cd229"
7478
7579
[[override]]
7680
name = "k8s.io/apiextensions-apiserver"
77-
# revision for tag "kubernetes-1.12.3"
78-
revision = "0cd23ebeb6882bd1cdc2cb15fc7b2d72e8a86a5b"
81+
# revision for tag "kubernetes-1.13.1"
82+
revision = "0fe22c71c47604641d9aa352c785b7912c200562"
7983
8084
[[override]]
8185
name = "k8s.io/apimachinery"
82-
# revision for tag "kubernetes-1.12.3"
83-
revision = "eddba98df674a16931d2d4ba75edc3a389bf633a"
86+
# revision for tag "kubernetes-1.13.1"
87+
revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd"
8488
8589
[[override]]
8690
name = "k8s.io/client-go"
87-
# revision for tag "kubernetes-1.12.3"
88-
revision = "d082d5923d3cc0bfbb066ee5fbdea3d0ca79acf8"
91+
# revision for tag "kubernetes-1.13.1"
92+
revision = "8d9ed539ba3134352c586810e749e58df4e94e4f"
8993
9094
[[override]]
9195
name = "github.com/coreos/prometheus-operator"
9296
version = "=v0.26.0"
9397
9498
[[override]]
9599
name = "sigs.k8s.io/controller-runtime"
96-
version = "=v0.1.8"
100+
version = "=v0.1.10"
97101
98102
[[constraint]]
99103
name = "github.com/operator-framework/operator-sdk"

‎pkg/scaffold/gopkgtoml_test.go

+16-12
Original file line numberDiff line numberDiff line change
@@ -48,44 +48,48 @@ required = [
4848
4949
[[override]]
5050
name = "k8s.io/code-generator"
51-
# revision for tag "kubernetes-1.12.3"
52-
revision = "3dcf91f64f638563e5106f21f50c31fa361c918d"
51+
# revision for tag "kubernetes-1.13.1"
52+
revision = "c2090bec4d9b1fb25de3812f868accc2bc9ecbae"
5353
5454
[[override]]
5555
name = "k8s.io/kube-openapi"
5656
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
5757
58+
[[override]]
59+
name = "github.com/go-openapi/spec"
60+
branch = "master"
61+
5862
[[override]]
5963
name = "sigs.k8s.io/controller-tools"
60-
version = "=v0.1.8"
64+
version = "=v0.1.9"
6165
6266
[[override]]
6367
name = "k8s.io/api"
64-
# revision for tag "kubernetes-1.12.3"
65-
revision = "b503174bad5991eb66f18247f52e41c3258f6348"
68+
# revision for tag "kubernetes-1.13.1"
69+
revision = "05914d821849570fba9eacfb29466f2d8d3cd229"
6670
6771
[[override]]
6872
name = "k8s.io/apiextensions-apiserver"
69-
# revision for tag "kubernetes-1.12.3"
70-
revision = "0cd23ebeb6882bd1cdc2cb15fc7b2d72e8a86a5b"
73+
# revision for tag "kubernetes-1.13.1"
74+
revision = "0fe22c71c47604641d9aa352c785b7912c200562"
7175
7276
[[override]]
7377
name = "k8s.io/apimachinery"
74-
# revision for tag "kubernetes-1.12.3"
75-
revision = "eddba98df674a16931d2d4ba75edc3a389bf633a"
78+
# revision for tag "kubernetes-1.13.1"
79+
revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd"
7680
7781
[[override]]
7882
name = "k8s.io/client-go"
79-
# revision for tag "kubernetes-1.12.3"
80-
revision = "d082d5923d3cc0bfbb066ee5fbdea3d0ca79acf8"
83+
# revision for tag "kubernetes-1.13.1"
84+
revision = "8d9ed539ba3134352c586810e749e58df4e94e4f"
8185
8286
[[override]]
8387
name = "github.com/coreos/prometheus-operator"
8488
version = "=v0.26.0"
8589
8690
[[override]]
8791
name = "sigs.k8s.io/controller-runtime"
88-
version = "=v0.1.8"
92+
version = "=v0.1.10"
8993
9094
[[constraint]]
9195
name = "github.com/operator-framework/operator-sdk"

‎pkg/scaffold/helm/gopkgtoml.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,27 @@ const gopkgTomlTmpl = `[[constraint]]
4444
4545
[[override]]
4646
name = "k8s.io/api"
47-
version = "kubernetes-1.12.3"
47+
version = "kubernetes-1.13.1"
4848
4949
[[override]]
5050
name = "k8s.io/apimachinery"
51-
version = "kubernetes-1.12.3"
51+
version = "kubernetes-1.13.1"
5252
5353
[[override]]
5454
name = "k8s.io/apiextensions-apiserver"
55-
version = "kubernetes-1.12.3"
55+
version = "kubernetes-1.13.1"
5656
5757
[[override]]
5858
name = "k8s.io/apiserver"
59-
version = "kubernetes-1.12.3"
59+
version = "kubernetes-1.13.1"
6060
6161
[[override]]
6262
name = "k8s.io/client-go"
63-
version = "kubernetes-1.12.3"
63+
version = "kubernetes-1.13.1"
6464
6565
[[override]]
6666
name = "k8s.io/cli-runtime"
67-
version = "kubernetes-1.12.3"
67+
version = "kubernetes-1.13.1"
6868
6969
# We need overrides for the following imports because dep can't resolve them
7070
# correctly. The easiest way to get this right is to use the versions that

0 commit comments

Comments
 (0)