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

K8s 1.12.3 update #50

Merged
merged 3 commits into from
Dec 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
94 changes: 81 additions & 13 deletions memcached-operator/Gopkg.lock

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

24 changes: 12 additions & 12 deletions memcached-operator/Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,38 @@ required = [

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

[[override]]
name = "k8s.io/api"
# revision for tag "kubernetes-1.11.2"
revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"
# revision for tag "kubernetes-1.12.3"
revision = "b503174bad5991eb66f18247f52e41c3258f6348"

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

[[override]]
name = "k8s.io/apimachinery"
# revision for tag "kubernetes-1.11.2"
revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"
# revision for tag "kubernetes-1.12.3"
revision = "eddba98df674a16931d2d4ba75edc3a389bf633a"

[[override]]
name = "k8s.io/client-go"
# revision for tag "kubernetes-1.11.2"
revision = "1f13a808da65775f22cbf47862c4e5898d8f4ca1"
# revision for tag "kubernetes-1.12.3"
revision = "d082d5923d3cc0bfbb066ee5fbdea3d0ca79acf8"

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

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

[prune]
go-tests = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,6 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
listOps := &client.ListOptions{
Namespace: memcached.Namespace,
LabelSelector: labelSelector,
// HACK: due to a fake client bug, ListOptions.Raw.TypeMeta must be
// explicitly populated for testing.
//
// See https://github.com/kubernetes-sigs/controller-runtime/issues/168
Raw: &metav1.ListOptions{
TypeMeta: metav1.TypeMeta{
Kind: "Memcached",
APIVersion: cachev1alpha1.SchemeGroupVersion.Version,
},
},
}
err = r.client.List(context.TODO(), listOps, podList)
if err != nil {
Expand Down
20 changes: 20 additions & 0 deletions memcached-operator/vendor/github.com/beorn7/perks/LICENSE

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

Loading