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.

Sign up for GitHub

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

Jump to bottom

add rpm tooling to planter, also normalize image tags to match bazel … #5456

Merged
merged 1 commit into from
Nov 15, 2017
Merged

add rpm tooling to planter, also normalize image tags to match bazel … #5456

merged 1 commit into from
Nov 15, 2017

Conversation

BenTheElder
Copy link
Member

@BenTheElder BenTheElder commented Nov 10, 2017 •
edited
Loading

…versions

new tags available:

  • 0.6.1
  • 0.7.0
  • 0.8.0rc2

0.7.0 is now the default tag

docker pull ${IMAGE} is now run before running the image to keep things up to date.

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 10, 2017
@BenTheElder
Copy link
Member Author

BenTheElder commented Nov 10, 2017 •
edited
Loading

#5429 is partially fixed by this (still need to do bazelbuild, but I can confirm that make bazel-build against k/k master is fixed by this)

I dropped the version suffixes (-1) for planter images since we effectively have imagePullPolicy: Always in the planter script, and I've pushed images for 0.6.1, 0.7.0 and 0.8.0rc2 so far, I will go back and push 0.5.2 for release 1.6 next.

Edit: we did NOT have it pulling always, it does now... 🤦‍♂️

@BenTheElder BenTheElder added the area/planter Issues or PRs related to code in /planter label Nov 10, 2017
ixdy
ixdy reviewed Nov 10, 2017
View reviewed changes
planter/planter.sh
@@ -19,7 +19,7 @@
set -o errexit
set -o nounset
IMAGE_NAME="gcr.io/k8s-testimages/planter"
TAG="${TAG:-0.7.0-1}"
Copy link
Member

Choose a reason for hiding this comment

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

if we're dropping the suffixes, we probably should have a docker pull in this script then?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I thought I'd already patched that in, I've been fixing that right now
/hold

Copy link
Member Author

Choose a reason for hiding this comment

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

done
/hold cancel

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 10, 2017
@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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Nov 10, 2017
@BenTheElder BenTheElder mentioned this pull request Nov 10, 2017
Closed
BenTheElder
BenTheElder commented Nov 10, 2017
View reviewed changes
planter/README.md Outdated
@@ -20,7 +20,8 @@ Then from `$GOPATH/src/k8s.io/kubernetes/` run:
Planter repects the following environment variables:

- `TAG`: the planter image tag, this will default to the current stable version
used to build kubernetes, but you may override it with EG `TAG=0.6.1-1`
used to build kubernetes, but you may override it with EG `TAG=0.6.1`
- These should now match bazel release version eg `0.8.0rc2`
Copy link
Member Author

Choose a reason for hiding this comment

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

this part should be a little bit more useful now

Copy link
Member Author

Choose a reason for hiding this comment

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

except s/version/versions/... (done)

@BenTheElder BenTheElder mentioned this pull request Nov 11, 2017
Merged
@BenTheElder
Copy link
Member Author

Bump following #5461, going to start looking at making sure the RPM stuff is sorted out and works in CI next as well.

ixdy
ixdy reviewed Nov 15, 2017
View reviewed changes
planter/README.md Outdated
@@ -20,7 +20,8 @@ Then from `$GOPATH/src/k8s.io/kubernetes/` run:
Planter repects the following environment variables:

- `TAG`: the planter image tag, this will default to the current stable version
used to build kubernetes, but you may override it with EG `TAG=0.6.1-1`
used to build kubernetes, but you may override it with EG `TAG=0.6.1`
- These should now match bazel release versions eg `0.8.0rc2`
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 you need another space to indent this a level?

Copy link
Member Author

Choose a reason for hiding this comment

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

done.

@BenTheElder
add rpm tooling to planter, also normalize image tags to match bazel …
958fc27 
…versions

new tags available:
- 0.6.1
- 0.7.0
- 0.8.0rc2

0.7.0 is now the default tag
@ixdy
Copy link
Member

ixdy commented Nov 15, 2017

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, ixdy

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

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

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 9a62914 into kubernetes:master Nov 15, 2017
@BenTheElder BenTheElder deleted the planting-red-hats branch January 31, 2018 02:32
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ixdy ixdy ixdy left review comments

Assignees

@ixdy ixdy

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/planter Issues or PRs related to code in /planter 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@BenTheElder @ixdy @k8s-ci-robot