Skip to content

dist/openshift: Declare group in Template apiVersion#727

Merged
openshift-merge-robot merged 1 commit into
openshift:masterfrom
wking:declare-template-group
Aug 11, 2022
Merged

dist/openshift: Declare group in Template apiVersion#727
openshift-merge-robot merged 1 commit into
openshift:masterfrom
wking:declare-template-group

Conversation

@wking
Copy link
Copy Markdown
Member

@wking wking commented Aug 11, 2022

As defined here and documented here. Unclear to me why the initial empty-group apiVersion had been working, but we'd been using that approach since cfa2c31 (#23). Adding the group should avoid:

+ oc process -f dist/openshift/observability.yaml -p NAMESPACE=openshift-update-service
error: failed to read input object (not a Template?): resource mapping not found for name: "cincinnati-observability" namespace: "" from "dist/openshift/observability.yaml": no matches for kind "Template" in version "v1"
ensure CRDs are installed first

and match:

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_release/31237/rehearse-31237-pull-ci-openshift-cincinnati-master-e2e/1557741650380328960/artifacts/e2e/gather-must-gather/artifacts/must-gather.tar | tar tvz | grep 'cluster-scoped-resources.*template' | grep -v counts
-rw------- 1010620000/root     3224 2022-08-11 11:17 quay-io-openshift-release-dev-ocp-v4-0-art-dev-sha256-347d2a0427701d8f358d53ecc3e6b4e5779af090bbce71577fa019255e7f4a21/cluster-scoped-resources/apiregistration.k8s.io/apiservices/v1.template.openshift.io.yaml
$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_release/31237/rehearse-31237-pull-ci-openshift-cincinnati-master-e2e/1557741650380328960/artifacts/e2e/gather-must-gather/artifacts/must-gather.tar | tar xOz quay-io-openshift-release-dev-ocp-v4-0-art-dev-sha256-347d2a0427701d8f358d53ecc3e6b4e5779af090bbce71577fa019255e7f4a21/cluster-scoped-resources/apiregistration.k8s.io/apiservices/v1.template.openshift.io.yaml | yaml2json | jq -c '.spec | {group, version}'
{"group":"template.openshift.io","version":"v1"}

As defined in [1] and documented in [2].  Unclear to me why the
initial empty-group apiVersion had been working, but we'd been using
that approach since cfa2c31 (introduce openshift template, cm and
secret, 2018-12-05, #23).  Adding the group should avoid [3]:

  + oc process -f dist/openshift/observability.yaml -p NAMESPACE=openshift-update-service
  error: failed to read input object (not a Template?): resource mapping not found for name: "cincinnati-observability" namespace: "" from "dist/openshift/observability.yaml": no matches for kind "Template" in version "v1"
  ensure CRDs are installed first

and match:

  $ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_release/31237/rehearse-31237-pull-ci-openshift-cincinnati-master-e2e/1557741650380328960/artifacts/e2e/gather-must-gather/artifacts/must-gather.tar | tar tvz | grep 'cluster-scoped-resources.*template' | grep -v counts
  -rw------- 1010620000/root     3224 2022-08-11 11:17 quay-io-openshift-release-dev-ocp-v4-0-art-dev-sha256-347d2a0427701d8f358d53ecc3e6b4e5779af090bbce71577fa019255e7f4a21/cluster-scoped-resources/apiregistration.k8s.io/apiservices/v1.template.openshift.io.yaml
  $ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_release/31237/rehearse-31237-pull-ci-openshift-cincinnati-master-e2e/1557741650380328960/artifacts/e2e/gather-must-gather/artifacts/must-gather.tar | tar xOz quay-io-openshift-release-dev-ocp-v4-0-art-dev-sha256-347d2a0427701d8f358d53ecc3e6b4e5779af090bbce71577fa019255e7f4a21/cluster-scoped-resources/apiregistration.k8s.io/apiservices/v1.template.openshift.io.yaml | yaml2json | jq -c '.spec | {group, version}'
  {"group":"template.openshift.io","version":"v1"}

[1]: https://github.com/openshift/api/blame/72d2ca90c49733567a5530e42aece2e68bd709ea/template/install.go#L11
[2]: https://docs.openshift.com/container-platform/4.10/rest_api/template_apis/template-template-openshift-io-v1.html
[3]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_release/31237/rehearse-31237-pull-ci-openshift-cincinnati-master-e2e/1557741650380328960#1:build-log.txt%3A108-110
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 11, 2022
Copy link
Copy Markdown
Contributor

@PratikMahajan PratikMahajan left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 11, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 11, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: PratikMahajan, wking

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 [PratikMahajan,wking]

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

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 2 against base HEAD 867409d and 8 for PR HEAD 86972bb in total

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 1 against base HEAD 867409d and 7 for PR HEAD 86972bb in total

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD 867409d and 6 for PR HEAD 86972bb in total

@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 11, 2022

e2e failed, but orthogonal error.

/override ci/prow/e2e

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 11, 2022

@wking: Overrode contexts on behalf of wking: ci/prow/e2e

Details

In response to this:

e2e failed, but orthogonal error.

/override ci/prow/e2e

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 11, 2022

@wking: 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 b55a6ce into openshift:master Aug 11, 2022
@wking wking deleted the declare-template-group branch November 26, 2024 23:11
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants