Skip to content

Conversation

@ReToCode
Copy link

The script is called for multiple paths, unfortunately the different base paths result in different amount of trailing/leading slashes:

Writing resolved yaml to openshift/release/artifacts//serving-crds.yaml
file: config/core/300-imagecache.yaml
file: config/core/300-resources//certificate.yaml
...

vs.

Writing resolved yaml to openshift/release/artifacts//serving-core.yaml
file: config/core//300-imagecache.yaml
file: config/core//300-resources/certificate.yaml
...

Tested in #147

/hold for tests

@ReToCode
Copy link
Author

/cc @nak3, @skonto

# 3. Replace serving.knative.dev/release label.
# 4. Remove seccompProfile, except on CRD files in 300-resources folder to avoid breaking CRDs.
if [[ $file == config/core//300-resources/* ]]; then
if [[ $file == */300-resources/* ]]; then
Copy link

Choose a reason for hiding this comment

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

Another option would be to remove slashes with echo $file | sed s#//*#/#g.

@skonto
Copy link

skonto commented Jan 31, 2023

/lgtm hold for tests

@skonto
Copy link

skonto commented Jan 31, 2023

/lgtm

@ReToCode
Copy link
Author

Tests are passing
/unhold

@openshift-ci
Copy link

openshift-ci bot commented Jan 31, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ReToCode, skonto

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-merge-robot openshift-merge-robot merged commit 01eb11a into openshift-knative:main Jan 31, 2023
@ReToCode ReToCode deleted the fix-crd-issue-main branch January 31, 2023 14:51
openshift-merge-robot pushed a commit that referenced this pull request Mar 8, 2023
* [SRVKS-988] Drop duplicate manifests (#81)

* Drop duplicate manifests

* keep

* Drop openshift/release/artifacts

* Add correct version

* Revert Makefile

* Set label version based on the branch name

* [SRVKS-1000] Use SO repo's script to install serverless (#89)

* Drop CI yamls

* Avoid replacing seccompProfile in CRD files (#148)

* Fix seccompProfile:

* Drop 006-secure-pod-defaults.patch

* Fix invalid new line in domainmapping

---------

Co-authored-by: Reto Lehmann <retocode@icloud.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants