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

cleanup: Base image workflow improvements #90665

Merged
merged 8 commits into from May 2, 2020

Conversation

justaugustus
Copy link
Member

@justaugustus justaugustus commented May 1, 2020

What type of PR is this?
/kind cleanup
/area dependency security

What this PR does / why we need it:

  • Remove HOME env from debian-{base,iptables} GCB configs
  • Split out building for debian-{base,iptables} and pause images
    • Eliminates a failure in one image build from prevent the others
    • Allows subdir approvers ownership over individual builds
    • Makes cleanup a little easier if one or more of these images go away
  • Add build-image OWNERS to debian-{base,iptables} and pause dirs
  • Add base images to dependencies.yaml
    Dependencies for each image are broken up into two sections to allow the dependency check to pass:
    • image:tag: versions that should be bumped in order to build the image
    • image:tag: dependents: dependents that need to be bumped after the image has been built and promoted
  • Build pause:3.3 image
  • Build debian-base:v2.1.0 image
  • Fix base image versions on dependents

Which issue(s) this PR fixes:

Fixes #
Tracking issue: #90698

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
- Eliminates a failure in one image build from prevent the others
- Allows subdir approvers ownership over individual builds
- Makes cleanup a little easier if one or more of these images go away

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 1, 2020
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 1, 2020
@justaugustus
Copy link
Member Author

/kind cleanup
/area dependency security
/priority important-soon

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. area/dependency Issues or PRs related to dependency changes area/security priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 1, 2020
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
@justaugustus justaugustus changed the title [WIP] Base images [WIP] cleanup: Base image workflow improvements May 1, 2020
@justaugustus
Copy link
Member Author

justaugustus commented May 1, 2020

/assign @dims @BenTheElder
cc: @tallclair @kubernetes/release-engineering

EDIT: moved the checklist to the PR description

@justaugustus justaugustus added sig/release Categorizes an issue or PR as relevant to SIG Release. and removed priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels May 1, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. label May 1, 2020
@@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io
IMAGE = $(REGISTRY)/pause
IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH)

TAG = 3.2
TAG = 4.0
Copy link
Member

Choose a reason for hiding this comment

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

what changed in pause? bumping pause is a headache

Copy link
Member Author

Choose a reason for hiding this comment

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

From Slack, we decided to bump the major versions to represent them being moved over to K8s Infra.

Content-wise, I'm not sure there are discernible changes.

What's involved in the pause bump?
If it's a really big hassle, I'm fine with backing that out.
Here, I'm more concerned with getting the debian-base and debian-iptables images in a buildable state on K8s Infra.

Copy link
Member

Choose a reason for hiding this comment

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

bumping pause requires all the deployment tools (kubeadm, ...) + dockershim (kubelet) + container runtimes (containerd, crio) to need to update to the new image and ideally align on this.

Copy link
Member

Choose a reason for hiding this comment

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

if there are content changes it needs bumping though ...
given that it's just switching build systems, I would expect 3.3, semantically we're not altering compatibility are we?

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 -- Good point. We're not altering compatibility, AFAICT.
I've set the pause image version to 3.3.

Also, brought the debian-base version to v2.1.0.

@justaugustus
Copy link
Member Author

/retest

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
@justaugustus
Copy link
Member Author

/hold for merge of kubernetes/test-infra#17485

@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 May 2, 2020
@justaugustus
Copy link
Member Author

/hold cancel
(Since kubernetes/test-infra#17485 has merged.)

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 2, 2020
@@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io
IMAGE = $(REGISTRY)/pause
IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH)

TAG = 3.2
TAG = 3.3
Copy link
Member

Choose a reason for hiding this comment

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

we should make sure we follow up on this and let some folks know they need to do this again.

fyi @dims for containerd

Copy link
Member Author

Choose a reason for hiding this comment

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

ACK!

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Now both of you get some sleep! it's an order

@BenTheElder
Copy link
Member

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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 May 2, 2020
@justaugustus
Copy link
Member Author

Thanks Ben! ❤️

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/dependency Issues or PRs related to dependency changes area/release-eng Issues or PRs related to the Release Engineering subproject area/security cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/release Categorizes an issue or PR as relevant to SIG Release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants