Skip to content

Commit

Permalink
pkg/scaffold: update to controller-runtime v0.1.10 and k8s 1.13.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@hasbro17
hasbro17 committed Jan 29, 2019
1 parent d7a2032 commit cc1cf8e
Show file tree
Hide file tree
Showing 9 changed files with 224 additions and 259 deletions.
391 changes: 178 additions & 213 deletions Gopkg.lock
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions Gopkg.toml
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
[[override]]
name = "k8s.io/kubernetes"
version = "=1.12.3"
version = "=1.13.1"

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

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

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

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

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

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

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

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

[[constraint]]
name = "github.com/sergi/go-diff"
Expand All @@ -49,7 +49,7 @@
[[override]]
name = "k8s.io/kube-aggregator"
# Required for operator-lifecycle-manager version compatibility.
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"

[[constraint]]
name = "github.com/sirupsen/logrus"
Expand Down
6 changes: 3 additions & 3 deletions pkg/scaffold/ansible/gopkgtoml.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ const gopkgTomlTmpl = `[[constraint]]
[[override]]
name = "k8s.io/api"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"
[[override]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"
[[override]]
name = "k8s.io/client-go"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"
[prune]
go-tests = true
Expand Down
1 change: 1 addition & 0 deletions pkg/scaffold/cmd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import (
"github.com/example-inc/app-operator/pkg/apis"
"github.com/example-inc/app-operator/pkg/controller"
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/leader"
"github.com/operator-framework/operator-sdk/pkg/metrics"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scaffold/controller_kind.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
"sigs.k8s.io/controller-runtime/pkg/source"
)
Expand Down
1 change: 1 addition & 0 deletions pkg/scaffold/controller_kind_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import (
"context"
appv1alpha1 "github.com/example-inc/app-operator/pkg/apis/app/v1alpha1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
25 changes: 12 additions & 13 deletions pkg/scaffold/gopkgtoml.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,42 +49,41 @@ required = [
"k8s.io/code-generator/cmd/client-gen",
"k8s.io/code-generator/cmd/lister-gen",
"k8s.io/code-generator/cmd/informer-gen",
"k8s.io/code-generator/cmd/openapi-gen",
"k8s.io/gengo/args",
]
[[override]]
name = "k8s.io/code-generator"
# revision for tag "kubernetes-1.12.3"
revision = "3dcf91f64f638563e5106f21f50c31fa361c918d"
# revision for tag "kubernetes-1.13.1"
revision = "c2090bec4d9b1fb25de3812f868accc2bc9ecbae"
[[override]]
name = "k8s.io/api"
# revision for tag "kubernetes-1.12.3"
revision = "b503174bad5991eb66f18247f52e41c3258f6348"
# revision for tag "kubernetes-1.13.1"
revision = "05914d821849570fba9eacfb29466f2d8d3cd229"
[[override]]
name = "k8s.io/apiextensions-apiserver"
# revision for tag "kubernetes-1.12.3"
revision = "0cd23ebeb6882bd1cdc2cb15fc7b2d72e8a86a5b"
# revision for tag "kubernetes-1.13.1"
revision = "0fe22c71c47604641d9aa352c785b7912c200562"
[[override]]
name = "k8s.io/apimachinery"
# revision for tag "kubernetes-1.12.3"
revision = "eddba98df674a16931d2d4ba75edc3a389bf633a"
# revision for tag "kubernetes-1.13.1"
revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd"
[[override]]
name = "k8s.io/client-go"
# revision for tag "kubernetes-1.12.3"
revision = "d082d5923d3cc0bfbb066ee5fbdea3d0ca79acf8"
# revision for tag "kubernetes-1.13.1"
revision = "8d9ed539ba3134352c586810e749e58df4e94e4f"
[[override]]
name = "github.com/coreos/prometheus-operator"
version = "=v0.26.0"
[[override]]
name = "sigs.k8s.io/controller-runtime"
version = "=v0.1.8"
version = "=v0.1.10"
[[constraint]]
name = "github.com/operator-framework/operator-sdk"
Expand All @@ -93,7 +92,7 @@ required = [
# version = "=v0.4.0" #osdk_version_annotation
[[override]]
name = "k8s.io/kube-openapi"
name = "k8s.io/kube-openapi"
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
[prune]
Expand Down
25 changes: 12 additions & 13 deletions pkg/scaffold/gopkgtoml_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,42 +41,41 @@ required = [
"k8s.io/code-generator/cmd/client-gen",
"k8s.io/code-generator/cmd/lister-gen",
"k8s.io/code-generator/cmd/informer-gen",
"k8s.io/code-generator/cmd/openapi-gen",
"k8s.io/gengo/args",
]
[[override]]
name = "k8s.io/code-generator"
# revision for tag "kubernetes-1.12.3"
revision = "3dcf91f64f638563e5106f21f50c31fa361c918d"
# revision for tag "kubernetes-1.13.1"
revision = "c2090bec4d9b1fb25de3812f868accc2bc9ecbae"
[[override]]
name = "k8s.io/api"
# revision for tag "kubernetes-1.12.3"
revision = "b503174bad5991eb66f18247f52e41c3258f6348"
# revision for tag "kubernetes-1.13.1"
revision = "05914d821849570fba9eacfb29466f2d8d3cd229"
[[override]]
name = "k8s.io/apiextensions-apiserver"
# revision for tag "kubernetes-1.12.3"
revision = "0cd23ebeb6882bd1cdc2cb15fc7b2d72e8a86a5b"
# revision for tag "kubernetes-1.13.1"
revision = "0fe22c71c47604641d9aa352c785b7912c200562"
[[override]]
name = "k8s.io/apimachinery"
# revision for tag "kubernetes-1.12.3"
revision = "eddba98df674a16931d2d4ba75edc3a389bf633a"
# revision for tag "kubernetes-1.13.1"
revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd"
[[override]]
name = "k8s.io/client-go"
# revision for tag "kubernetes-1.12.3"
revision = "d082d5923d3cc0bfbb066ee5fbdea3d0ca79acf8"
# revision for tag "kubernetes-1.13.1"
revision = "8d9ed539ba3134352c586810e749e58df4e94e4f"
[[override]]
name = "github.com/coreos/prometheus-operator"
version = "=v0.26.0"
[[override]]
name = "sigs.k8s.io/controller-runtime"
version = "=v0.1.8"
version = "=v0.1.10"
[[constraint]]
name = "github.com/operator-framework/operator-sdk"
Expand All @@ -85,7 +84,7 @@ required = [
# version = "=v0.4.0" #osdk_version_annotation
[[override]]
name = "k8s.io/kube-openapi"
name = "k8s.io/kube-openapi"
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
[prune]
Expand Down
12 changes: 6 additions & 6 deletions pkg/scaffold/helm/gopkgtoml.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,27 @@ const gopkgTomlTmpl = `[[constraint]]
[[override]]
name = "k8s.io/api"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"
[[override]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"
[[override]]
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"
[[override]]
name = "k8s.io/apiserver"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"
[[override]]
name = "k8s.io/client-go"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"
[[override]]
name = "k8s.io/cli-runtime"
version = "kubernetes-1.12.3"
version = "kubernetes-1.13.1"
# We need overrides for the following imports because dep can't resolve them
# correctly. The easiest way to get this right is to use the versions that
Expand Down

0 comments on commit cc1cf8e

Please sign in to comment.