Skip to content

Add imagestream for driver-toolkit#60

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
dagrayvid:add-imagestream-manifests
Sep 15, 2021
Merged

Add imagestream for driver-toolkit#60
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
dagrayvid:add-imagestream-manifests

Conversation

@dagrayvid
Copy link
Contributor

@dagrayvid dagrayvid commented Sep 14, 2021

This PR adds a manifests/ directory, and a manifest for an imagestream.

The imagestream contains a latest tag, and a tag for the RHCOS version corresponding to a release.
The string 0.0.1-snapshot-machine-os will be substituted with the RHCOS version in the manifest. The substitution will happen when oc adm release new ... is run, and the rhcos version is scraped from the machine-os-content.

See the oc code for information on how the substitution works. https://github.com/openshift/oc/blob/5d8dfa1c2e8e7469d69d76f21e0a166a0de8663b/pkg/cli/admin/release/image_mapper.go#L328-L334

Signed-off-by: David Gray [email protected]

@openshift-ci
Copy link

openshift-ci bot commented Sep 14, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dagrayvid

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 14, 2021
@dagrayvid
Copy link
Contributor Author

dagrayvid commented Sep 14, 2021

/cc @kpouget
/cc @wking
/cc @sosiouxme

@dagrayvid
Copy link
Contributor Author

dagrayvid commented Sep 14, 2021

/hold need to add the manifest to the image.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 14, 2021
@dagrayvid dagrayvid force-pushed the add-imagestream-manifests branch from fcdadd7 to 7315eed Compare September 14, 2021 16:08
@dagrayvid
Copy link
Contributor Author

dagrayvid commented Sep 14, 2021

/retest

wking
wking reviewed Sep 14, 2021
View reviewed changes
manifests/01-openshift-imagestream.yaml Outdated
scheduled: true
from:
kind: DockerImage
name: quay.io/openshift/driver-toolkit:v4.0
Copy link
Member

@wking wking Sep 14, 2021

Choose a reason for hiding this comment

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

To make it more obvious that this is just a placeholder for the image-references replacement, I'd consider using example.com/image-reference-placeholder:driver-toolkit or some such, that folks won't mistake as a real pullspec.

Copy link
Contributor

@kpouget kpouget Sep 14, 2021

Choose a reason for hiding this comment

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

+1, I was going to ask what this :v4.0 was referring to ;-)

@smarterclayton
Copy link

smarterclayton commented Sep 14, 2021

You have to take a reference to the machine-os image (your operator is dependent on it now) in image-references.

@dagrayvid dagrayvid force-pushed the add-imagestream-manifests branch from 7315eed to b012639 Compare September 14, 2021 18:10
@dagrayvid dagrayvid force-pushed the add-imagestream-manifests branch from b012639 to 464acca Compare September 14, 2021 18:22
@dagrayvid
Copy link
Contributor Author

dagrayvid commented Sep 14, 2021

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 14, 2021
@kpouget
Copy link
Contributor

kpouget commented Sep 15, 2021

thanks for the PR @dagrayvid !!

for reference, here is an example of imagestream generated by the image test:

kind: ImageStream
apiVersion: image.openshift.io/v1
metadata:
  namespace: openshift
  name: driver-toolkit
  annotations:
    include.release.openshift.io/ibm-cloud-managed: "true"
    include.release.openshift.io/self-managed-high-availability: "true"
    include.release.openshift.io/single-node-developer: "true"
spec:
  tags:
  - name: latest
    importPolicy:
      scheduled: true
    from:
      kind: DockerImage
      name: registry.build01.ci.openshift.org/ci-op-hd94j6q8/stable@sha256:6e2f344637b86c6f80c520c73b6e066b983838e48f050eacdf4cc4637d6772c8
  - name: 49.84.202109102026-0 
    importPolicy:
      scheduled: true
    from:
      kind: DockerImage
      name: registry.build01.ci.openshift.org/ci-op-hd94j6q8/stable@sha256:6e2f344637b86c6f80c520c73b6e066b983838e48f050eacdf4cc4637d6772c8

This PR will allow a great simplification of the GPU Operator (WIP) code in charge of handling the DTK DaemonSet during cluster upgrade. See openshift-psap/ci-artifacts#241 and nvidia/gpu-operator#298 for this on-going work.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 15, 2021
@openshift-merge-robot openshift-merge-robot merged commit c318985 into openshift:master Sep 15, 2021
This was referenced Sep 16, 2021
Merged
Merged
@dagrayvid
Copy link
Contributor Author

dagrayvid commented Sep 30, 2021

/cherry-pick release-4.9

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 30, 2021
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 30, 2021

@dagrayvid: new pull request created: #64

Details

In response to this:

/cherry-pick release-4.9

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.

@kpouget kpouget mentioned this pull request Oct 15, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ArangoGutierrez ArangoGutierrez Awaiting requested review from ArangoGutierrez

@jmencak jmencak Awaiting requested review from jmencak

@kpouget kpouget Awaiting requested review from kpouget

@sosiouxme sosiouxme Awaiting requested review from sosiouxme

1 more reviewer

@wking wking wking left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@kpouget kpouget

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@dagrayvid @smarterclayton @kpouget @openshift-cherrypick-robot @wking @openshift-merge-robot