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

Add dep + remove etcd to/from cluster api docker image #9874

Merged

Conversation

alvaroaleman
Copy link
Member

/assign @roberthbailey

@k8s-ci-robot
Copy link
Contributor

Welcome @alvaroaleman! It looks like this is your first PR to kubernetes/test-infra 🎉🎉

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 20, 2018
@k8s-ci-robot k8s-ci-robot added the area/config Issues or PRs related to code in /config label Oct 20, 2018
preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/cluster-api:v20181020-5ce477da2
Copy link
Member Author

Choose a reason for hiding this comment

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

@roberthbailey Wo builds this image? The tag I used is only correct if it will be built today at commit 5ce477d.

Does it work like this or do I have to do two prs, one for the image change, one for the presubmit?

Copy link
Contributor

Choose a reason for hiding this comment

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

@BenTheElder can confirm but I think you can do it in one commit as long as the new image has already been pushed with the relevant changes inside of it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, you should update the image in the other tests so that we use the same image everywhere.

Copy link
Member Author

Choose a reason for hiding this comment

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

@BenTheElder can confirm but I think you can do it in one commit as long as the new image has already been pushed with the relevant changes inside of it

Yeah but who does push it? I see no job on the pull that does it.

I'll update the tags for the other images when I know what it should be.

Copy link
Contributor

Choose a reason for hiding this comment

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

I might have permissions to push it, but @BenTheElder certainly will.

Copy link
Member

Choose a reason for hiding this comment

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

sorry for the delay, my inbox is RIP..

I have no idea who maintains this image.. looks like krousey?

These are not auto pushed. I can push one though, and I'm pretty sure you have permissions @roberthbailey

Copy link
Member Author

Choose a reason for hiding this comment

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

@roberthbailey Could you please push an image with my changes and tell me the tag, so I can update the PR and we can merge it?

preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/cluster-api:v20181020-5ce477da2
Copy link
Contributor

Choose a reason for hiding this comment

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

@BenTheElder can confirm but I think you can do it in one commit as long as the new image has already been pushed with the relevant changes inside of it.

preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/cluster-api:v20181020-5ce477da2
Copy link
Contributor

Choose a reason for hiding this comment

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

Also, you should update the image in the other tests so that we use the same image everywhere.

@@ -23,9 +23,16 @@ ENV IMAGE=${IMAGE_ARG}
ENV ETCD_VER=v3.3.0
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure we need to download & install etcd any longer. It would be useful to see if we can take it out and still have our tests pass. No need to do it as part of this PR, but could you file an issue to follow up on it?

Copy link
Member Author

Choose a reason for hiding this comment

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

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 27, 2018
@alvaroaleman alvaroaleman force-pushed the cluster-api-dep-presubmit branch from 7e2ec25 to b245a72 Compare October 31, 2018 12:51
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 31, 2018
@fejta
Copy link
Contributor

fejta commented Dec 14, 2018

@roberthbailey @BenTheElder is this waiting for another review?

@BenTheElder
Copy link
Member

this one is a bit akward because it has both an image change and depending on that image at the same time, one of us will need to check out at the image change and push it.

@alvaroaleman do you think you could split the PR out? at some point we'll probably automate the image pushes but even manually it's a little easier to just sync after the first PR and push the image

@alvaroaleman alvaroaleman force-pushed the cluster-api-dep-presubmit branch from b245a72 to 2936aa9 Compare January 11, 2019 21:03
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. area/images sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 11, 2019
@alvaroaleman alvaroaleman force-pushed the cluster-api-dep-presubmit branch from 2936aa9 to f6a93b0 Compare January 11, 2019 21:04
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 11, 2019
@alvaroaleman alvaroaleman changed the title Cluster api dep presubmit that checks dependencies Add dep + remove etcd to/from cluster api docker image Jan 11, 2019
@roberthbailey
Copy link
Contributor

It looks like the PR is now just changing the dockerfile, which looks good to me.

/lgtm

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

LGTM label has been added.

Git tree hash: 7d7094569b181963a60c1004b6caae7c8ffd64a6

@alvaroaleman
Copy link
Member Author

@BenTheElder Yes, I removed the commit that adds the presubmit so the PR now only changes the image. I will create a follow-up that adds the new presubmit and bumps the image in all existing presubmits.

@roberthbailey Can you approve, please?

@roberthbailey
Copy link
Contributor

/approve

Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, BenTheElder, roberthbailey

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 11, 2019
@k8s-ci-robot k8s-ci-robot merged commit 2a90eab into kubernetes:master Jan 11, 2019
@BenTheElder
Copy link
Member

sorry caught back up to this, will look at the image today.

@BenTheElder
Copy link
Member

v20190114-652973a54 should be pushed after a make -C images/cluster-api push

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. area/config Issues or PRs related to code in /config area/images area/testgrid 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. sig/testing Categorizes an issue or PR as relevant to SIG Testing. 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.

5 participants