Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

federation: Upgrading the groupversion to v1beta1 #28186

Merged
merged 2 commits into from
Jun 29, 2016

Conversation

nikhiljindal
Copy link
Contributor

This PR contains 2 commits:

  • Removing fields from Cluster API object that we are not using. This includes: Capacity, Allocatable and ClusterMeta.
  • Move code and rename groupversion federation/v1alpha1 to federation/v1beta1

cc @kubernetes/sig-cluster-federation

@nikhiljindal nikhiljindal added the release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. label Jun 28, 2016
@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed labels Jun 28, 2016
@nikhiljindal nikhiljindal added area/cluster-federation size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed release-note-label-needed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 28, 2016
@k8s-bot
Copy link

k8s-bot commented Jun 28, 2016

GCE e2e build/test failed for commit 50bbd6cd9a14199965f7ce514affefff6d909b79.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@lavalamp lavalamp assigned caesarxuchao and unassigned lavalamp Jun 28, 2016
@lavalamp
Copy link
Member

@caesarxuchao can you review? I didn't see anything obviously wrong but I also didn't look very carefully...

@ghost ghost added this to the v1.3 milestone Jun 28, 2016
@ghost ghost added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. team/control-plane labels Jun 28, 2016
@ghost
Copy link

ghost commented Jun 28, 2016

cc: @davidopp @matchstick This is the PR to achieve what was discussed yesterday w.r.t. correctly reflecting this as beta, not alpha.

@ghost
Copy link

ghost commented Jun 28, 2016

@caesarxuchao This LGTM. Will leave it to you to approve after review.

@caesarxuchao
Copy link
Member

The changes look fine. I think you will cherry-pick it to 1.3 branch? You might have problem cherry-picking the clientset changes, because #27293 is not cherry-picked to 1.3.

@caesarxuchao caesarxuchao added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 28, 2016
@caesarxuchao
Copy link
Member

Per offline discussion, @nikhiljindal will manually fix the conflicts during cherry-pick. LGTM.

@nikhiljindal
Copy link
Contributor Author

e2e failure seems like a flake
@k8s-bot e2e test this issue: #27450

@nikhiljindal nikhiljindal added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jun 29, 2016
@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit 50bbd6cd9a14199965f7ce514affefff6d909b79.

@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit 7fcf8da.

@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit 7fcf8da.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 044de6e into kubernetes:master Jun 29, 2016
@erictune
Copy link
Member

@eparis is this going to be a pain to cherry pick/rebase?

@eparis
Copy link
Contributor

eparis commented Jun 29, 2016

The pick was easy, but it doesn't build. Must be some missing pre-req...

$ hack/update-all.sh -v
Running in short-circuit mode; run with -a to force all scripts to run.
Updating generated-protobuf
+++ [0629 16:11:47] Verifying Prerequisites....
+++ [0629 16:11:47] Building Docker image kube-build:build-c01f95343e.
+++ [0629 16:11:47] Running build command....
Go version: go version go1.6.2 linux/amd64
+++ [0629 16:11:55] Building the toolchain targets:
    k8s.io/kubernetes/hack/cmd/teststale
+++ [0629 16:11:56] Building go targets for linux/amd64:
    cmd/libs/go2idl/go-to-protobuf
    cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo
+++ [0629 16:12:02] Placing binaries
2016/06/29 16:12:02 Unable to add directory "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1": unable to *find* "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1": cannot find package "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" in any of:
    /go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/vendor/k8s.io/kubernetes/pkg/apis/certificates/v1alpha1 (vendor tree)
    /usr/local/go/src/k8s.io/kubernetes/pkg/apis/certificates/v1alpha1 (from $GOROOT)
    /go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/pkg/apis/certificates/v1alpha1 (from $GOPATH)
!!! Error in hack/update-generated-protobuf-dockerized.sh:43
  'PATH="${KUBE_ROOT}/_output/local/go/bin:${PATH}" "${gotoprotobuf}" --proto-import="${KUBE_ROOT}/vendor" --proto-import="${KUBE_ROOT}/third_party/protobuf"' exited with status 1
Call stack:
  1: hack/update-generated-protobuf-dockerized.sh:43 main(...)
Exiting with status 1
!!! Error in hack/../hack/../build/common.sh:620
  '"${docker_cmd[@]}" "$@"' exited with status 1
Call stack:
  1: hack/../hack/../build/common.sh:620 kube::build::run_build_command(...)
  2: hack/../hack/update-generated-protobuf.sh:58 main(...)
Exiting with status 1
Updating generated-protobuf FAILED

@erictune
Copy link
Member

@nikhiljindal Can you take a look at the build failure, or better yet checkout out release-1.3, check out #28119, apply this commit, and see why it won't build.

@nikhiljindal
Copy link
Contributor Author

Yes am talking to @eparis on slack.
certificates/v1alpha1 group version was recently added on HEAD in #25562. Its not required in 1.3.

eparis pushed a commit to eparis/kubernetes that referenced this pull request Jun 29, 2016
Automatic merge from submit-queue

federation: Upgrading the groupversion to v1beta1

This PR contains 2 commits:
* Removing fields from Cluster API object that we are not using. This includes: Capacity, Allocatable and ClusterMeta.
* Move code and rename groupversion `federation/v1alpha1` to `federation/v1beta1`

cc @kubernetes/sig-cluster-federation
(cherry picked from commit 044de6e)
@nikhiljindal
Copy link
Contributor Author

Confirmed with @eparis that he was able to cherrypick this PR fine.

@eparis eparis mentioned this pull request Jun 29, 2016
k8s-github-robot pushed a commit that referenced this pull request Jun 29, 2016
Automatic merge from submit-queue

Batch update for 1.3

#28030: Revert "Federation e2e supports aws"
#28026: Address outstanding review comments in #27999.
#28034: Adding lock files for kubeconfig updating
#28004: return nil from NewClientConfig instead of empty struct
#28032: Increase pod CPU/memory for fluentd, dns and kube-proxy.
#27208: Bump minimum API version for docker to 1.21
#28061: Remove extra double quotes in --federations.
#28060: rkt: Fix the 'privileged' check when stage1 annotation is provided.
#27996: Image GC logic should compensate for reserved blocks
#28044: rkt: Bump required rkt version to 1.9.1.
#28040: Tracked addition of federation, sed support in kube DNS
#28043: Set grace period to 0 when deleting namespaces after the test.
#28002: Fix startup type error in initializeCaches
#28087: Hotfix: Fixup the hyperkube dns manifest from a breaking federation PR
#28108: Fix initialization of volume controller caches.
#28056: Increase kube-dns requirements on CoreOS.
#28147: Fix error checks after cloning.
#28159: Use : as seccomp security option operator for Docker 1.10
#28165: Refactored, expanded and fixed federated-services e2e tests.
#28095: Kubelet should mark VolumeInUse before checking if it is Attached
#28172: Build: Add KUBE_GCS_RELEASE_BUCKET_MIRROR option to push-ci-build.sh
#28207: Bump cluster autoscaler to 0.2.2
#28160: Volume manager must verify containers terminated before deleting for ungracefully terminated pods
#28211: Fix federation e2e tests by correctly managing cluster clients
#27944: Fix pvc label selector validation error
#28186: federation: Upgrading the groupversion to v1beta1
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.3" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@erictune
Copy link
Member

erictune commented Jul 2, 2016

@nikhiljindal Does this PR require action by the user when upgrading from 1.2.x to 1.3.0? (Think about non-developer users.) If so, please edit your first comment to have a release-note block, like in #28132. If it is just an optional feature, please change the label to just release-note. If it is not a complete feature by itself, then apply "release-note-none" label instead.

@madhusudancs madhusudancs added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. labels Jul 5, 2016
@madhusudancs
Copy link
Contributor

@erictune Changed the label to release-note-none

@nikhiljindal and others who might be interested.
Reason: This API did not even exist in 1.2. So there is no action to be taken by the users while going from 1.2 to 1.3. Also, it is not a feature by itself. So it is not that useful to have it in the release note. Release note should be added in the PR that introduced this API.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants