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

Upgrade base image to alpine 3.8 and GO to 1.10.8 #6458

Merged
merged 26 commits into from
Feb 24, 2019
Merged

Upgrade base image to alpine 3.8 and GO to 1.10.8 #6458

merged 26 commits into from
Feb 24, 2019

Conversation

ricardo-larosa
Copy link
Contributor

Hi There,
kops 1.11 needs at least go1.10.3, I am setting go version to 1.10.8 because is the latest of the 1.10 branch. This also forces to update to alpine:3.8 (in the previous versions go 1.10 is not supported)
solves #6457

justinsb and others added 23 commits November 27, 2018 06:40
…28-origin-release-1.11

Automated cherry pick of #6128: Update amazon cni to 1.3.0
…56-origin-release-1.11

Automated cherry pick of #6156: Fix Calico upgrade job to use the correct version
…29-origin-release-1.11

Automated cherry pick of #6129: feat: bump controller version to 1.0.18
…75-origin-release-1.11

Automated cherry pick of #6175: Fix for when node and master use the same SG.
* Updated vpc_ip_resource_limits
* Ran `make update-machine-types`
…44-origin-release-1.11

Automated cherry pick of #6144: Workspace updates for bazel
…53-origin-release-1.11

Automated cherry pick of #6253: Add p3dn.24xlarge
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 10, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @ricardo-larosa. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 10, 2019
@ricardo-larosa
Copy link
Contributor Author

/assign @mikesplain

@zetaab
Copy link
Member

zetaab commented Feb 18, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 18, 2019
@ricardo-larosa
Copy link
Contributor Author

/retest

Copy link
Contributor

@mikesplain mikesplain left a comment

Choose a reason for hiding this comment

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

Thanks @ricardo-larosa!

/retest
/lgtm
/approve

docker/Dockerfile Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 19, 2019
@justinsb
Copy link
Member

Oh - I think the surprising thing here is that this PR is not against the master branch. I presume that is not deliberate?

@mikesplain
Copy link
Contributor

Good point @justinsb! @ricardo-larosa I'm assuming you want this in master not 1.11. If it is deemed necessary for a patch release, we can cherry pick it in.

/lgtm cancel

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 20, 2019
@ricardo-larosa
Copy link
Contributor Author

ricardo-larosa commented Feb 20, 2019

Hi, it should be in 1.11 and master, otherwise, if someone wants to target 1.11 using docker build --build-arg KOPS_GITISH=release-1.11 -t kops:1.11.0 . will fail with the error described in #6457 @mikesplain @justinsb

@justinsb
Copy link
Member

That makes sense @ricardo-larosa - the way we achieve that is that we merge into master and then cherry-pick back to the release branches. I'll mark this PR for cherry-picking, but can you change the target branch to master please?

@ricardo-larosa ricardo-larosa changed the base branch from release-1.11 to master February 20, 2019 14:23
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 20, 2019
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Feb 20, 2019

@ricardo-larosa: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kops-e2e-kubernetes-aws-stable2 cb3d56d link /test pull-kops-e2e-kubernetes-aws-stable2

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mikesplain, ricardo-larosa

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 20, 2019
@ricardo-larosa
Copy link
Contributor Author

Done. @justinsb

@justinsb
Copy link
Member

(When it passes CI, I'm going to squash-and-merge, as I'm a little worried by the 26 commits that are currently showing)

@ricardo-larosa
Copy link
Contributor Author

(When it passes CI, I'm going to squash-and-merge, as I'm a little worried by the 26 commits that are currently showing)

Yes. Next time when facing similar changes I will create the PRs from master.
I was not aware of the workflow of cherry-picking to release branches from master.

@justinsb justinsb merged commit dae53cf into kubernetes:master Feb 24, 2019
@ricardo-larosa ricardo-larosa deleted the release-1.11 branch February 25, 2019 10:05
justinsb pushed a commit to justinsb/kops that referenced this pull request Feb 28, 2019
k8s-ci-robot added a commit that referenced this pull request Feb 28, 2019
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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants