Skip to content
This repository was archived by the owner on Nov 18, 2020. It is now read-only.

Commit 6e202d6

Browse files
authored
Merge pull request #50 from estroz/k8s-1.12.3-update
K8s 1.12.3 update
2 parents 3af4c87 + f7a2056 commit 6e202d6

File tree

600 files changed

+52854
-9750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

600 files changed

+52854
-9750
lines changed

memcached-operator/Gopkg.lock

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

memcached-operator/Gopkg.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,38 @@ required = [
1212

1313
[[override]]
1414
name = "k8s.io/code-generator"
15-
# revision for tag "kubernetes-1.11.2"
16-
revision = "6702109cc68eb6fe6350b83e14407c8d7309fd1a"
15+
# revision for tag "kubernetes-1.12.3"
16+
revision = "3dcf91f64f638563e5106f21f50c31fa361c918d"
1717

1818
[[override]]
1919
name = "k8s.io/api"
20-
# revision for tag "kubernetes-1.11.2"
21-
revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"
20+
# revision for tag "kubernetes-1.12.3"
21+
revision = "b503174bad5991eb66f18247f52e41c3258f6348"
2222

2323
[[override]]
2424
name = "k8s.io/apiextensions-apiserver"
25-
# revision for tag "kubernetes-1.11.2"
26-
revision = "408db4a50408e2149acbd657bceb2480c13cb0a4"
25+
# revision for tag "kubernetes-1.12.3"
26+
revision = "0cd23ebeb6882bd1cdc2cb15fc7b2d72e8a86a5b"
2727

2828
[[override]]
2929
name = "k8s.io/apimachinery"
30-
# revision for tag "kubernetes-1.11.2"
31-
revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"
30+
# revision for tag "kubernetes-1.12.3"
31+
revision = "eddba98df674a16931d2d4ba75edc3a389bf633a"
3232

3333
[[override]]
3434
name = "k8s.io/client-go"
35-
# revision for tag "kubernetes-1.11.2"
36-
revision = "1f13a808da65775f22cbf47862c4e5898d8f4ca1"
35+
# revision for tag "kubernetes-1.12.3"
36+
revision = "d082d5923d3cc0bfbb066ee5fbdea3d0ca79acf8"
3737

3838
[[override]]
3939
name = "sigs.k8s.io/controller-runtime"
40-
version = "v0.1.4"
40+
version = "=v0.1.8"
4141

4242
[[constraint]]
4343
name = "github.com/operator-framework/operator-sdk"
4444
# The version rule is used for a specific release and the master branch for in between releases.
4545
branch = "master" #osdk_branch_annotation
46-
# version = "=v0.0.6" #osdk_version_annotation
46+
# version = "=v0.2.0" #osdk_version_annotation
4747

4848
[prune]
4949
go-tests = true

memcached-operator/pkg/controller/memcached/memcached_controller.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,6 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
140140
listOps := &client.ListOptions{
141141
Namespace: memcached.Namespace,
142142
LabelSelector: labelSelector,
143-
// HACK: due to a fake client bug, ListOptions.Raw.TypeMeta must be
144-
// explicitly populated for testing.
145-
//
146-
// See https://github.com/kubernetes-sigs/controller-runtime/issues/168
147-
Raw: &metav1.ListOptions{
148-
TypeMeta: metav1.TypeMeta{
149-
Kind: "Memcached",
150-
APIVersion: cachev1alpha1.SchemeGroupVersion.Version,
151-
},
152-
},
153143
}
154144
err = r.client.List(context.TODO(), listOps, podList)
155145
if err != nil {

memcached-operator/vendor/github.com/beorn7/perks/LICENSE

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

0 commit comments

Comments
 (0)