Lighter weight make for conformance dependencies, better script and manifest #74608

dims · 2019-02-26T17:32:01Z

What type of PR is this?
/kind feature

What this PR does / why we need it:

Update Makefile to make it easier for folks to build/run dependencies and image
Add a manifest with a specific namespace to run things in
Add a script that can be reused in a CI job (and can be run against say a local kind cluster)

Which issue(s) this PR fixes:

Related to #69777

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Change-Id: I78cff10231eabd53b1fc7bdd1526c861179e135a

Change-Id: I137180ed781edd4a9877cabe039e40a72aa71366

dims · 2019-02-26T17:32:55Z

/assign @timothysc @ixdy

k8s-ci-robot · 2019-02-26T17:33:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims

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:

~~cluster/images/conformance/OWNERS~~ [dims]

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

ixdy · 2019-02-26T22:09:26Z

cluster/images/conformance/conformance-e2e.yaml

+spec:
+  containers:
+  - name: conformance-container
+    image: staging-k8s.gcr.io/conformance-amd64:v1.14-alpha4


do we want to hardcode this version in here?

also why staging-k8s?

will fix. these are from the code that already exists, will have to change that

cluster/images/conformance/conformance-e2e.sh

Change-Id: I1eb673fe37b5e8a719f9095473765c80fb7f2347

dims · 2019-02-27T13:05:20Z

/test pull-kubernetes-integration

dims · 2019-02-27T13:40:13Z

/test pull-kubernetes-integration

Change-Id: Ib0d6f681be3537f0cbfcae1dc254f1c42a04be66

dims · 2019-02-27T14:48:36Z

/priority important-soon

timothysc

Generally lgtm , but I'm conflicted on the landing zone for some of this vs. under build as a set of image artifacts.

/lgtm
/hold

/cc @stevesloka @ixdy

k8s-ci-robot · 2019-02-27T15:07:33Z

@timothysc: GitHub didn't allow me to request PR reviews from the following users: stevesloka.

Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

Generally lgtm , but I'm conflicted on the landing zone for some of this vs. under build as a set of image artifacts.

/lgtm
/hold

/cc @stevesloka @ixdy

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.

dims · 2019-02-27T15:17:24Z

/hold cancel

ixdy · 2019-02-27T19:13:10Z

cluster/images/conformance/Makefile


-REGISTRY?=staging-k8s.gcr.io
+REGISTRY?=k8s.gcr.io


this should have remained staging - you can't push to k8s.gcr.io directly, only to staging.

aha. will fix in a next rev

mtaufen · 2019-02-28T23:51:54Z

FYI @dims @ixdy make quick-release fails for me after this PR on a fresh Kubernetes clone. I think this is because it created both dockerized and local directories, but the local directory doesn't have ginkgo (and possibly other things?) in it.

Error message:

+++ [0228 15:38:34] Building conformance image for arch: amd64
cp: cannot stat '/usr/local/google/home/mtaufen/go-tools/src/k8s.io/kubernetes/cluster/images/conformance/../../../_output/local/bin/linux/amd64/ginkgo': No such file or directory
make[1]: *** [build] Error 1
!!! [0228 15:38:34] Call tree:
!!! [0228 15:38:34]  1: /usr/local/google/home/mtaufen/go-tools/src/k8s.io/kubernetes/build/lib/release.sh:424 kube::release::build_conformance_image(...)
!!! [0228 15:38:34]  2: /usr/local/google/home/mtaufen/go-tools/src/k8s.io/kubernetes/build/lib/release.sh:231 kube::release::create_docker_images_for_server(...)
!!! [0228 15:38:34]  3: /usr/local/google/home/mtaufen/go-tools/src/k8s.io/kubernetes/build/lib/release.sh:237 kube::release::build_server_images(...)
!!! [0228 15:38:34]  4: /usr/local/google/home/mtaufen/go-tools/src/k8s.io/kubernetes/build/lib/release.sh:93 kube::release::package_server_tarballs(...)
!!! [0228 15:38:34]  5: build/release.sh:45 kube::release::package_tarballs(...)
+++ [0228 15:38:39] Deleting docker image k8s.gcr.io/kube-scheduler:v1.15.0-alpha.0.619_aaf40dd13c6eb5
+++ [0228 15:38:39] Deleting docker image k8s.gcr.io/kube-proxy:v1.15.0-alpha.0.619_aaf40dd13c6eb5
+++ [0228 15:38:40] Deleting docker image k8s.gcr.io/cloud-controller-manager:v1.15.0-alpha.0.619_aaf40dd13c6eb5
+++ [0228 15:38:40] Deleting docker image k8s.gcr.io/kube-controller-manager:v1.15.0-alpha.0.619_aaf40dd13c6eb5
+++ [0228 15:38:41] Deleting docker image k8s.gcr.io/kube-apiserver:v1.15.0-alpha.0.619_aaf40dd13c6eb5
+++ [0228 15:38:45] Deleting hyperkube image k8s.gcr.io/hyperkube-amd64:v1.15.0-alpha.0.619_aaf40dd13c6eb5
!!! [0228 15:38:45] previous Docker build failed
!!! [0228 15:38:45] Call tree:
!!! [0228 15:38:45]  1: /usr/local/google/home/mtaufen/go-tools/src/k8s.io/kubernetes/build/lib/release.sh:231 kube::release::create_docker_images_for_server(...)
!!! [0228 15:38:45]  2: /usr/local/google/home/mtaufen/go-tools/src/k8s.io/kubernetes/build/lib/release.sh:237 kube::release::build_server_images(...)
!!! [0228 15:38:45]  3: /usr/local/google/home/mtaufen/go-tools/src/k8s.io/kubernetes/build/lib/release.sh:93 kube::release::package_server_tarballs(...)
!!! [0228 15:38:45]  4: build/release.sh:45 kube::release::package_tarballs(...)
+++ [0228 15:38:46] Building tarball: node windows-amd64
!!! [0228 15:38:54] previous tarball phase failed
Makefile:426: recipe for target 'quick-release' failed
make: *** [quick-release] Error 1

dims · 2019-03-01T00:12:58Z

@mtaufen let me try that

dims added 2 commits February 26, 2019 09:18

Simpler make commands for ginkgo/kubectl/e2e.test

069eeb5

Change-Id: I78cff10231eabd53b1fc7bdd1526c861179e135a

Better manifest for running conformance image

94ad1df

Change-Id: I137180ed781edd4a9877cabe039e40a72aa71366

k8s-ci-robot assigned ixdy and timothysc Feb 26, 2019

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 26, 2019

k8s-ci-robot requested review from ixdy and spiffxp February 26, 2019 17:33

ixdy reviewed Feb 26, 2019

View reviewed changes

cluster/images/conformance/conformance-e2e.sh Outdated Show resolved Hide resolved

dims force-pushed the lighter-weight-make-for-conformance-dependencies branch 2 times, most recently from 09424f3 to 35476ac Compare February 27, 2019 02:40

Add a script to run the conformance image and pull results

87d9903

Change-Id: I1eb673fe37b5e8a719f9095473765c80fb7f2347

dims force-pushed the lighter-weight-make-for-conformance-dependencies branch from 35476ac to 87d9903 Compare February 27, 2019 12:39

dims changed the title ~~Lighter weight make for conformance dependencies~~ Lighter weight make for conformance dependencies, better script and manifest Feb 27, 2019

Switch to k8s.gcr.io (from staging)

23b33f5

Change-Id: Ib0d6f681be3537f0cbfcae1dc254f1c42a04be66

k8s-ci-robot added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Feb 27, 2019

k8s-ci-robot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Feb 27, 2019

dims mentioned this pull request Feb 27, 2019

Add a e2e test using conformance image + kind kubernetes/test-infra#11525

Merged

timothysc approved these changes Feb 27, 2019

View reviewed changes

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Feb 27, 2019

k8s-ci-robot requested a review from ixdy February 27, 2019 15:07

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 27, 2019

k8s-ci-robot merged commit b2e9b2a into kubernetes:master Feb 27, 2019

ixdy reviewed Feb 27, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Lighter weight make for conformance dependencies, better script and manifest #74608

Lighter weight make for conformance dependencies, better script and manifest #74608

dims commented Feb 26, 2019

dims commented Feb 26, 2019

k8s-ci-robot commented Feb 26, 2019

ixdy Feb 26, 2019

dims Feb 27, 2019

dims commented Feb 27, 2019

dims commented Feb 27, 2019

dims commented Feb 27, 2019

timothysc left a comment

k8s-ci-robot commented Feb 27, 2019

dims commented Feb 27, 2019

ixdy Feb 27, 2019

dims Feb 27, 2019

mtaufen commented Feb 28, 2019

dims commented Mar 1, 2019


		REGISTRY?=staging-k8s.gcr.io
		REGISTRY?=k8s.gcr.io

Lighter weight make for conformance dependencies, better script and manifest #74608

Lighter weight make for conformance dependencies, better script and manifest #74608

Conversation

dims commented Feb 26, 2019

dims commented Feb 26, 2019

k8s-ci-robot commented Feb 26, 2019

ixdy Feb 26, 2019

Choose a reason for hiding this comment

dims Feb 27, 2019

Choose a reason for hiding this comment

dims commented Feb 27, 2019

dims commented Feb 27, 2019

dims commented Feb 27, 2019

timothysc left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Feb 27, 2019

dims commented Feb 27, 2019

ixdy Feb 27, 2019

Choose a reason for hiding this comment

dims Feb 27, 2019

Choose a reason for hiding this comment

mtaufen commented Feb 28, 2019

dims commented Mar 1, 2019