payload: Ignore files without yaml, yml, or json extensions #64
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
approved
Contributor
Author
|
/assign @abhinavdahiya |
We want release payloads to be directories that `kubectl create -f DIR` would be equivalent to keep CVO to remain a simple operator. Explicitly ignore those files. Add a test case to verify payload loading. To make testing easier, change the value structs to have public members.
smarterclayton
force-pushed
the
selectively_apply
branch
from
48e4b3c to
dcab5e4
Compare
Contributor
Author
|
/retest |
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya, smarterclayton The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
wking
added a commit
to wking/cluster-version-operator
that referenced
this pull request
Jan 24, 2019
Catching up with openshift/cluster-openshift-apiserver-operator@5a15f36e (move openshift apiserver later in CVO payload, 2019-01-21, openshift/cluster-openshift-apiserver-operator#121) moving to 61, openshift/machine-config-operator@4dd8b917 (mco/install: update mco run level to 30, 2019-01-21, openshift/machine-config-operator#331), and operator-framework/operator-lifecycle-manager@f0e86b8c (chore(deploy): change 30 prefix to 50, 2019-01-21, operator-framework/operator-lifecycle-manager#678). I'm not personally clear on the reasoning; I'd have expected the OLM entries to belong at the end of the queue, since they seem less central than the OpenShift core operators. The Machine API and autoapprover entries had been added to the end of the queue in dcab5e4 (payload: Ignore files without yaml, yml, or json extensions, 2018-12-01, openshift#64), but I don't see any discussion of that placement there. I'd also understood the 0000_ prefix to be a special case for where ordering is critical, with most operators landing without specific ordering after the key components had been addressed. I dunno how that squares with: $ oc adm release extract --from=quay.io/openshift-release-dev/ocp-release:4.0.0-0.1 --to=/tmp/manifests Extracted release payload from digest sha256:66cee7428ba0d3cb983bd2a437e576b2289e7fd5abafa70256200a5408b26644 created at 2019-01-15T04:04:22Z $ ls /tmp/manifests | wc -l 191 $ ls /tmp/manifests | grep -v '^0000_' image-references release-metadata it looks like *all* of our operators are setting the 0000_ prefix.
wking
added a commit
to wking/cluster-version-operator
that referenced
this pull request
Jan 24, 2019
Catching up with openshift/cluster-openshift-apiserver-operator@5a15f36e (move openshift apiserver later in CVO payload, 2019-01-21, openshift/cluster-openshift-apiserver-operator#121) moving to 61, openshift/machine-config-operator@4dd8b917 (mco/install: update mco run level to 30, 2019-01-21, openshift/machine-config-operator#331), and operator-framework/operator-lifecycle-manager@f0e86b8c (chore(deploy): change 30 prefix to 50, 2019-01-21, operator-framework/operator-lifecycle-manager#678). I'm not personally clear on the reasoning; I'd have expected the OLM entries to belong at the end of the queue, since they seem less central than the OpenShift core operators. The Machine API and autoapprover entries had been added to the end of the queue in dcab5e4 (payload: Ignore files without yaml, yml, or json extensions, 2018-12-01, openshift#64), but I don't see any discussion of that placement there. I'd also understood the 0000_ prefix to be a special case for where ordering is critical, with most operators landing without specific ordering after the key components had been addressed. I dunno how that squares with: $ oc adm release extract --from=quay.io/openshift-release-dev/ocp-release:4.0.0-0.1 --to=/tmp/manifests Extracted release payload from digest sha256:66cee7428ba0d3cb983bd2a437e576b2289e7fd5abafa70256200a5408b26644 created at 2019-01-15T04:04:22Z $ ls /tmp/manifests | wc -l 191 $ ls /tmp/manifests | grep -v '^0000_' image-references release-metadata it looks like *all* of our operators are setting the 0000_ prefix.
wking
added a commit
to wking/cluster-version-operator
that referenced
this pull request
Jan 24, 2019
Catching up with openshift/cluster-openshift-apiserver-operator@5a15f36e (move openshift apiserver later in CVO payload, 2019-01-21, openshift/cluster-openshift-apiserver-operator#121) moving to 61, openshift/machine-config-operator@4dd8b917 (mco/install: update mco run level to 30, 2019-01-21, openshift/machine-config-operator#331), and operator-framework/operator-lifecycle-manager@f0e86b8c (chore(deploy): change 30 prefix to 50, 2019-01-21, operator-framework/operator-lifecycle-manager#678). I'm not personally clear on the reasoning; I'd have expected the OLM entries to belong at the end of the queue, since they seem less central than the OpenShift core operators. The Machine API and autoapprover entries had been added to the end of the queue in dcab5e4 (payload: Ignore files without yaml, yml, or json extensions, 2018-12-01, openshift#64), but I don't see any discussion of that placement there. I'd also understood the 0000_ prefix to be a special case for where ordering is critical, with most operators landing without specific ordering after the key components had been addressed. I dunno how that squares with: $ oc adm release extract --from=quay.io/openshift-release-dev/ocp-release:4.0.0-0.1 --to=/tmp/manifests Extracted release payload from digest sha256:66cee7428ba0d3cb983bd2a437e576b2289e7fd5abafa70256200a5408b26644 created at 2019-01-15T04:04:22Z $ ls /tmp/manifests | wc -l 191 $ ls /tmp/manifests | grep -v '^0000_' image-references release-metadata it looks like *all* of our operators are setting the 0000_ prefix.
wking
added a commit
to wking/cluster-version-operator
that referenced
this pull request
Jan 24, 2019
Catching up with openshift/cluster-openshift-apiserver-operator@5a15f36e (move openshift apiserver later in CVO payload, 2019-01-21, openshift/cluster-openshift-apiserver-operator#121) moving to 61, openshift/cluster-openshift-controller-manager-operator@b823879a (move openshift controller manager later in CVO payload, 2019-01-21, openshift/cluster-openshift-controller-manager-operator#61) moving to 63, openshift/machine-config-operator@4dd8b917 (mco/install: update mco run level to 30, 2019-01-21, openshift/machine-config-operator#331), and operator-framework/operator-lifecycle-manager@f0e86b8c (chore(deploy): change 30 prefix to 50, 2019-01-21, operator-framework/operator-lifecycle-manager#678). I'm not personally clear on the reasoning; I'd have expected the OLM entries to belong at the end of the queue, since they seem less central than the OpenShift core operators. In [1], David Eads says that nothing earlier than 70 should require OpenShift APIs. The Machine API and autoapprover entries had been added to the end of the queue in dcab5e4 (payload: Ignore files without yaml, yml, or json extensions, 2018-12-01, openshift#64), but I don't see any discussion of that placement there. I'd also understood the 0000_ prefix to be a special case for where ordering is critical, with most operators landing without specific ordering after the key components had been addressed. I dunno how that squares with: $ oc adm release extract --from=quay.io/openshift-release-dev/ocp-release:4.0.0-0.1 --to=/tmp/manifests Extracted release payload from digest sha256:66cee7428ba0d3cb983bd2a437e576b2289e7fd5abafa70256200a5408b26644 created at 2019-01-15T04:04:22Z $ ls /tmp/manifests | wc -l 191 $ ls /tmp/manifests | grep -v '^0000_' image-references release-metadata it looks like *all* of our operators are setting the 0000_ prefix. [1]: openshift/cluster-openshift-controller-manager-operator#61 (comment)
wking
added a commit
to wking/cluster-version-operator
that referenced
this pull request
Jan 24, 2019
Catching up with openshift/cluster-machine-approver@67d2bbcb (Change run level to 09, 2019-01-21, openshift/cluster-machine-approver#12), openshift/cluster-openshift-apiserver-operator@5a15f36e (move openshift apiserver later in CVO payload, 2019-01-21, openshift/cluster-openshift-apiserver-operator#121) moving to 61, openshift/cluster-openshift-controller-manager-operator@b823879a (move openshift controller manager later in CVO payload, 2019-01-21, openshift/cluster-openshift-controller-manager-operator#61) moving to 63, openshift/machine-config-operator@4dd8b917 (mco/install: update mco run level to 30, 2019-01-21, openshift/machine-config-operator#331), and operator-framework/operator-lifecycle-manager@f0e86b8c (chore(deploy): change 30 prefix to 50, 2019-01-21, operator-framework/operator-lifecycle-manager#678). I'm not personally clear on the reasoning; I'd have expected the OLM entries to belong at the end of the queue, since they seem less central than the OpenShift core operators. In [1], David Eads says that nothing earlier than 70 should require OpenShift APIs. The Machine API and autoapprover entries had been added to the end of the queue in dcab5e4 (payload: Ignore files without yaml, yml, or json extensions, 2018-12-01, openshift#64), but I don't see any discussion of that placement there. I'd also understood the 0000_ prefix to be a special case for where ordering is critical, with most operators landing without specific ordering after the key components had been addressed. I dunno how that squares with: $ oc adm release extract --from=quay.io/openshift-release-dev/ocp-release:4.0.0-0.1 --to=/tmp/manifests Extracted release payload from digest sha256:66cee7428ba0d3cb983bd2a437e576b2289e7fd5abafa70256200a5408b26644 created at 2019-01-15T04:04:22Z $ ls /tmp/manifests | wc -l 191 $ ls /tmp/manifests | grep -v '^0000_' image-references release-metadata it looks like *all* of our operators are setting the 0000_ prefix. [1]: openshift/cluster-openshift-controller-manager-operator#61 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We want release payloads to be directories that
kubectl create -f DIRwould be equivalent to keep CVO to remain a simple operator. Explicitly
ignore those files.
Change the cincinnati payload name to its new location
release-metadataAdd a test case to verify payload loading. To make testing easier, change
the value structs to have public members.
Blocks openshift/origin#21569 which changes to
write
release-metadata, which was being interpreted by CVO as an objectto apply.