Skip to content

Conversation

@PratikMahajan
Copy link
Contributor

@PratikMahajan PratikMahajan commented Jul 17, 2023

this PR fixes the existing configs/settings, removes unused imports
and adds a sample deployment yaml that deploys the metadata-helper
container along with graph-builder and policy-engine.
deploying metadata-helper is optional and is used to serve existing signatures

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 17, 2023
@PratikMahajan PratikMahajan force-pushed the serve-sigs branch 4 times, most recently from 4989d41 to ac20664 Compare July 18, 2023 13:53
@PratikMahajan PratikMahajan changed the title fix configs and add signature serving deployment OTA-915: fix configs and add signature serving deployment Jul 18, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 18, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 18, 2023

@PratikMahajan: This pull request references OTA-915 which is a valid jira issue.

Details

In response to this:

this PR fixes the existing configs/settings, removes unused imports
and adds a sample deployment yaml that deploys the metadata-helper
container along with graph-builder and policy-engine.
deploying metadata-helper is optional and is used to serve existing signatures

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.

@PratikMahajan PratikMahajan force-pushed the serve-sigs branch 2 times, most recently from 908f5ca to d122954 Compare July 18, 2023 16:03
this commit removes the unnecessary imports from the code.
Also changes the ports used for metadata-helper as there was a
port clash between pe and mh.

in tests, changed the type from hyper::Uri to IpAddr::V4 as
ipaddress correctly represents the data-type.
removes the unused upstream uri from metadata-helper
and modifies the dockerfile to copy the new metadata-helper
binary to cincinnati container.
Also adds a sample deployment that can be used to deploy the
cincinnati stack with metadata-helper container.
metadata-helper is an optional container to serve the release
signatures.
create a symlink to signatures directory for metadata-helper
the secondary metadata scraper creates a temp directory to extract graph-data
other containers wont have context of the directory that is being used.
signatures symlink is at /signatures in the graph-data directory and will keep
updating as newer graph-data is scraped.
Copy link
Member

@petr-muller petr-muller left a comment

Choose a reason for hiding this comment

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

/lgtm
/override ci/prow/e2e
We passed all tests but then failed in a post must-gather step

/hold
Holding to allow Lala / Trevor to take a look, but feel free to unhold if you think it is not necessary.

@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 Jul 20, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 20, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 20, 2023

@petr-muller: Overrode contexts on behalf of petr-muller: ci/prow/e2e

Details

In response to this:

/lgtm
/override ci/prow/e2e
We passed all tests but then failed in a post must-gather step

/hold
Holding to allow Lala / Trevor to take a look, but feel free to unhold if you think it is not necessary.

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.

Copy link
Member

@LalatenduMohanty LalatenduMohanty left a comment

Choose a reason for hiding this comment

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

/lgtm

@LalatenduMohanty
Copy link
Member

/hold cancel

@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 Jul 21, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, petr-muller, PratikMahajan

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:
  • OWNERS [LalatenduMohanty,PratikMahajan,petr-muller]

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 21, 2023

@PratikMahajan: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 761afff into master Jul 21, 2023
wking added a commit to wking/cincinnati-operator that referenced this pull request Oct 3, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Oct 3, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Oct 3, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Oct 3, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Oct 3, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Oct 3, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Oct 3, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Oct 10, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Nov 7, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

The GRAPH_DATA local check consumes openshift/release@23d93465e8
(ci-operator/config/openshift/cincinnati-operator:
operator-e2e-old-ocp-published-graph-data, etc., 2023-11-02,
openshift/release#45245), which sets that variable for the
operator-e2e-hypershift-local-graph-data presubmit which consumes the
graph-data image built from dev/Dockerfile (where we inject the
signature we're testing for).  The other end-to-end tests will consume
external graph-data images (built by cincinnati-graph-data
postsubmits), have GRAPH_DATA unset, and expect '404 Not Found' for
requests for that signature.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Nov 7, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

The GRAPH_DATA local check consumes openshift/release@23d93465e8
(ci-operator/config/openshift/cincinnati-operator:
operator-e2e-old-ocp-published-graph-data, etc., 2023-11-02,
openshift/release#45245), which sets that variable for the
operator-e2e-hypershift-local-graph-data presubmit which consumes the
graph-data image built from dev/Dockerfile (where we inject the
signature we're testing for).  The other end-to-end tests will consume
external graph-data images (built by cincinnati-graph-data
postsubmits), have GRAPH_DATA unset, and expect '404 Not Found' for
requests for that signature.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Nov 7, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

The GRAPH_DATA local check consumes openshift/release@23d93465e8
(ci-operator/config/openshift/cincinnati-operator:
operator-e2e-old-ocp-published-graph-data, etc., 2023-11-02,
openshift/release#45245), which sets that variable for the
operator-e2e-hypershift-local-graph-data presubmit which consumes the
graph-data image built from dev/Dockerfile (where we inject the
signature we're testing for).  The other end-to-end tests will consume
external graph-data images (built by cincinnati-graph-data
postsubmits), have GRAPH_DATA unset, and expect '404 Not Found' for
requests for that signature.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Nov 7, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

The GRAPH_DATA local check consumes openshift/release@23d93465e8
(ci-operator/config/openshift/cincinnati-operator:
operator-e2e-old-ocp-published-graph-data, etc., 2023-11-02,
openshift/release#45245), which sets that variable for the
operator-e2e-hypershift-local-graph-data presubmit which consumes the
graph-data image built from dev/Dockerfile (where we inject the
signature we're testing for).  The other end-to-end tests will consume
external graph-data images (built by cincinnati-graph-data
postsubmits), have GRAPH_DATA unset, and expect '404 Not Found' for
requests for that signature.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Nov 8, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

The GRAPH_DATA local check consumes openshift/release@23d93465e8
(ci-operator/config/openshift/cincinnati-operator:
operator-e2e-old-ocp-published-graph-data, etc., 2023-11-02,
openshift/release#45245), which sets that variable for the
operator-e2e-hypershift-local-graph-data presubmit which consumes the
graph-data image built from dev/Dockerfile (where we inject the
signature we're testing for).  The other end-to-end tests will consume
external graph-data images (built by cincinnati-graph-data
postsubmits), have GRAPH_DATA unset, and expect '404 Not Found' for
requests for that signature.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Nov 8, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

The GRAPH_DATA local check consumes openshift/release@23d93465e8
(ci-operator/config/openshift/cincinnati-operator:
operator-e2e-old-ocp-published-graph-data, etc., 2023-11-02,
openshift/release#45245), which sets that variable for the
operator-e2e-hypershift-local-graph-data presubmit which consumes the
graph-data image built from dev/Dockerfile (where we inject the
signature we're testing for).  The other end-to-end tests will consume
external graph-data images (built by cincinnati-graph-data
postsubmits), have GRAPH_DATA unset, and expect '404 Not Found' for
requests for that signature.

[1]: openshift/enhancements#1485
wking added a commit to wking/cincinnati-operator that referenced this pull request Nov 9, 2023
Catching up with openshift/cincinnati@efe98dcbbbc6 (add
metadata-helper deployments, 2023-07-18, openshift/cincinnati#816),
allowing users to retrieve signatures from the metadata Route.  For
signatures provided via the graph-data image, this will provide a more
convenient access than pushing signature ConfigMaps to individual
clusters.  [1] is in flight with a proposed mechanism to configure
clusters to consume this signature-metadata endpoint.

I'm using the multi-arch 4.13.0 as the example release for signatures:

  $ curl -s 'https://api.openshift.com/api/upgrades_info/graph?channel=stable-4.13&arch=multi' | jq -r '.nodes[] | select(.version == "4.13.0").payload'
  quay.io/openshift-release-dev/ocp-release@sha256:beda83fb057e328d6f94f8415382350ca3ddf99bb9094e262184e0f127810ce0

The signature location in the graph-data image is defined in
openshift/cincinnati-graph-data@9e9e97cf2a (README: Define a 1.2.0
filesystem schema for release signatures, 2023-04-19,
openshift/cincinnati-graph-data#3509).

The GRAPH_DATA local check consumes openshift/release@23d93465e8
(ci-operator/config/openshift/cincinnati-operator:
operator-e2e-old-ocp-published-graph-data, etc., 2023-11-02,
openshift/release#45245), which sets that variable for the
operator-e2e-hypershift-local-graph-data presubmit which consumes the
graph-data image built from dev/Dockerfile (where we inject the
signature we're testing for).  The other end-to-end tests will consume
external graph-data images (built by cincinnati-graph-data
postsubmits), have GRAPH_DATA unset, and expect '404 Not Found' for
requests for that signature.

[1]: openshift/enhancements#1485
@PratikMahajan PratikMahajan deleted the serve-sigs branch April 4, 2024 17:49
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants