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

k8s.gcr.io: k8s-staging-csi -> k8s-staging-sig-storage #952

Merged
merged 1 commit into from
Jun 18, 2020

Conversation

pohly
Copy link
Contributor

@pohly pohly commented Jun 12, 2020

As discussed in #943, we want
to consolidate all images produced by SIG-storage under
k8s-staging-sig-storage, which makes k8s-staging-csi obsolete.

The images that get promoted here are the same ones we promoted previously for k8s-staging-csi, with three additions:

  • csi-provisioner:v1.4.0
  • csi-provisioner:v1.5.0
  • csi-snapshotter:v1.2.0

Those three were left out earlier, but are still needed by csi-driver-host-path deployments on older Kubernetes.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 12, 2020
@k8s-ci-robot k8s-ci-robot requested review from humblec and wongma7 June 12, 2020 13:28
@k8s-ci-robot k8s-ci-robot added area/artifacts Issues or PRs related to the hosting of release artifacts for subprojects wg/k8s-infra labels Jun 12, 2020
@pohly
Copy link
Contributor Author

pohly commented Jun 12, 2020

The images were moved to k8s-staging-sig-storage with:

#! /bin/sh

set -e

# List of repos under https://console.cloud.google.com/gcr/images/k8s-staging-csi/GLOBAL
repos="
csi-attacher
csi-node-driver-registrar
csi-provisioner
csi-resizer
csi-snapshotter
hostpathplugin
livenessprobe
mock-driver
snapshot-controller
"

for repo in $repos; do
    gcloud container images list-tags gcr.io/k8s-staging-csi/$repo --format='get(digest, tags)' --filter='tags~^v AND NOT tags~v2020 AND NOT tags~-rc' | while read sha tag; do
        docker pull gcr.io/k8s-staging-csi/$repo:$tag
        docker tag gcr.io/k8s-staging-csi/$repo:$tag gcr.io/k8s-staging-sig-storage/$repo:$tag
        docker push gcr.io/k8s-staging-sig-storage/$repo:$tag
    done
done

while read repo tag; do
    docker pull quay.io/k8scsi/$repo:$tag
    docker tag quay.io/k8scsi/$repo:$tag gcr.io/k8s-staging-sig-storage/$repo:$tag
    docker push gcr.io/k8s-staging-sig-storage/$repo:$tag
done <<EOF
    csi-provisioner v1.4.0
    csi-provisioner v1.5.0
    csi-snapshotter v1.2.0
EOF

@pohly
Copy link
Contributor Author

pohly commented Jun 12, 2020

Most of the image hashes were not modified when copying them, except for the mock-driver v3.1.1 (!?):

$ git show HEAD~:k8s.gcr.io/images/k8s-staging-csi/images.yaml | diff -c - k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml
*** -	2020-06-12 15:30:33.640377733 +0200
--- k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml	2020-06-12 15:22:21.012190832 +0200
***************
*** 8,13 ****
--- 8,15 ----
  - name: csi-provisioner
    dmap:
      "sha256:78e3393f5fd5ff6c1e5dada2478cfa456fb7164929e573cf9a87bf6532730679": [ "v1.6.0" ]
+     "sha256:6fe39f4682c8677af7761948b196f27c45de566fb5f1612bb8114cd68bfe535e": [ "v1.5.0" ]
+     "sha256:438c04395d03fa671f8656d6f951332516754e330d1ac4f9588df1ba2870a366": [ "v1.4.0" ]
  - name: csi-resizer
    dmap:
      "sha256:6c6a0332693a7c456378f6abd2bb40611826c1e1a733cadbdae2daab3125b71c": [ "v0.5.0" ]
***************
*** 16,21 ****
--- 18,24 ----
    dmap:
      "sha256:35ead85dd09aa8cc612fdb598d4e0e2f048bef816f1b74df5eeab67cd21b10aa": [ "v2.1.0" ]
      "sha256:1530db9fd380ecee86b48a7b3540568c46adb5a64b7fe718c51d9260c4834fd8": [ "v2.0.1" ]
+     "sha256:4e78bb0116555a10ef59c1cdf0648b06b483903a1919def5e3c7ba68b9fa08cb": [ "v1.2.0" ]
  - name: hostpathplugin
    dmap:
  - name: livenessprobe
***************
*** 23,29 ****
      "sha256:f8cec70adc74897ddde5da4f1da0209a497370eaf657566e2b36bc5f0f3ccbd7": [ "v1.1.0" ]
  - name: mock-driver
    dmap:
      "sha256:0b4273abac4c241fa3d70aaf52b0d79a133d2737081f4a5c5dea4949f6c45dc3": [ "v3.1.0" ]
-     "sha256:e7c5d268c1f83d423afc6e6d84aec6d3a93a864672ec441d6c66eb013e887972": [ "v3.1.1" ]
  - name: snapshot-controller
    dmap:
--- 26,32 ----
      "sha256:f8cec70adc74897ddde5da4f1da0209a497370eaf657566e2b36bc5f0f3ccbd7": [ "v1.1.0" ]
  - name: mock-driver
    dmap:
+     "sha256:5290491dc39ef261b3ef17de2a78cfa1186148b4af10d5b99328258111d3a340": [ "v3.1.1" ]
      "sha256:0b4273abac4c241fa3d70aaf52b0d79a133d2737081f4a5c5dea4949f6c45dc3": [ "v3.1.0" ]
  - name: snapshot-controller
    dmap:

@pohly
Copy link
Contributor Author

pohly commented Jun 12, 2020

/hold

The multi-arch mock-driver v3.1.1 was not copied correctly by "docker pull && docker push": the non-amd64 architectures got dropped.

@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 Jun 12, 2020
As discussed in kubernetes#943, we want
to consolidate all images produced by SIG-storage under
k8s-staging-sig-storage, which makes k8s-staging-csi obsolete.
@pohly pohly force-pushed the staging-sig-storage branch from 45c1aea to 4353109 Compare June 12, 2020 13:40
@pohly
Copy link
Contributor Author

pohly commented Jun 12, 2020

It's not immediately obvious to me how one can copy a multi-arch image from the Docker command line. Pulling by hash and tagging that hash did not work either.

But this 3.1.1 was just a test anyway and will be superseded soon.

Therefore I removed it from the staging repo and from the images.yaml and propose to simply not promote it.

/hold cancel

@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 Jun 12, 2020
@msau42
Copy link
Member

msau42 commented Jun 16, 2020

/lgtm
/approve
/assign @spiffxp

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 16, 2020
@spiffxp
Copy link
Member

spiffxp commented Jun 18, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msau42, pohly, spiffxp

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 Jun 18, 2020
@k8s-ci-robot k8s-ci-robot merged commit 89c4c00 into kubernetes:master Jun 18, 2020
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/artifacts Issues or PRs related to the hosting of release artifacts for subprojects 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants