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

Bump GCI to gci-stable-56-9000-84-2 on release-1.5 #41828

Merged
merged 1 commit into from Feb 23, 2017

Conversation

freehan
Copy link
Contributor

@freehan freehan commented Feb 21, 2017

Manual cherry-pick of #41819

@freehan freehan added cherrypick-candidate release-note-none Denotes a PR that doesn't merit a release note. labels Feb 21, 2017
@freehan freehan added this to the v1.5 milestone Feb 21, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 21, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

The following people have approved this PR: freehan

Needs approval from an approver in each of these OWNERS Files:

We suggest the following people:
cc @gmarek @timstclair
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 21, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@@ -32,9 +32,9 @@ MASTER_ROOT_DISK_SIZE=${KUBEMARK_MASTER_ROOT_DISK_SIZE:-10GB}
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}

MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-debian}
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I noticed that kubemark in 1.5 branch is not using gci image as master. Not sure what is the reason behind it. I change it to match the config of master.

Copy link
Member

Choose a reason for hiding this comment

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

I think this should be fine, especially on HEAD, it is switched to GCI / COS already. cc/ @gmarek @wojtek-t for confirmation.

@dchen1107
Copy link
Member

/lgtm and
/appove

cc/ @saad-ali the release czar

@saad-ali saad-ali added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Feb 21, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Feb 21, 2017
@saad-ali
Copy link
Member

+@mwielgus the new 1.5 release branch manager: This is worth keeping a close eye on. After the previous GCI image update, a bunch of 1.5 CI broke.

@saad-ali saad-ali removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Feb 21, 2017
@freehan
Copy link
Contributor Author

freehan commented Feb 21, 2017

@k8s-bot unit test this
@k8s-bot kubemark e2e test this

@freehan
Copy link
Contributor Author

freehan commented Feb 22, 2017

adding labels based on #41828 (comment)

@freehan freehan added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Feb 22, 2017
@freehan
Copy link
Contributor Author

freehan commented Feb 22, 2017

@k8s-bot kubemark e2e test this

1 similar comment
@freehan
Copy link
Contributor Author

freehan commented Feb 22, 2017

@k8s-bot kubemark e2e test this

@freehan
Copy link
Contributor Author

freehan commented Feb 22, 2017

Looks like kubemark in 1.5 is not compatible with GCI image. Will switch back to use CVM for master

W0222 11:15:28.930] mkdir: cannot create directory '/srv': Read-only file system
W0222 11:15:28.986] !!! Error in ./test/kubemark/start-kubemark.sh:150
W0222 11:15:28.987]   'gcloud compute ssh --zone="${ZONE}" --project="${PROJECT}" "${MASTER_NAME}" --command="sudo mkdir /srv/kubernetes -p &&     sudo bash -c \"echo ${MASTER_CERT_BASE64} | base64 --decode > /srv/kubernetes/server.cert\" &&     sudo bash -c \"echo ${MASTER_KEY_BASE64} | base64 --decode > /srv/kubernetes/server.key\" &&     sudo bash -c \"echo ${CA_CERT_BASE64} | base64 --decode > /srv/kubernetes/ca.crt\" &&     sudo bash -c \"echo ${KUBECFG_CERT_BASE64} | base64 --decode > /srv/kubernetes/kubecfg.crt\" &&     sudo bash -c \"echo ${KUBECFG_KEY_BASE64} | base64 --decode > /srv/kubernetes/kubecfg.key\" &&     sudo bash -c \"echo \"${KUBE_BEARER_TOKEN},admin,admin\" > /srv/kubernetes/known_tokens.csv\" &&     sudo bash -c \"echo \"${KUBELET_TOKEN},kubelet,kubelet\" >> /srv/kubernetes/known_tokens.csv\" &&     sudo bash -c \"echo \"${KUBE_PROXY_TOKEN},kube_proxy,kube_proxy\" >> /srv/kubernetes/known_tokens.csv\" &&     sudo bash -c \"echo ${password},admin,admin > /srv/kubernetes/basic_auth.csv\""' exited with status 1
W0222 11:15:28.987] Call stack:
W0222 11:15:28.987]   1: ./test/kubemark/start-kubemark.sh:150 main(...)
W0222 11:15:28.987] Exiting with status 1

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2017
@freehan
Copy link
Contributor Author

freehan commented Feb 22, 2017

@k8s-bot test this

@freehan freehan added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2017
@freehan
Copy link
Contributor Author

freehan commented Feb 22, 2017

@k8s-bot cross build this
@k8s-bot kubemark e2e test this
@k8s-bot aws e2e test this
@k8s-bot non-cri node e2e test this

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 349cbce into kubernetes:release-1.5 Feb 23, 2017
@k8s-cherrypick-bot
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants