Merge pull request #58446 from hzxuzhonghu/sample-controleer

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

upgrade sample-controller deployment to apps/v1

**What this PR does / why we need it**:

apps/v1 is GA

**Release note**:

```release-note
NONE
```
/assign @sttts @nikhita

Kubernetes-commit: 0dd88a1fb8615ab42f80a5f3126eb9e0f4577dd7
This commit is contained in:
Kubernetes Publisher 2018-01-19 09:42:03 -08:00
commit 8db1716370
11 changed files with 996 additions and 946 deletions

4
BUILD
View File

@ -10,7 +10,7 @@ go_library(
visibility = ["//visibility:private"],
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/apps/v1beta2:go_default_library",
"//vendor/k8s.io/api/apps/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@ -21,7 +21,7 @@ go_library(
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//vendor/k8s.io/client-go/listers/apps/v1beta2:go_default_library",
"//vendor/k8s.io/client-go/listers/apps/v1:go_default_library",
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
"//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
"//vendor/k8s.io/client-go/tools/record:go_default_library",

290
Godeps/Godeps.json generated
View File

@ -152,115 +152,115 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "e81ae94485e04294ce22cc89b480edb2a4f7f575"
"Rev": "fbe336854453ac8e27bffe14e1964555245cbd05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
@ -428,471 +428,471 @@
},
{
"ImportPath": "k8s.io/client-go/discovery",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/discovery/fake",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/apps",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1beta2",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/batch",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v2alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/certificates",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/certificates/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/core",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/core/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/events",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/events/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/extensions",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/extensions/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/internalinterfaces",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/networking",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/networking/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/policy",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/policy/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/scheduling",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/settings",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/settings/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/storage",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1beta2",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/autoscaling/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v2alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/certificates/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/core/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/events/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/extensions/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/networking/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/policy/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/settings/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1alpha1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1beta1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/pkg/version",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/rest",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/rest/watch",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/testing",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/auth",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/cache",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/metrics",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/pager",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/record",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/tools/reference",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/transport",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/util/buffer",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/util/cert",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/util/flowcontrol",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/util/homedir",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/util/integer",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/client-go/util/workqueue",
"Rev": "8a28689b296bec0a8a7a422043195a2251386977"
"Rev": "8a8517e82fc13125243513ecac9aaf98789ced90"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -21,7 +21,7 @@ import (
"time"
"github.com/golang/glog"
appsv1beta2 "k8s.io/api/apps/v1beta2"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -32,7 +32,7 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
appslisters "k8s.io/client-go/listers/apps/v1beta2"
appslisters "k8s.io/client-go/listers/apps/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"
@ -93,7 +93,7 @@ func NewController(
// obtain references to shared index informers for the Deployment and Foo
// types.
deploymentInformer := kubeInformerFactory.Apps().V1beta2().Deployments()
deploymentInformer := kubeInformerFactory.Apps().V1().Deployments()
fooInformer := sampleInformerFactory.Samplecontroller().V1alpha1().Foos()
// Create event broadcaster
@ -134,8 +134,8 @@ func NewController(
deploymentInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: controller.handleObject,
UpdateFunc: func(old, new interface{}) {
newDepl := new.(*appsv1beta2.Deployment)
oldDepl := old.(*appsv1beta2.Deployment)
newDepl := new.(*appsv1.Deployment)
oldDepl := old.(*appsv1.Deployment)
if newDepl.ResourceVersion == oldDepl.ResourceVersion {
// Periodic resync will send update events for all known Deployments.
// Two different versions of the same Deployment will always have different RVs.
@ -277,7 +277,7 @@ func (c *Controller) syncHandler(key string) error {
deployment, err := c.deploymentsLister.Deployments(foo.Namespace).Get(deploymentName)
// If the resource doesn't exist, we'll create it
if errors.IsNotFound(err) {
deployment, err = c.kubeclientset.AppsV1beta2().Deployments(foo.Namespace).Create(newDeployment(foo))
deployment, err = c.kubeclientset.AppsV1().Deployments(foo.Namespace).Create(newDeployment(foo))
}
// If an error occurs during Get/Create, we'll requeue the item so we can
@ -299,8 +299,8 @@ func (c *Controller) syncHandler(key string) error {
// number does not equal the current desired replicas on the Deployment, we
// should update the Deployment resource.
if foo.Spec.Replicas != nil && *foo.Spec.Replicas != *deployment.Spec.Replicas {
glog.V(4).Infof("Foor: %d, deplR: %d", *foo.Spec.Replicas, *deployment.Spec.Replicas)
deployment, err = c.kubeclientset.AppsV1beta2().Deployments(foo.Namespace).Update(newDeployment(foo))
glog.V(4).Infof("Foo %s replicas: %d, deployment replicas: %d", name, *foo.Spec.Replicas, *deployment.Spec.Replicas)
deployment, err = c.kubeclientset.AppsV1().Deployments(foo.Namespace).Update(newDeployment(foo))
}
// If an error occurs during Update, we'll requeue the item so we can
@ -321,7 +321,7 @@ func (c *Controller) syncHandler(key string) error {
return nil
}
func (c *Controller) updateFooStatus(foo *samplev1alpha1.Foo, deployment *appsv1beta2.Deployment) error {
func (c *Controller) updateFooStatus(foo *samplev1alpha1.Foo, deployment *appsv1.Deployment) error {
// NEVER modify objects from the store. It's a read-only, local cache.
// You can use DeepCopy() to make a deep copy of original object and modify this copy
// Or create a copy manually for better performance
@ -391,12 +391,12 @@ func (c *Controller) handleObject(obj interface{}) {
// newDeployment creates a new Deployment for a Foo resource. It also sets
// the appropriate OwnerReferences on the resource so handleObject can discover
// the Foo resource that 'owns' it.
func newDeployment(foo *samplev1alpha1.Foo) *appsv1beta2.Deployment {
func newDeployment(foo *samplev1alpha1.Foo) *appsv1.Deployment {
labels := map[string]string{
"app": "nginx",
"controller": foo.Name,
}
return &appsv1beta2.Deployment{
return &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Name: foo.Spec.DeploymentName,
Namespace: foo.Namespace,
@ -408,7 +408,7 @@ func newDeployment(foo *samplev1alpha1.Foo) *appsv1beta2.Deployment {
}),
},
},
Spec: appsv1beta2.DeploymentSpec{
Spec: appsv1.DeploymentSpec{
Replicas: foo.Spec.Replicas,
Selector: &metav1.LabelSelector{
MatchLabels: labels,

File diff suppressed because it is too large Load Diff

View File

@ -185,6 +185,12 @@ message CSIPersistentVolumeSource {
// Defaults to false (read/write).
// +optional
optional bool readOnly = 3;
// Filesystem type to mount.
// Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// +optional
optional string fsType = 4;
}
// Adds and removes POSIX capabilities from running containers.
@ -3179,7 +3185,7 @@ message PodStatus {
// The Quality of Service (QOS) classification assigned to the pod based on resource requirements
// See PodQOSClass type for available QOS classes
// More info: https://github.com/kubernetes/kubernetes/blob/master/docs/design/resource-qos.md
// More info: https://git.k8s.io/community/contributors/design-proposals/node/resource-qos.md
// +optional
optional string qosClass = 9;
}

8
vendor/k8s.io/api/core/v1/types.go generated vendored
View File

@ -1730,6 +1730,12 @@ type CSIPersistentVolumeSource struct {
// Defaults to false (read/write).
// +optional
ReadOnly bool `json:"readOnly,omitempty" protobuf:"varint,3,opt,name=readOnly"`
// Filesystem type to mount.
// Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// +optional
FSType string `json:"fsType,omitempty" protobuf:"bytes,4,opt,name=fsType"`
}
// ContainerPort represents a network port in a single container.
@ -3042,7 +3048,7 @@ type PodStatus struct {
ContainerStatuses []ContainerStatus `json:"containerStatuses,omitempty" protobuf:"bytes,8,rep,name=containerStatuses"`
// The Quality of Service (QOS) classification assigned to the pod based on resource requirements
// See PodQOSClass type for available QOS classes
// More info: https://github.com/kubernetes/kubernetes/blob/master/docs/design/resource-qos.md
// More info: https://git.k8s.io/community/contributors/design-proposals/node/resource-qos.md
// +optional
QOSClass PodQOSClass `json:"qosClass,omitempty" protobuf:"bytes,9,rep,name=qosClass"`
}

View File

@ -121,6 +121,7 @@ var map_CSIPersistentVolumeSource = map[string]string{
"driver": "Driver is the name of the driver to use for this volume. Required.",
"volumeHandle": "VolumeHandle is the unique volume name returned by the CSI volume plugins CreateVolume to refer to the volume on all subsequent calls. Required.",
"readOnly": "Optional: The value to pass to ControllerPublishVolumeRequest. Defaults to false (read/write).",
"fsType": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.",
}
func (CSIPersistentVolumeSource) SwaggerDoc() map[string]string {
@ -1531,7 +1532,7 @@ var map_PodStatus = map[string]string{
"startTime": "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.",
"initContainerStatuses": "The list has one entry per init container in the manifest. The most recent successful init container will have ready = true, the most recently started container will have startTime set. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-and-container-status",
"containerStatuses": "The list has one entry per container in the manifest. Each entry is currently the output of `docker inspect`. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-and-container-status",
"qosClass": "The Quality of Service (QOS) classification assigned to the pod based on resource requirements See PodQOSClass type for available QOS classes More info: https://github.com/kubernetes/kubernetes/blob/master/docs/design/resource-qos.md",
"qosClass": "The Quality of Service (QOS) classification assigned to the pod based on resource requirements See PodQOSClass type for available QOS classes More info: https://git.k8s.io/community/contributors/design-proposals/node/resource-qos.md",
}
func (PodStatus) SwaggerDoc() map[string]string {

View File

@ -33,7 +33,7 @@ option go_package = "v1alpha1";
// integer value. The value can be any valid integer.
message PriorityClass {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
// +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
@ -55,7 +55,7 @@ message PriorityClass {
// PriorityClassList is a collection of priority classes.
message PriorityClassList {
// Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
// +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;

View File

@ -29,7 +29,7 @@ import (
type PriorityClass struct {
metav1.TypeMeta `json:",inline"`
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
// +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -54,7 +54,7 @@ type PriorityClass struct {
type PriorityClassList struct {
metav1.TypeMeta `json:",inline"`
// Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
// +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

View File

@ -29,7 +29,7 @@ package v1alpha1
// AUTO-GENERATED FUNCTIONS START HERE
var map_PriorityClass = map[string]string{
"": "PriorityClass defines mapping from a priority class name to the priority integer value. The value can be any valid integer.",
"metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
"metadata": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
"value": "The value of this priority class. This is the actual priority that pods receive when they have the name of this class in their pod spec.",
"globalDefault": "globalDefault specifies whether this PriorityClass should be considered as the default priority for pods that do not have any priority class.",
"description": "description is an arbitrary string that usually provides guidelines on when this priority class should be used.",
@ -41,7 +41,7 @@ func (PriorityClass) SwaggerDoc() map[string]string {
var map_PriorityClassList = map[string]string{
"": "PriorityClassList is a collection of priority classes.",
"metadata": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
"metadata": "Standard list metadata More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
"items": "items is the list of PriorityClasses",
}

View File

@ -108,8 +108,8 @@ func NewNamedReflector(name string, lw ListerWatcher, expectedType interface{},
reflectorSuffix := atomic.AddInt64(&reflectorDisambiguator, 1)
r := &Reflector{
name: name,
// we need this to be unique per process (some names are still the same)but obvious who it belongs to
metrics: newReflectorMetrics(makeValidPromethusMetricLabel(fmt.Sprintf("reflector_"+name+"_%d", reflectorSuffix))),
// we need this to be unique per process (some names are still the same) but obvious who it belongs to
metrics: newReflectorMetrics(makeValidPrometheusMetricLabel(fmt.Sprintf("reflector_"+name+"_%d", reflectorSuffix))),
listerWatcher: lw,
store: store,
expectedType: reflect.TypeOf(expectedType),
@ -120,7 +120,7 @@ func NewNamedReflector(name string, lw ListerWatcher, expectedType interface{},
return r
}
func makeValidPromethusMetricLabel(in string) string {
func makeValidPrometheusMetricLabel(in string) string {
// this isn't perfect, but it removes our common characters
return strings.NewReplacer("/", "_", ".", "_", "-", "_", ":", "_").Replace(in)
}