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

Copy and display source location prominently on Kubernetes instances #27985

Merged
merged 1 commit into from
Jun 24, 2016

Conversation

maisem
Copy link

@maisem maisem commented Jun 23, 2016

Reapplying #27840.

Following from #27830, this copies the source onto the instance and
displays the location of it prominently (keeping the download link for
anyone that just wants to curl it).

Example output (this tag doesn't exist yet):


Welcome to Kubernetes v1.4.0!

You can find documentation for Kubernetes at:
http://docs.kubernetes.io/

The source for this release can be found at:
/usr/local/share/doc/kubernetes/kubernetes-src.tar.gz
Or you can download it at:
https://storage.googleapis.com/kubernetes-release/release/v1.4.0/kubernetes-src.tar.gz

It is based on the Kubernetes source at:
https://github.com/kubernetes/kubernetes/tree/v1.4.0

For Kubernetes copyright and licensing information, see:
/usr/local/share/doc/kubernetes/LICENSES


Following from kubernetes#27830, this copies the source onto the instance and
displays the location of it prominently (keeping the download link for
anyone that just wants to curl it).

Example output (this tag doesn't exist yet):

---
Welcome to Kubernetes v1.4.0!

You can find documentation for Kubernetes at:
  http://docs.kubernetes.io/

The source for this release can be found at:
  /usr/local/share/doc/kubernetes/kubernetes-src.tar.gz
Or you can download it at:
  https://storage.googleapis.com/kubernetes-release/release/v1.4.0/kubernetes-src.tar.gz

It is based on the Kubernetes source at:
  https://github.com/kubernetes/kubernetes/tree/v1.4.0

For Kubernetes copyright and licensing information, see:
  /usr/local/share/doc/kubernetes/LICENSES
---
@andyzheng0831
Copy link

I am fine with the change. But as shown in #27764 (comment), I think it is better to ask @davidopp to add lgtm label

@alex-mohr alex-mohr added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. retest-not-required labels Jun 23, 2016
@alex-mohr
Copy link
Contributor

Added retest-not-required because if this passes in PR builder, further testing doesn't help add confidence for this change and we can use the submit queue slot for something where it would.

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Jun 23, 2016
@alex-mohr
Copy link
Contributor

alex-mohr commented Jun 24, 2016

Per #27764 (comment) @maisem wrote:
"""
Upgrading the master worked.
cluster/gce/upgrade.sh -M v1.4.0-alpha.0.674+890ac5fdfea522

Upgrading the nodes also worked.
cluster/gce/upgrade.sh -N v1.4.0-alpha.0.674+890ac5fdfea522

So what @andyzheng0831 said is correct. There is an issue with v1.3.0-beta.2. If we upgrade to HEAD everything seems to be working fine.
"""

tl/dr: upgrading to v1.3.0-beta.2 is broken because it doesn't have the kubernetes-src.tar.gz file, but we expect to cut v1.3.0 (that is, the actual release) from HEAD and v1.4.0-alpha.0.674 is a reasonable proxy for that.

lgtm.

@alex-mohr alex-mohr self-assigned this Jun 24, 2016
@alex-mohr alex-mohr added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 24, 2016
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 24, 2016
@alex-mohr alex-mohr added release-note Denotes a PR that will be considered when it comes time to generate release notes. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels Jun 24, 2016
@k8s-bot
Copy link

k8s-bot commented Jun 24, 2016

GCE e2e build/test passed for commit e7a9881.

@alex-mohr
Copy link
Contributor

FWIW, chatted with @spxtr and the "Jenkins GKE e2e" suite is not a merge bot blocker. He's working on a fix, but that red X shouldn't stop this from merging.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit f50c1f7 into kubernetes:master Jun 24, 2016
@maisem maisem deleted the reapply-27840 branch June 24, 2016 00:42
@davidopp
Copy link
Member

cc/ @gmarek @wojtek-t

@@ -158,6 +158,9 @@ function install-kube-binary-config {
fi

cp "${KUBE_HOME}/kubernetes/LICENSES" "${KUBE_HOME}"
cp "${KUBE_HOME}/kubernetes/kubernetes-src.tar.gz" "${KUBE_HOME}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does the script download kubernetes-src.tar.gz? This is not included in kubernetes-release/release/v1.3.0-beta.2/kubernetes-server-linux-amd64.tar.gz. My cluster upgrade failed because of this: ./cluster/gce/upgrade.sh -M v1.3.0-beta.2

@ixdy ixdy mentioned this pull request Sep 23, 2016
7 tasks
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 Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants