Skip to content

build-image: Promote kube-cross v1.13.9-1 images #679

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

Merged
merged 2 commits into from
Mar 21, 2020

Conversation

justaugustus
Copy link
Member

@justaugustus justaugustus commented Mar 21, 2020

(Companion PR to kubernetes/release#1200, kubernetes/kubernetes#89275, kubernetes/release#1140)

  • build-image: Promote kube-cross v1.13.9-1 images
  • build-image: Sort images by digest
    CIP snapshot outputs images sorted by digest, instead of tag.
    This will make diffs easier in the future when running a snapshot.

Signed-off-by: Stephen Augustus [email protected]

/assign @BenTheElder @cblecker @liggitt @dims @listx
cc: @kubernetes/release-engineering


In kubernetes/kubernetes#89275, specifically d37aed360f16f5a931e14671042e7965b96a0101, I temporarily pointed at the staging kube-cross image and we can see successes on the expected jobs:


Snapshot from sigs.k8s.io/k8s-container-image-promoter:

$ time bazel run  \
    --workspace_status_command=$PWD/workspace_status.sh \
    --host_force_python=PY2 \
    //:cip -- -snapshot=gcr.io/k8s-staging-build-image \
    -snapshot-tag=v1.13.9-1 \
    -output-format=YAML > images.yaml
Loading: 
Loading: 0 packages loaded
Analyzing: target //:cip (0 packages loaded, 0 targets configured)
INFO: Analyzed target //:cip (0 packages loaded, 0 targets configured).
INFO: Found 1 target...
[0 / 1] [Prepa] BazelWorkspaceStatusAction stable-status.txt
Target //:cip up-to-date:
  bazel-bin/linux_amd64_stripped/cip
INFO: Elapsed time: 0.218s, Critical Path: 0.02s
INFO: 0 processes.
INFO: Build completed successfully, 1 total action
INFO: Running command line: bazel-bin/linux_amd64_stripped/cip '-snapshot=gcr.io/k8s-staging-build-image' '-snapshot-tag=v1.13.9-1' '-output-format=YAML'
INFO: Build completed successfully, 1 total action
I0321 00:56:32.628063   13092 inventory.go:1626] Request {gcr.io/k8s-staging-build-image   true}: OK
I0321 00:56:32.914177   13092 inventory.go:1626] Request {gcr.io/k8s-staging-build-image/kube-cross-amd64   false}: OK
I0321 00:56:33.249679   13092 inventory.go:1626] Request {gcr.io/k8s-staging-build-image/kube-cross   false}: OK

real	0m1.591s
user	0m0.085s
sys	0m0.073s

Validate:

$ docker manifest inspect gcr.io/k8s-staging-build-image/kube-cross:v1.13.9-1
{
   "schemaVersion": 2,
   "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
   "manifests": [
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 3274,
         "digest": "sha256:60e119bc59d8e6c77ddf159af0a682d0634249e3baca69d5be2972d00942ff51",
         "platform": {
            "architecture": "amd64",
            "os": "linux"
         }
      }
   ]
}

CIP snapshot outputs images sorted by digest, instead of tag.
This will make diffs easier in the future when running a snapshot.

Signed-off-by: Stephen Augustus <[email protected]>
@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 Mar 21, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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 requested review from dims and listx March 21, 2020 06:51
@k8s-ci-robot k8s-ci-robot added sig/release Categorizes an issue or PR as relevant to SIG Release. wg/k8s-infra approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 21, 2020
Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold for another look

@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 Mar 21, 2020
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 21, 2020
@bartsmykla
Copy link
Contributor

@justaugustus can you squash the commits?

@justaugustus
Copy link
Member Author

@bartsmykla -- I purposely split the commits so the diffs are separate; one is a no-op reordering and the other is an image promotion.

@bartsmykla
Copy link
Contributor

It should be in different PR then

@bartsmykla
Copy link
Contributor

checksums are correct though

/unhold

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

This is commonly done in the same PR to make reviews easier.

@k8s-ci-robot k8s-ci-robot merged commit aa559fb into kubernetes:master Mar 21, 2020
@bartsmykla
Copy link
Contributor

It doesn't mean it's a good practice though

@dims
Copy link
Member

dims commented Mar 21, 2020

@justaugustus you don't need a separate entry for kube-cross-amd64

"sha256:8d3fd0e3e126b085d4475f1954cc394a2ebea908f370095eb7463d2b1f4dbfdd": ["v1.12.17-1"]
"sha256:df0a50772214025040ea31144a731b5fa76944cbfc9c87db05af98e4aa39aa7f": ["v1.13.6-1"]
"sha256:0c821cd481e9bbfc9d380290d1401a856e9c2bc0f8d0673fc1519e9bef408d1d": ["v1.13.8-1"]
sha256:0c821cd481e9bbfc9d380290d1401a856e9c2bc0f8d0673fc1519e9bef408d1d:
Copy link
Member

Choose a reason for hiding this comment

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

personally not a fan of making this more lines just because.
what did sorting by digest accomplish ...?

Copy link
Member

Choose a reason for hiding this comment

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

guessing this is what a yaml normalizer outputs? (sorting keys, unquoting strings that don't need quotes, etc)

Copy link
Member

Choose a reason for hiding this comment

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

(though I tend to agree... makes finding the shas for a specific version or range of versions hard)

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. 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/release Categorizes an issue or PR as relevant to SIG Release. 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.

9 participants