Commit Graph

1299 Commits

Author SHA1 Message Date
Kubernetes Submit Queue
89651077b1 Merge pull request #26981 from wfhartford/patch-1
Automatic merge from submit-queue

Fix resource requests in cassandra-daemonset.yaml

The current file fails validation because the resource request syntax is incorrect.
2016-08-14 10:14:52 -07:00
Hongchao Deng
75fe25e717 generic.Matcher -> *generic.SelectionPredicate 2016-08-13 21:52:11 -07:00
Hongchao Deng
d4afb781c3 change all PredicateFunc to use SelectionPredicate 2016-08-13 10:11:35 -07:00
Hongchao Deng
d0938094d9 move new etcd storage into cacher 2016-08-12 18:40:20 -07:00
Kubernetes Submit Queue
733fc69806 Merge pull request #29086 from 03cranec/master
Automatic merge from submit-queue

Adding Sysdig Cloud example



<!-- Reviewable:start -->
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29086)
<!-- Reviewable:end -->
2016-08-09 21:00:38 -07:00
Kubernetes Submit Queue
cdee52e5e7 Merge pull request #26790 from rmmh/bash-range
Automatic merge from submit-queue

Use bash ranges "{1..3}" instead of "$(seq 1 3)".




[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/26790)
<!-- Reviewable:end -->
2016-08-09 15:18:30 -07:00
Kubernetes Submit Queue
93f802b1a6 Merge pull request #29905 from luxas/flake_celery2
Automatic merge from submit-queue

Second attempt to fix #29585

@ixdy @fejta

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29905)
<!-- Reviewable:end -->
2016-08-09 11:54:11 -07:00
mksalawa
a806351cc3 Extract etcd options from genericapiserver. 2016-08-09 13:35:53 +02:00
Ryan Hitchman
5508e49ef5 Use bash ranges "{1..3}" instead of "$(seq 1 3)". 2016-08-08 16:23:39 -07:00
Wesley Hartford
a9162ed892 Fix typo in daemonset resource requests 2016-08-03 17:05:08 -07:00
Kubernetes Submit Queue
6b523ce6db Merge pull request #26258 from koep/examples_elasticsearch_fix
Automatic merge from submit-queue

Fix elasticsearch example volume descriptors

fixes #26257
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-08-03 11:18:43 -07:00
Lucas Käldström
56755b83cc Second attempt to fix #29585 2016-08-02 14:46:33 +03:00
k8s-merge-robot
fa1d1b1f66 Merge pull request #29574 from keegancsmith/patch-1
Automatic merge from submit-queue

Fix markdown of flexvolume lvm example link
2016-08-02 00:44:59 -07:00
Davanum Srinivas
ef0581d1e9 kubectl container - Extract version better
1. Use --client since -c is deprecated now
2. The command (./kubectl version --client | grep -o 'GitVersion:"[^"]*"')
   now returns:
      GitVersion:"v1.4.0-alpha.1.784+ed3a29bd6aeb98-dirty"
   so parse out the version better using sed

Related to #23708
2016-07-26 13:44:42 -04:00
Chris Crane
78e2110286 update munge docs again 2016-07-26 10:38:59 -07:00
Chris Crane
6e2dee56e5 Merge remote-tracking branch 'kubernetes/master' 2016-07-26 10:36:21 -07:00
Keegan Carruthers-Smith
70a1536820 Fix markdown of flexvolume lvm example link 2016-07-25 22:59:32 +02:00
Chris Crane
cd475fe172 update munge docs 2016-07-25 12:55:06 -07:00
Lucas Käldström
5db3f6d25e Add liveness probe to the flower rc in order to fix a flake 2016-07-24 00:08:52 +03:00
Chris Crane
e6f6d258b7 addressed comments 2016-07-22 17:22:46 -07:00
Tim Hockin
b829d4d4ef Merge pull request #26702 from joe2far/fix-broken-links
Fix broken warning image link in docs
2016-07-20 15:10:41 -07:00
Szymon Pyżalski
2abf70406e Info about enabling the hostpath provisioner
The README for persistent volume provisioning had information about the
hostpath provisioner for testing purposes, but lacked instructions on
how to enable it.
2016-07-19 10:17:17 +02:00
Eric Tune
bbfda4be90 Remove examples moved to docs site
Part of https://github.com/kubernetes/kubernetes/issues/23511
Left redirect in md files and deleted files intended for download.
2016-07-18 12:38:13 -07:00
k8s-merge-robot
fa174bcdaf Merge pull request #29042 from dims/fixup-imports
Automatic merge from submit-queue

Use Go canonical import paths

Add canonical imports only in existing doc.go files.
https://golang.org/doc/go1.4#canonicalimports

Fixes #29014
2016-07-18 07:23:38 -07:00
Chris Crane
cd7f4ab90b Adding Sysdig Cloud example 2016-07-17 23:42:15 -07:00
Davanum Srinivas
2b0ed014b7 Use Go canonical import paths
Add canonical imports only in existing doc.go files.
https://golang.org/doc/go1.4#canonicalimports

Fixes #29014
2016-07-16 13:48:21 -04:00
k8s-merge-robot
3a305c1cfa Merge pull request #28978 from foxish/patch-1
Automatic merge from submit-queue

Added instructions on turning on dynamic provisioning for testing.

HostPath volumes are not automatically provisioned unless we pass in `--enable-hostpath-provisioner` to the controller manager. This was not mentioned in the docs previously, leading to questions like [this](https://groups.google.com/forum/#!searchin/kubernetes-dev/mysterious/kubernetes-dev/jVk_RgAkbaY/LRX7IuCEDQAJ).
2016-07-16 08:12:54 -07:00
joe2far
88b6d4ad36 Fix broken warning image link in docs 2016-07-15 10:44:58 +01:00
k8s-merge-robot
bb2c74b709 Merge pull request #28834 from asalkeld/rbd-example
Automatic merge from submit-queue

Remove id field from rbd examples

Currently the RBD examples fail with the following error:

```
kubectl create -f examples/volumes/rbd/rbd-with-secret.json 
error validating "examples/volumes/rbd/rbd-with-secret.json": error validating data: found invalid field id for v1.Pod; if you choose to ignore these errors, turn validation off with --validate=false
```

fixes #28831
2016-07-14 20:28:58 -07:00
Anirudh Ramanathan
80d4800d4b Added instructions on turning on dynamic provisioning for testing.
HostPath volumes are not automatically provisioned unless we pass in `--enable-hostpath-provisioner` to the controller manager. This was not mentioned in the docs previously.
2016-07-14 15:58:30 -07:00
k8s-merge-robot
3a0d2d55c3 Merge pull request #28613 from a-robinson/blog
Automatic merge from submit-queue

Remove crufty blog post material that isn't actually an example.
2016-07-14 11:22:14 -07:00
joe2far
5ead89b5bb Fixed several typos 2016-07-13 15:06:24 +01:00
k8s-merge-robot
6035d88881 Merge pull request #27277 from wojtek-t/cacher_index
Automatic merge from submit-queue

Implement first version of indexing in cacher

This PR adds a first version of indexing in cacher.

It has a really significant impact on performance - __in empty 2000-node cluster, apiserver cpu usage drops by ~75%.__

Not for 1.3, but we need this soon after 1.3 is done.

@lavalamp @mqliang @davidopp @gmarek @kubernetes/sig-scalability
2016-07-13 02:45:23 -07:00
Wojciech Tyczynski
1d9bc58328 Extend Filter interface with Trigger() and use it for pods and nodes 2016-07-13 08:45:18 +02:00
Tim Hockin
faeef5c4ae Use make as the main build tool
This allows us to start building real dependencies into Makefile.

Leave old hack/* scripts in place but advise to use 'make'.  There are a few
rules that call things like 'go run' or 'build/*' that I left as-is for now.
2016-07-12 21:52:00 -07:00
k8s-merge-robot
d4df168186 Merge pull request #28703 from mulloymorrow/patch-4
Automatic merge from submit-queue

fix proxy url

<!--
Checklist for submitting a Pull Request

Please remove this comment block before submitting.

1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md).
2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md).
3. If you want this PR to automatically close an issue when it is merged,
   add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>`
   to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests).
4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below.
-->

```release-note
* Use the release-note-* labels to set the release note state 
* Clear this block to use the PR title as the release note 
-OR-
* Enter your extended release note here
```


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

fix proxy url
2016-07-12 09:16:55 -07:00
Angus Salkeld
8546981f58 Remove id field from rbd examples 2016-07-12 15:10:05 +02:00
Adrian Ursu
4ec60a1b4e Removed invalid value
id isn't a valid field in a Pod object so kubectl fails with: 

error validating "glusterfs-pod.json": error validating data: found invalid field id for v1.Pod; if you choose to ignore these errors, turn validation off with --validate=false
2016-07-11 15:29:26 +01:00
Cindy Wang
fedc513658 Consolidated examples into storage/ and volume/ folders
Search and replace for references to moved examples

Reverted find and replace paths on auto gen docs

Reverting changes to changelog

Fix bugs in test-cmd.sh

Fixed path in examples README

ran update-all successfully

Updated verify-flags exceptions to include renamed files
2016-07-08 13:34:32 -07:00
Mulloy Morrow
c86eb8dded fix proxy url
fix proxy url
2016-07-08 13:30:08 -07:00
Alex Robinson
3521a66dce Remove crufty blog post material that isn't actually an example. 2016-07-07 17:21:33 +00:00
Andrea Cosentino
5d9b21a77a Fixed a little typo in Cassandra example Readme 2016-07-07 17:03:31 +02:00
Janet Kuo
6a60f8e542 Moving kubernetes/redis:v1 image to gcr.io 2016-07-06 11:03:38 -07:00
David McMahon
ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
Christian Koep
58be48349c
Fix elasticsearch example volume descriptors
This makes the elasticsearch example work with Kubernetes 1.1.x.
2016-06-27 17:39:55 +02:00
Brandon Philips
5c24f0313e examples/flexvolume: fix README link
nginx.yaml wasn't actually linked, fix this.
2016-06-24 14:20:45 -07:00
k8s-merge-robot
1fb8596636 Merge pull request #27033 from zefciu/lvm-fix
Automatic merge from submit-queue

Fixed an error in lvm bash script

The space in this script is an obvious typo and caused an error
(trying to call volume_id as command).
2016-06-24 13:56:55 -07:00
Janet Kuo
14d9863665 Fix broken redis example e2e tests 2016-06-21 11:50:26 -07:00
Janet Kuo
8dee2b4293 Fix broken spark example e2e test 2016-06-21 11:50:26 -07:00
David McMahon
2bff72b769 Updated docs and examples for release-1.3. 2016-06-13 12:24:34 -07:00
Dawn Chen
88de86fcb9 Revert "Versioning docs and examples for v1.4.0-alpha.0."
This reverts commit cce9db3aa9.
2016-06-10 16:46:46 -07:00
David McMahon
cce9db3aa9 Versioning docs and examples for v1.4.0-alpha.0. 2016-06-10 14:55:35 -07:00
Szymon Pyżalski
6902faa74a Fixed an error in lvm bash script
The space in this script is an obvious typo and caused an error
(trying to call volume_id as command).
2016-06-08 11:55:23 +02:00
Manuel de Brito Fontes
e1fb51436f Update redis example to use alpine:3.4 2016-06-02 21:39:54 -04:00
Girish Kalele
4c1047d359 Switch DNS addons from skydns to kubedns
Unified skydns templates using a simple underscore based template and
added transform sed scripts to transform into salt and sed yaml
templates

Moved all content out of cluster/addons/dns into build/kube-dns and
saltbase/salt/kube-dns
2016-05-31 10:14:14 -07:00
k8s-merge-robot
a81ba704c5 Merge pull request #26022 from chrislovecnm/cassandra-image-bump
Automatic merge from submit-queue

fixing docker file, and bumping cassandra version

- had issue with current v9 build.  `cassandra.yaml` was not editable by the cassandra user, chown and chmod is now correct
- rebuild jar against 3.5 cassandra version and bumped C* version
2016-05-29 02:17:13 -07:00
k8s-merge-robot
04bdd37bc4 Merge pull request #25972 from luxas/remove_arch_constants
Automatic merge from submit-queue

Use pause image depending on the server's platform when testing

Removed all pause image constant strings, now the pause image is chosen by arch. Part of the effort of making e2e arch-agnostic.

The pause image name and version is also now only in two places, and it's documented to bump both
Also removed "amd64" constants in the code. Such constants should be replaced by `runtime.GOARCH` or by looking up the server platform

Fixes: #22876 and #15140
Makes it easier for: #25730
Related: #17981

This is for `v1.3`
@ixdy @thockin @vishh @kubernetes/sig-testing @andyzheng0831 @pensu
2016-05-28 04:48:59 -07:00
Alex Robinson
5773b64721 Merge pull request #22665 from rootfs/nfs-doc
better NFS example doc
2016-05-27 11:32:38 -07:00
Lucas Käldström
79ca1911e1 Removed all pause image constant strings, now the pause image is chosen by arch. Part of the effort of making e2e arch-agnostic 2016-05-26 19:16:43 +03:00
chrislovecnm
742b92a034 merge 2016-05-24 16:13:27 -06:00
chrislovecnm
33b8cbbbeb catching all Exceptions which allows for running outside of k8s easier 2016-05-24 16:11:33 -06:00
chrislovecnm
3b51d11329 more permission issues 2016-05-24 16:10:47 -06:00
chrislovecnm
f587e906f4 fixing docker file, and bumping cassandra version 2016-05-21 12:42:47 -06:00
chrislovecnm
887a29c9ba fixing docker file, and bumping cassandra version 2016-05-21 12:41:19 -06:00
Huamin Chen
722911af0b update to latest gcr image
Signed-off-by: Huamin Chen <hchen@redhat.com>
2016-05-20 17:40:23 -04:00
k8s-merge-robot
e851d749e4 Merge pull request #25583 from chrislovecnm/cassandra-image-bump
Automatic merge from submit-queue

Cassandra examples updating images to v9

- this is a version bump for the C* image
- I also increased the cpu to .5 because .1 is slow like warm death

Who can actually run the build to get the container to the examples repo?
2016-05-20 04:42:12 -07:00
k8s-merge-robot
d89d45a861 Merge pull request #25266 from smarterclayton/common_storage
Automatic merge from submit-queue

kube-apiserver options should be decoupled from impls

A few months ago we refactored options to keep it independent of the
implementations, so that it could be used in CLI tools to validate
config or to generate config, without pulling in the full dependency
tree of the master.  This change restores that by separating
server_run_options.go back to its own package.

Also, options structs should never contain non-serializable types, which
storagebackend.Config was doing with runtime.Codec. Split the codec out.

Fix a typo on the name of the etcd2.go storage backend.

Finally, move DefaultStorageMediaType to server_run_options.

@nikhiljindal as per my comment in #24454, @liggitt because you and I
discussed this last time
2016-05-19 06:13:38 -07:00
chrislovecnm
98cafe64ac More updates to docker, including more env overrides. For example you can now set cluster name.
someone tell me if this is wrong, but I do not think "examples/cassandra/image/run.sh:    cluster_name \" should have been found
2016-05-18 17:03:46 -06:00
chrislovecnm
aca07ebb6a added better logging and different type of exception handling when we do not have k8s 2016-05-18 17:00:53 -06:00
chrislovecnm
9a1ea5cf42 updating images to v9 2016-05-18 17:00:53 -06:00
Clayton Coleman
633683c08d
kube-apiserver options should be decoupled from impls
A few months ago we refactored options to keep it independent of the
implementations, so that it could be used in CLI tools to validate
config or to generate config, without pulling in the full dependency
tree of the master.  This change restores that by separating
server_run_options.go back to its own package.

Also, options structs should never contain non-serializable types, which
storagebackend.Config was doing with runtime.Codec. Split the codec out.

Fix a typo on the name of the etcd2.go storage backend.

Finally, move DefaultStorageMediaType to server_run_options.
2016-05-18 10:39:21 -04:00
Tim Hockin
e16375e052 Revert "Update cassandra.list" 2016-05-17 20:09:34 -07:00
k8s-merge-robot
4f62152221 Merge pull request #25711 from bobintornado/patch-1
Automatic merge from submit-queue

Update cassandra.list

## Pull Request Guidelines

1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md).
1. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md).
1. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below.

```release-note
* Use the release-note-* labels to set the release note state 
* Clear this block to use the PR title as the release note 
-OR-
* Enter your extended release note here
```


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Upgrade cassandra version from 34x to 35x
2016-05-17 01:56:08 -07:00
k8s-merge-robot
576df2b300 Merge pull request #24564 from azell/newrelic-daemonset
Automatic merge from submit-queue

Newrelic daemonset

1. base64 on Mac does not support the **wrap** option. Easy to support on both Mac and Linux by using **tr** to remove the newline.
2. DaemonSet definition does not conform to latest schema:

> $ kubectl create -f ./newrelic-daemonset.yaml 
error validating "./newrelic-daemonset.yaml": error validating data: found invalid field privileged for v1.PodSecurityContext; if you choose to ignore these errors, turn validation off with --validate=false

<!-- Reviewable:start -->
---
This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/24564)
<!-- Reviewable:end -->
2016-05-17 01:55:55 -07:00
Adam Zell
45261f4462 The Mac version of base64 does not support the wrap option. Use tr to delete the trailing newline for Mac and Linux runs.
Move the security context tag under containers.

Run hack/update-generated-docs.sh
2016-05-17 00:14:58 -07:00
k8s-merge-robot
e43ec4c445 Merge pull request #25665 from ursuad/patch-1
Automatic merge from submit-queue

Fixed namespace name to spark-cluster

Just changed the namespace from **default** to **spark-cluster** in the spark example docs.
2016-05-16 23:49:46 -07:00
Bob Cao
2c1149b09c Update cassandra.list
Upgrade cassandra version from 34x to 35x
2016-05-17 11:17:38 +08:00
Adrian Ursu
ca24ee02aa Update README.md 2016-05-16 14:32:33 +01:00
Adrian Ursu
a7b2c5783c Fixed namespace name to spark-cluster 2016-05-16 14:06:07 +01:00
Brandon Philips
ff5a2a755f examples: guestbook-go: fix the redis-master version
The guestbook-go example is broken because the latest tag of redis has
moved to redis 3.0 which speaks a new protocol. This means that the
slaves, which have fixed 2.0 versions, will error out on the protocol:

```
[7] 15 May 23:37:44.403 # Can't handle RDB format version 7
[7] 15 May 23:37:44.403 # Failed trying to load the MASTER synchronization DB from disk
[7] 15 May 23:37:45.333 * Connecting to MASTER redis-master:6379
[7] 15 May 23:37:45.427 * MASTER <-> SLAVE sync started
```

In this case the app simply never persists data.

cc @luebken @Gurpartap
2016-05-15 18:46:27 -05:00
nikhiljindal
65c1dc8b84 Adding a discovery summarizer server 2016-05-13 13:52:23 -07:00
Huamin Chen
3411f4349d expose rpcbind service, so nfs client can use service IP to access NFS share
Signed-off-by: Huamin Chen <hchen@redhat.com>
2016-05-10 18:24:24 +00:00
Tim Hockin
7aff0f1486 Rename codecgen "testdata" dir so ugorji works
Go mistreats "testdata" and can't find vendor/ dirs.
2016-05-08 20:32:09 -07:00
Tim Hockin
cbf886c7f4 Convert everything to use vendor/ 2016-05-08 20:30:37 -07:00
Robert Bailey
01c6b37422 Merge pull request #25054 from yujuhong/rm_tests
Remove redundant RC and service tests in integration.go
2016-05-06 15:05:32 -07:00
Kevin
82ba4f077e implement inter pod topological affinity and anti-affinity 2016-05-06 06:46:23 +00:00
Clayton Coleman
e0ebcf4216
Split the storage and negotiation parts of Codecs
The codec factory should support two distinct interfaces - negotiating
for a serializer with a client, vs reading or writing data to a storage
form (etcd, disk, etc). Make the EncodeForVersion and DecodeToVersion
methods only take Encoder and Decoder, and slight refactoring elsewhere.

In the storage factory, use a content type to control what serializer to
pick, and use the universal deserializer. This ensures that storage can
read JSON (which might be from older objects) while only writing
protobuf. Add exceptions for those resources that may not be able to
write to protobuf (specifically third party resources, but potentially
others in the future).
2016-05-05 12:08:23 -04:00
k8s-merge-robot
085b172395 Merge pull request #24887 from nikhiljindal/runOptions
Automatic merge from submit-queue

Deleting duplicate code from federated-apiserver.Run()

This removes most of duplicate code from federated-apiserver.Run().
The code remaining is related to storage or authz and authn.
https://github.com/kubernetes/kubernetes/pull/24787 refactors the storage related code.
I am still figuring out authz and authn.

cc @jianhuiz
2016-05-05 06:50:56 -07:00
Yu-Ju Hong
a3d5a4f358 Remove redundant RC and service tests in integration.go 2016-05-03 17:13:10 -07:00
nikhiljindal
16c0e0a21c Deleting duplicate code from federated-apiserver 2016-05-03 14:04:09 -07:00
Klaus Ma
59bab9bde4 Corrected cassandra example's indent. 2016-05-01 21:05:13 +08:00
k8s-merge-robot
bf661537d6 Merge pull request #24945 from chrislovecnm/cassandra-updates-docker-n-java
Automatic merge from submit-queue

Refactored SeedProvider and Updated Docker

This is a redo of the last PR that I munged 😄 

- fixed maven build folder structure
- updated build to C* 3.4
- refactored Seed Provider - improved error handling, updated default SeedProvider code
- added start of unit tests.  Not as comprehensive as I would like
- updated docker image to debian:jessie
- installed openjdk 8
- added some docker fu to make the image smaller
- updated docker to C* 3.4 and update yaml
- updated README content.  Added a section about the docker, and the SeedProvider

Have not had a chance to test the docker on k8s, because I do not have a local docker repo.

NOTE: someone needs to push the docker image into the google repo. Not sure what the process is ...  I will submit another PR request with changes to the yaml files.
2016-04-29 12:24:49 -07:00
chrislovecnm
e8ce426093 Refactored KubernetesSeedProvider and added unit tests. Updated Docker image and bumped Cassandra version 2016-04-28 13:26:45 -06:00
Hongchao Deng
c0071a1595 add flags to enable etcd3 2016-04-28 09:48:16 +08:00
Timothy St. Clair
24b4286960 In preparation for new storage backends renaming generic registry store 2016-04-26 08:32:13 -05:00
k8s-merge-robot
9db45590cf Merge pull request #24772 from nikhiljindal/newConfig
Automatic merge from submit-queue

Using genericapiserver.NewConfig() instead of initialising Config in example apiserver
2016-04-25 23:33:44 -07:00
k8s-merge-robot
293b0d0815 Merge pull request #23493 from soltysh/move_job_internals
Automatic merge from submit-queue

Move internal types of job from pkg/apis/extensions to pkg/apis/batch

This addressed the job part of #23216, this is still WIP. Will notify once finished. I'd like to have it in before starting working on ScheduledJob. 

@lavalamp @erictune fyi
2016-04-25 20:58:49 -07:00
nikhiljindal
e17da8b493 Using genericapiserver.NewConfig() instead of initialising Config 2016-04-25 17:27:18 -07:00
Wojciech Tyczynski
c0020aff59 Merge pull request #24539 from smarterclayton/unify_stream_and_serial
Unify Streaming and normal Serializers
2016-04-25 11:25:16 +02:00
Maciej Szulik
a3b4447305 Move internal types of job from pkg/apis/extensions to pkg/apis/batch 2016-04-25 11:03:54 +02:00