Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade the version of the dependency controller-runtime from v0.1.10 to v0.1.12 #1612

Merged
merged 9 commits into from
Jul 1, 2019
Merged

Upgrade the version of the dependency controller-runtime from v0.1.10 to v0.1.12 #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bbd9ed6
feat(Upgrade controller-runtime): vendor files
andy2046 Jun 28, 2019
efd3019
feat(Upgrade controller-runtime): Update Changelog
andy2046 Jun 28, 2019
511ef52
feat(Upgrade controller-runtime): Fix CI error
andy2046 Jun 28, 2019
1277681
feat(Upgrade controller-runtime): Update Changelog.md
andy2046 Jun 28, 2019
f237d6f
feat(Upgrade controller-runtime): Update doc/user/unit-testing.md
andy2046 Jun 28, 2019
6c46052
feat(Upgrade controller-runtime): resolve conflict in Changelog.md
andy2046 Jun 29, 2019
d48ae8d
feat(Upgrade controller-runtime): Update kubernetes from kubernetes-1…
andy2046 Jun 29, 2019
a405a11
Merge branch 'master' into UPGRADE-CONTROLLER-RUNTIME
andy2046 Jun 29, 2019
54e9fb4
feat(Upgrade controller-runtime): Update doc/user/unit-testing.md
andy2046 Jun 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

### Changed

- 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))
- Remove TypeMeta declaration from the implementation of the objects ([#1462](https://github.com/operator-framework/operator-sdk/pull/1462/))
- 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))
- 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))
Expand Down
43 changes: 22 additions & 21 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
[[override]]
name = "k8s.io/api"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

[[override]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

[[override]]
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

[[override]]
name = "k8s.io/apiserver"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

[[override]]
name = "k8s.io/client-go"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

[[override]]
name = "k8s.io/cli-runtime"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

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

[[override]]
name = "k8s.io/code-generator"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

[[constraint]]
name = "sigs.k8s.io/controller-runtime"
version = "=v0.1.10"
version = "=v0.1.12"

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

[[constraint]]
name = "github.com/sirupsen/logrus"
Expand Down
15 changes: 15 additions & 0 deletions doc/user/unit-testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ The `controller-runtime`'s fake client exposes the same set of operations as a t

```Go
import (
"context"
"testing"

cachev1alpha1 "github.com/example-inc/memcached-operator/pkg/apis/cache/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
)

Expand All @@ -36,6 +39,9 @@ func TestMemcachedController(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "memcached",
Namespace: "memcached-operator",
Labels: map[string]string{
"label-key": "label-value",
},
},
}

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

// Create a fake client to mock API calls.
cl := fake.NewFakeClient(objs...)

// List Memcached objects filtering by labels
memcachedList := &cachev1alpha1.MemcachedList{}
err := cl.List(context.TODO(), client.MatchingLabels(map[string]string{
"label-key": "label-value",
}), memcachedList)
if err != nil {
t.Fatalf("list memcached: (%v)", err)
}
...
}
```
Expand Down
12 changes: 6 additions & 6 deletions internal/pkg/scaffold/ansible/go_mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,18 @@ require (
k8s.io/klog v0.2.0 // indirect
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
k8s.io/kubernetes v1.14.1 // indirect
sigs.k8s.io/controller-runtime v0.1.10
sigs.k8s.io/controller-runtime v0.1.12
sigs.k8s.io/controller-tools v0.1.10
sigs.k8s.io/testing_frameworks v0.1.1 // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
)

// Pinned to kubernetes-1.13.1
// Pinned to kubernetes-1.13.4
replace (
k8s.io/api => k8s.io/api v0.0.0-20181213150558-05914d821849
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
k8s.io/client-go => k8s.io/client-go v0.0.0-20181213151034-8d9ed539ba31
k8s.io/kubernetes => k8s.io/kubernetes v1.13.1
k8s.io/api => k8s.io/api v0.0.0-20190222131558-5cb15d344471
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221124651-86fb29eff628
k8s.io/client-go => k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
k8s.io/kubernetes => k8s.io/kubernetes v1.13.4
)

replace github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
Expand Down
6 changes: 3 additions & 3 deletions internal/pkg/scaffold/ansible/gopkgtoml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ const gopkgTomlTmpl = `[[constraint]]

[[override]]
name = "k8s.io/api"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

[[override]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

[[override]]
name = "k8s.io/client-go"
version = "kubernetes-1.13.1"
version = "kubernetes-1.13.4"

[prune]
go-tests = true
Expand Down
14 changes: 7 additions & 7 deletions internal/pkg/scaffold/go_mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,22 @@ require (
k8s.io/client-go v2.0.0-alpha.0.0.20181126152608-d082d5923d3c+incompatible
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
k8s.io/kube-state-metrics v1.6.0 // indirect
sigs.k8s.io/controller-runtime v0.1.10
sigs.k8s.io/controller-runtime v0.1.12
sigs.k8s.io/controller-tools v0.1.10
sigs.k8s.io/testing_frameworks v0.1.0 // indirect
)

// Pinned to kubernetes-1.13.1
// Pinned to kubernetes-1.13.4
replace (
k8s.io/api => k8s.io/api v0.0.0-20181213150558-05914d821849
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
k8s.io/client-go => k8s.io/client-go v0.0.0-20181213151034-8d9ed539ba31
k8s.io/api => k8s.io/api v0.0.0-20190222131558-5cb15d344471
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221124651-86fb29eff628
k8s.io/client-go => k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
)

replace (
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.12
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
)
Expand Down
14 changes: 7 additions & 7 deletions internal/pkg/scaffold/go_mod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,22 @@ require (
k8s.io/client-go v2.0.0-alpha.0.0.20181126152608-d082d5923d3c+incompatible
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
k8s.io/kube-state-metrics v1.6.0 // indirect
sigs.k8s.io/controller-runtime v0.1.10
sigs.k8s.io/controller-runtime v0.1.12
sigs.k8s.io/controller-tools v0.1.10
sigs.k8s.io/testing_frameworks v0.1.0 // indirect
)

// Pinned to kubernetes-1.13.1
// Pinned to kubernetes-1.13.4
replace (
k8s.io/api => k8s.io/api v0.0.0-20181213150558-05914d821849
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
k8s.io/client-go => k8s.io/client-go v0.0.0-20181213151034-8d9ed539ba31
k8s.io/api => k8s.io/api v0.0.0-20190222131558-5cb15d344471
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221124651-86fb29eff628
k8s.io/client-go => k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
)

replace (
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.12
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
)
Expand Down
18 changes: 9 additions & 9 deletions internal/pkg/scaffold/gopkgtoml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,23 @@ required = [

[[override]]
name = "k8s.io/api"
# revision for tag "kubernetes-1.13.1"
revision = "05914d821849570fba9eacfb29466f2d8d3cd229"
# revision for tag "kubernetes-1.13.4"
revision = "5cb15d34447165a97c76ed5a60e4e99c8a01ecfe"

[[override]]
name = "k8s.io/apiextensions-apiserver"
# revision for tag "kubernetes-1.13.1"
revision = "0fe22c71c47604641d9aa352c785b7912c200562"
# revision for tag "kubernetes-1.13.4"
revision = "d002e88f6236312f0289d9d1deab106751718ff0"

[[override]]
name = "k8s.io/apimachinery"
# revision for tag "kubernetes-1.13.1"
revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd"
# revision for tag "kubernetes-1.13.4"
revision = "86fb29eff6288413d76bd8506874fddd9fccdff0"

[[override]]
name = "k8s.io/client-go"
# revision for tag "kubernetes-1.13.1"
revision = "8d9ed539ba3134352c586810e749e58df4e94e4f"
# revision for tag "kubernetes-1.13.4"
revision = "b40b2a5939e43f7ffe0028ad67586b7ce50bb675"

[[override]]
name = "github.com/coreos/prometheus-operator"
Expand All @@ -78,7 +78,7 @@ required = [

[[override]]
name = "sigs.k8s.io/controller-runtime"
version = "=v0.1.10"
version = "=v0.1.12"

[[constraint]]
name = "github.com/operator-framework/operator-sdk"
Expand Down
Loading