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

Support building images with a provided k8s version #2

Merged
merged 4 commits into from
Sep 12, 2017

Conversation

bzub
Copy link
Contributor

@bzub bzub commented Aug 27, 2017

Other enhancements:

  • Pre-determine if sudo is needed for docker commands
  • Copy kubernetes/cluster into image to support more non-conformance e2e
    tests (tested with E2E_FOCUS="Feature:NetworkPolicy")

So now make {container,push} KUBE_VERSION=1.X, etc will get the latest
1.X.Y version of k8s in that minor release range and tag images with
"latest", "v1.X", and "v1.X.Y".

bzub added 4 commits August 27, 2017 11:40
Other enhancements:
- Pre-determine if sudo is needed for docker commands
- Copy kubernetes/cluster into image to support more non-conformance e2e
tests (tested with E2E_FOCUS="Feature:NetworkPolicy")

So now make {container,push} KUBE_VERSION=1.X, etc will get the latest
1.X.Y version of k8s in that minor release range and tag images with
"latest", "v1.X", and "v1.X.Y".
For example, right now v1.7 minor version.
When v1.8 is considered stable, change "latest_stable = 1.8"
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

echo "/usr/local/bin/e2e.test --ginkgo.skip=\"${E2E_SKIP}\" --ginkgo.focus=\"${E2E_FOCUS}\" --provider=\"${E2E_PROVIDER}\" --report-dir=\"${RESULTS_DIR}\" --ginkgo.noColor=true"
/usr/local/bin/e2e.test --ginkgo.skip="${E2E_SKIP}" --ginkgo.focus="${E2E_FOCUS}" --provider="${E2E_PROVIDER}" --report-dir="${RESULTS_DIR}" --ginkgo.noColor=true | tee ${RESULTS_DIR}/e2e.log
echo "/usr/local/bin/e2e.test --repo-root=/kubernetes --ginkgo.skip=\"${E2E_SKIP}\" --ginkgo.focus=\"${E2E_FOCUS}\" --provider=\"${E2E_PROVIDER}\" --report-dir=\"${RESULTS_DIR}\" --ginkgo.noColor=true"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is repo-root added back somehow as a hard dep in the tests? We spent a lot of time sifting through removing those deps year+ ago.

@timothysc timothysc requested a review from kensimon September 1, 2017 01:54
@jrnt30
Copy link

jrnt30 commented Sep 1, 2017

Are you all running the builds on LInux systems directly? The current implementation of get-kube-binaries.sh copies over an incompatible version of kubectl due to the detect_client_info.

Outside of taking manual steps, I didn't see an easy way to modify the Makefile configs to have an easy path to install.

@timothysc
Copy link
Contributor

@bzub if you could squash the commits and explain the need for repo-root I'd be happy to merge. Sorry for the delay I was out for a while.

@timothysc
Copy link
Contributor

I'm just going to merge and run through a full update once 1.8-beta2 is cut tomorrow.

@timothysc timothysc merged commit 5592759 into heptio:master Sep 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants