UPSTREAM: 43301: add APIService conditions

openshift · May 26, 2017 · dc2a2aa · dc2a2aa
1 parent 3ecdeba
commit dc2a2aa
Show file tree

Hide file tree

Showing 30 changed files with 2,397 additions and 32 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/vendor/k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/authentication/v1beta1/generated.proto b/vendor/k8s.io/kubernetes/pkg/apis/authentication/v1beta1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/authorization/v1/generated.proto b/vendor/k8s.io/kubernetes/pkg/apis/authorization/v1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/authorization/v1beta1/generated.proto b/vendor/k8s.io/kubernetes/pkg/apis/authorization/v1beta1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/certificates/v1beta1/generated.proto b/vendor/k8s.io/kubernetes/pkg/apis/certificates/v1beta1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1/generated.proto b/vendor/k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/policy/v1beta1/generated.proto b/vendor/k8s.io/kubernetes/pkg/apis/policy/v1beta1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/rbac/v1alpha1/generated.proto b/vendor/k8s.io/kubernetes/pkg/apis/rbac/v1alpha1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/rbac/v1beta1/generated.proto b/vendor/k8s.io/kubernetes/pkg/apis/rbac/v1beta1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/storage/v1beta1/generated.proto b/vendor/k8s.io/kubernetes/pkg/apis/storage/v1beta1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/Godeps/Godeps.json b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/Godeps/Godeps.json
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/Godeps/Godeps.json
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/Godeps/Godeps.json b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/Godeps/Godeps.json
diff --git a/...o/kubernetes/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.proto b/...o/kubernetes/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.proto
diff --git a/.../k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/generated.proto b/.../k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/generated.proto
diff --git a/...io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.proto b/...io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.proto
diff --git a/...or/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.proto b/...or/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.proto
diff --git a/....io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/generated.proto b/....io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/generated.proto
diff --git a/....io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/generated.proto b/....io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/generated.proto
diff --git a/...or/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto b/...or/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.proto b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/generated.proto b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/generated.proto
diff --git a/...r/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.proto b/...r/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.proto
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
diff --git a/...or/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go b/...or/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go