Skip to content

Commit e0342c4

Browse files
andy2046joelanford
authored andcommitted
Upgrade the version of the dependency controller-runtime from v0.1.10 to v0.1.12 (#1612)
* feat(Upgrade controller-runtime): vendor files * feat(Upgrade controller-runtime): Update Changelog * feat(Upgrade controller-runtime): Update doc/user/unit-testing.md * feat(Upgrade controller-runtime): Update kubernetes from kubernetes-1.13.1 to kubernetes-1.13.4
1 parent 261d8d5 commit e0342c4

File tree

23 files changed

+242
-112
lines changed

23 files changed

+242
-112
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
### Changed
1717

18+
- Upgrade the version of the dependency [controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from `v0.1.10` to `v0.1.12`. ([#1612](https://github.com/operator-framework/operator-sdk/pull/1612))
1819
- Remove TypeMeta declaration from the implementation of the objects ([#1462](https://github.com/operator-framework/operator-sdk/pull/1462/))
1920
- Relaxed API version format check when parsing `pkg/apis` in code generators. API dir structures can now be of the format `pkg/apis/<group>/<anything>`, where `<anything>` was previously required to be in the Kubernetes version format, ex. `v1alpha1`. ([#1525](https://github.com/operator-framework/operator-sdk/pull/1525))
2021
- The SDK and operator projects will work outside of `$GOPATH/src` when using [Go modules](https://github.com/golang/go/wiki/Modules). ([#1475](https://github.com/operator-framework/operator-sdk/pull/1475))

Gopkg.lock

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

Gopkg.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
[[override]]
22
name = "k8s.io/api"
3-
version = "kubernetes-1.13.1"
3+
version = "kubernetes-1.13.4"
44

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

99
[[override]]
1010
name = "k8s.io/apiextensions-apiserver"
11-
version = "kubernetes-1.13.1"
11+
version = "kubernetes-1.13.4"
1212

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

1717
[[override]]
1818
name = "k8s.io/client-go"
19-
version = "kubernetes-1.13.1"
19+
version = "kubernetes-1.13.4"
2020

2121
[[override]]
2222
name = "k8s.io/cli-runtime"
23-
version = "kubernetes-1.13.1"
23+
version = "kubernetes-1.13.4"
2424

2525
[[override]]
2626
name = "k8s.io/kube-openapi"
2727
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
2828

2929
[[override]]
3030
name = "k8s.io/code-generator"
31-
version = "kubernetes-1.13.1"
31+
version = "kubernetes-1.13.4"
3232

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

3737
# This override revision has a fix that allows CRD unit tests to run correctly.
3838
# Remove once v0.1.11 is released.
@@ -55,7 +55,7 @@
5555
[[override]]
5656
name = "k8s.io/kube-aggregator"
5757
# Required for operator-lifecycle-manager version compatibility.
58-
version = "kubernetes-1.13.1"
58+
version = "kubernetes-1.13.4"
5959

6060
[[constraint]]
6161
name = "github.com/sirupsen/logrus"

doc/user/unit-testing.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ The `controller-runtime`'s fake client exposes the same set of operations as a t
2323

2424
```Go
2525
import (
26+
"context"
2627
"testing"
28+
2729
cachev1alpha1 "github.com/example-inc/memcached-operator/pkg/apis/cache/v1alpha1"
2830
"k8s.io/apimachinery/pkg/runtime"
31+
"sigs.k8s.io/controller-runtime/pkg/client"
2932
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3033
)
3134

@@ -36,6 +39,9 @@ func TestMemcachedController(t *testing.T) {
3639
ObjectMeta: metav1.ObjectMeta{
3740
Name: "memcached",
3841
Namespace: "memcached-operator",
42+
Labels: map[string]string{
43+
"label-key": "label-value",
44+
},
3945
},
4046
}
4147

@@ -44,6 +50,15 @@ func TestMemcachedController(t *testing.T) {
4450

4551
// Create a fake client to mock API calls.
4652
cl := fake.NewFakeClient(objs...)
53+
54+
// List Memcached objects filtering by labels
55+
memcachedList := &cachev1alpha1.MemcachedList{}
56+
err := cl.List(context.TODO(), client.MatchingLabels(map[string]string{
57+
"label-key": "label-value",
58+
}), memcachedList)
59+
if err != nil {
60+
t.Fatalf("list memcached: (%v)", err)
61+
}
4762
...
4863
}
4964
```

internal/pkg/scaffold/ansible/go_mod.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,18 @@ require (
8989
k8s.io/klog v0.2.0 // indirect
9090
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
9191
k8s.io/kubernetes v1.14.1 // indirect
92-
sigs.k8s.io/controller-runtime v0.1.10
92+
sigs.k8s.io/controller-runtime v0.1.12
9393
sigs.k8s.io/controller-tools v0.1.10
9494
sigs.k8s.io/testing_frameworks v0.1.1 // indirect
9595
sigs.k8s.io/yaml v1.1.0 // indirect
9696
)
9797
98-
// Pinned to kubernetes-1.13.1
98+
// Pinned to kubernetes-1.13.4
9999
replace (
100-
k8s.io/api => k8s.io/api v0.0.0-20181213150558-05914d821849
101-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
102-
k8s.io/client-go => k8s.io/client-go v0.0.0-20181213151034-8d9ed539ba31
103-
k8s.io/kubernetes => k8s.io/kubernetes v1.13.1
100+
k8s.io/api => k8s.io/api v0.0.0-20190222131558-5cb15d344471
101+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221124651-86fb29eff628
102+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
103+
k8s.io/kubernetes => k8s.io/kubernetes v1.13.4
104104
)
105105
106106
replace github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0

internal/pkg/scaffold/ansible/gopkgtoml.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ const gopkgTomlTmpl = `[[constraint]]
4343
4444
[[override]]
4545
name = "k8s.io/api"
46-
version = "kubernetes-1.13.1"
46+
version = "kubernetes-1.13.4"
4747
4848
[[override]]
4949
name = "k8s.io/apimachinery"
50-
version = "kubernetes-1.13.1"
50+
version = "kubernetes-1.13.4"
5151
5252
[[override]]
5353
name = "k8s.io/client-go"
54-
version = "kubernetes-1.13.1"
54+
version = "kubernetes-1.13.4"
5555
5656
[prune]
5757
go-tests = true

internal/pkg/scaffold/go_mod.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,22 @@ require (
6969
k8s.io/client-go v2.0.0-alpha.0.0.20181126152608-d082d5923d3c+incompatible
7070
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
7171
k8s.io/kube-state-metrics v1.6.0 // indirect
72-
sigs.k8s.io/controller-runtime v0.1.10
72+
sigs.k8s.io/controller-runtime v0.1.12
7373
sigs.k8s.io/controller-tools v0.1.10
7474
sigs.k8s.io/testing_frameworks v0.1.0 // indirect
7575
)
7676
77-
// Pinned to kubernetes-1.13.1
77+
// Pinned to kubernetes-1.13.4
7878
replace (
79-
k8s.io/api => k8s.io/api v0.0.0-20181213150558-05914d821849
80-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476
81-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
82-
k8s.io/client-go => k8s.io/client-go v0.0.0-20181213151034-8d9ed539ba31
79+
k8s.io/api => k8s.io/api v0.0.0-20190222131558-5cb15d344471
80+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236
81+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221124651-86fb29eff628
82+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
8383
)
8484
8585
replace (
8686
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
87-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10
87+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.12
8888
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
8989
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
9090
)

internal/pkg/scaffold/go_mod_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,22 @@ require (
7070
k8s.io/client-go v2.0.0-alpha.0.0.20181126152608-d082d5923d3c+incompatible
7171
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
7272
k8s.io/kube-state-metrics v1.6.0 // indirect
73-
sigs.k8s.io/controller-runtime v0.1.10
73+
sigs.k8s.io/controller-runtime v0.1.12
7474
sigs.k8s.io/controller-tools v0.1.10
7575
sigs.k8s.io/testing_frameworks v0.1.0 // indirect
7676
)
7777
78-
// Pinned to kubernetes-1.13.1
78+
// Pinned to kubernetes-1.13.4
7979
replace (
80-
k8s.io/api => k8s.io/api v0.0.0-20181213150558-05914d821849
81-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476
82-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
83-
k8s.io/client-go => k8s.io/client-go v0.0.0-20181213151034-8d9ed539ba31
80+
k8s.io/api => k8s.io/api v0.0.0-20190222131558-5cb15d344471
81+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236
82+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221124651-86fb29eff628
83+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
8484
)
8585
8686
replace (
8787
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
88-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10
88+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.12
8989
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
9090
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
9191
)

internal/pkg/scaffold/gopkgtoml.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,23 @@ required = [
5050
5151
[[override]]
5252
name = "k8s.io/api"
53-
# revision for tag "kubernetes-1.13.1"
54-
revision = "05914d821849570fba9eacfb29466f2d8d3cd229"
53+
# revision for tag "kubernetes-1.13.4"
54+
revision = "5cb15d34447165a97c76ed5a60e4e99c8a01ecfe"
5555
5656
[[override]]
5757
name = "k8s.io/apiextensions-apiserver"
58-
# revision for tag "kubernetes-1.13.1"
59-
revision = "0fe22c71c47604641d9aa352c785b7912c200562"
58+
# revision for tag "kubernetes-1.13.4"
59+
revision = "d002e88f6236312f0289d9d1deab106751718ff0"
6060
6161
[[override]]
6262
name = "k8s.io/apimachinery"
63-
# revision for tag "kubernetes-1.13.1"
64-
revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd"
63+
# revision for tag "kubernetes-1.13.4"
64+
revision = "86fb29eff6288413d76bd8506874fddd9fccdff0"
6565
6666
[[override]]
6767
name = "k8s.io/client-go"
68-
# revision for tag "kubernetes-1.13.1"
69-
revision = "8d9ed539ba3134352c586810e749e58df4e94e4f"
68+
# revision for tag "kubernetes-1.13.4"
69+
revision = "b40b2a5939e43f7ffe0028ad67586b7ce50bb675"
7070
7171
[[override]]
7272
name = "github.com/coreos/prometheus-operator"
@@ -78,7 +78,7 @@ required = [
7878
7979
[[override]]
8080
name = "sigs.k8s.io/controller-runtime"
81-
version = "=v0.1.10"
81+
version = "=v0.1.12"
8282
8383
[[constraint]]
8484
name = "github.com/operator-framework/operator-sdk"

0 commit comments

Comments
 (0)