Skip to content

Bug 1940488: add etc-pki-entitlements from pod secrets if available to build container#228

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
gabemontero:add-back-entitle-mnt
Mar 26, 2021
Merged

Bug 1940488: add etc-pki-entitlements from pod secrets if available to build container#228
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
gabemontero:add-back-entitle-mnt

Conversation

@gabemontero
Copy link
Copy Markdown
Contributor

/assign @adambkaplan
@nalind FYI

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@gabemontero: This pull request references Bugzilla bug 1940488, which is invalid:

  • expected the bug to target the "4.8.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1940488: add etc-pki-entitlements from pod secrets if available to build container

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-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Mar 18, 2021
@gabemontero
Copy link
Copy Markdown
Contributor Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Mar 18, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@gabemontero: This pull request references Bugzilla bug 1940488, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @xiuwang

Details

In response to this:

/bugzilla refresh

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.

@gabemontero
Copy link
Copy Markdown
Contributor Author

Hmmm .... perhaps new req's wrt ci and the images used being mirrored:


: [sig-arch] Only known images used by tests expand_less | 0s
-- | --
Cluster accessed images that were not mirrored to the testing repository or already part of the cluster, see test/extended/util/image/README.md in the openshift/origin repo:  registry.redhat.io/rhscl/nodejs-10-rhel7 from pods:   ns/e2e-test-s2i-usage-jplzl pod/test-pod-1936517f-3d21-46e3-9366-0c6c3ffac5d8 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-jplzl pod/test-pod-80699787-07fc-47e2-bd5a-d1eff6cc7527 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-t6f2r pod/test-pod-9e83b187-4ed2-45ce-9320-72c58af3e8cd node/ip-10-0-152-51.ec2.internal registry.redhat.io/rhscl/nodejs-12-rhel7 from pods:   ns/e2e-test-s2i-usage-dp228 pod/test-pod-e1fb2196-aa49-4bdc-a214-1ef26f59ab12 node/ip-10-0-152-51.ec2.internal   ns/e2e-test-s2i-usage-n7jhf pod/test-pod-37d7b35f-ada0-4257-9626-204e6ae5b4dc node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-n7jhf pod/test-pod-c2cda6e1-919b-4a6e-a87d-21926dc231a8 node/ip-10-0-152-51.ec2.internal registry.redhat.io/rhscl/perl-526-rhel7 from pods:   ns/e2e-test-s2i-usage-7dzvt pod/test-pod-5525ef1f-7cd1-4836-aecf-77862a3b9766 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-7dzvt pod/test-pod-93ec894b-1f2f-4f51-be73-e526f4473479 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-wjhqp pod/test-pod-3947b58d-3e99-4f17-b8c2-bd59c3973e6f node/ip-10-0-240-50.ec2.internal registry.redhat.io/rhscl/php-72-rhel7 from pods:   ns/e2e-test-s2i-usage-zwc6w pod/test-pod-c85df50a-acae-49f7-b832-6e53acec2668 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-zwh95 pod/test-pod-0d468fdc-2eb1-4617-ac9e-fd0d4c73ddf2 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-zwh95 pod/test-pod-6f2bc312-86f9-46c5-ab71-7508e0298dfd node/ip-10-0-240-50.ec2.internal registry.redhat.io/rhscl/php-73-rhel7 from pods:   ns/e2e-test-s2i-usage-5r9cl pod/test-pod-5994d9bd-4471-4382-8725-9bfc6794f602 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-t7pp5 pod/test-pod-e5f2142d-81bb-4c46-9de9-064e77ca06d1 node/ip-10-0-158-146.ec2.internal   ns/e2e-test-s2i-usage-t7pp5 pod/test-pod-e7402586-1f29-46dd-8f86-a7078fbeb433 node/ip-10-0-158-146.ec2.internal registry.redhat.io/rhscl/python-27-rhel7 from pods:   ns/e2e-test-s2i-usage-9q8w7 pod/test-pod-d6800330-494c-4b24-a2ef-1c3e39fcdce5 node/ip-10-0-152-51.ec2.internal   ns/e2e-test-s2i-usage-9q8w7 pod/test-pod-ed09b2f2-b0ed-4006-a53d-e2cad38f072d node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-pmcck pod/test-pod-c522c037-4f9e-43b7-b316-a576ae774364 node/ip-10-0-240-50.ec2.internal registry.redhat.io/rhscl/python-36-rhel7 from pods:   ns/e2e-test-s2i-usage-78dlh pod/test-pod-6b58ff30-21fa-4147-bcdd-620243f7dfe1 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-xxwrm pod/test-pod-fa0ba80f-d6aa-4442-9d75-8b2712fde782 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-xxwrm pod/test-pod-fe78d3e4-e2b8-4ac9-8c78-dbb0a17bfea8 node/ip-10-0-152-51.ec2.internal registry.redhat.io/rhscl/ruby-26-rhel7 from pods:   ns/e2e-test-s2i-usage-5fck2 pod/test-pod-a6bfd290-da28-4a41-bad2-69cb901fa4df node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-kgbfs pod/test-pod-02af6714-0326-4bc4-afb0-6b96bdeaf211 node/ip-10-0-152-51.ec2.internal   ns/e2e-test-s2i-usage-kgbfs pod/test-pod-1a616765-6f42-4423-b4db-888df8fe8071 node/ip-10-0-152-51.ec2.internal registry.redhat.io/rhscl/ruby-27-rhel7 from pods:   ns/e2e-test-s2i-usage-fb6hh pod/test-pod-ee0f1d4b-3a30-4451-a3d3-30fda0f6c71b node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-gkcnh pod/test-pod-72f4d537-f69c-4e6e-befb-5d12d9fd44f3 node/ip-10-0-158-146.ec2.internal   ns/e2e-test-s2i-usage-gkcnh pod/test-pod-792757f6-6ac4-4166-9b5a-38842f157889 node/ip-10-0-240-50.ec2.internal

/test e2e-aws-image-ecosystem

while I dig into this

@gabemontero
Copy link
Copy Markdown
Contributor Author

Hmmm .... perhaps new req's wrt ci and the images used being mirrored:


: [sig-arch] Only known images used by tests expand_less | 0s
-- | --
Cluster accessed images that were not mirrored to the testing repository or already part of the cluster, see test/extended/util/image/README.md in the openshift/origin repo:  registry.redhat.io/rhscl/nodejs-10-rhel7 from pods:   ns/e2e-test-s2i-usage-jplzl pod/test-pod-1936517f-3d21-46e3-9366-0c6c3ffac5d8 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-jplzl pod/test-pod-80699787-07fc-47e2-bd5a-d1eff6cc7527 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-t6f2r pod/test-pod-9e83b187-4ed2-45ce-9320-72c58af3e8cd node/ip-10-0-152-51.ec2.internal registry.redhat.io/rhscl/nodejs-12-rhel7 from pods:   ns/e2e-test-s2i-usage-dp228 pod/test-pod-e1fb2196-aa49-4bdc-a214-1ef26f59ab12 node/ip-10-0-152-51.ec2.internal   ns/e2e-test-s2i-usage-n7jhf pod/test-pod-37d7b35f-ada0-4257-9626-204e6ae5b4dc node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-n7jhf pod/test-pod-c2cda6e1-919b-4a6e-a87d-21926dc231a8 node/ip-10-0-152-51.ec2.internal registry.redhat.io/rhscl/perl-526-rhel7 from pods:   ns/e2e-test-s2i-usage-7dzvt pod/test-pod-5525ef1f-7cd1-4836-aecf-77862a3b9766 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-7dzvt pod/test-pod-93ec894b-1f2f-4f51-be73-e526f4473479 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-wjhqp pod/test-pod-3947b58d-3e99-4f17-b8c2-bd59c3973e6f node/ip-10-0-240-50.ec2.internal registry.redhat.io/rhscl/php-72-rhel7 from pods:   ns/e2e-test-s2i-usage-zwc6w pod/test-pod-c85df50a-acae-49f7-b832-6e53acec2668 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-zwh95 pod/test-pod-0d468fdc-2eb1-4617-ac9e-fd0d4c73ddf2 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-zwh95 pod/test-pod-6f2bc312-86f9-46c5-ab71-7508e0298dfd node/ip-10-0-240-50.ec2.internal registry.redhat.io/rhscl/php-73-rhel7 from pods:   ns/e2e-test-s2i-usage-5r9cl pod/test-pod-5994d9bd-4471-4382-8725-9bfc6794f602 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-t7pp5 pod/test-pod-e5f2142d-81bb-4c46-9de9-064e77ca06d1 node/ip-10-0-158-146.ec2.internal   ns/e2e-test-s2i-usage-t7pp5 pod/test-pod-e7402586-1f29-46dd-8f86-a7078fbeb433 node/ip-10-0-158-146.ec2.internal registry.redhat.io/rhscl/python-27-rhel7 from pods:   ns/e2e-test-s2i-usage-9q8w7 pod/test-pod-d6800330-494c-4b24-a2ef-1c3e39fcdce5 node/ip-10-0-152-51.ec2.internal   ns/e2e-test-s2i-usage-9q8w7 pod/test-pod-ed09b2f2-b0ed-4006-a53d-e2cad38f072d node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-pmcck pod/test-pod-c522c037-4f9e-43b7-b316-a576ae774364 node/ip-10-0-240-50.ec2.internal registry.redhat.io/rhscl/python-36-rhel7 from pods:   ns/e2e-test-s2i-usage-78dlh pod/test-pod-6b58ff30-21fa-4147-bcdd-620243f7dfe1 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-xxwrm pod/test-pod-fa0ba80f-d6aa-4442-9d75-8b2712fde782 node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-xxwrm pod/test-pod-fe78d3e4-e2b8-4ac9-8c78-dbb0a17bfea8 node/ip-10-0-152-51.ec2.internal registry.redhat.io/rhscl/ruby-26-rhel7 from pods:   ns/e2e-test-s2i-usage-5fck2 pod/test-pod-a6bfd290-da28-4a41-bad2-69cb901fa4df node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-kgbfs pod/test-pod-02af6714-0326-4bc4-afb0-6b96bdeaf211 node/ip-10-0-152-51.ec2.internal   ns/e2e-test-s2i-usage-kgbfs pod/test-pod-1a616765-6f42-4423-b4db-888df8fe8071 node/ip-10-0-152-51.ec2.internal registry.redhat.io/rhscl/ruby-27-rhel7 from pods:   ns/e2e-test-s2i-usage-fb6hh pod/test-pod-ee0f1d4b-3a30-4451-a3d3-30fda0f6c71b node/ip-10-0-240-50.ec2.internal   ns/e2e-test-s2i-usage-gkcnh pod/test-pod-72f4d537-f69c-4e6e-befb-5d12d9fd44f3 node/ip-10-0-158-146.ec2.internal   ns/e2e-test-s2i-usage-gkcnh pod/test-pod-792757f6-6ac4-4166-9b5a-38842f157889 node/ip-10-0-240-50.ec2.internal

/test e2e-aws-image-ecosystem

while I dig into this

yep looks like openshift/origin#25958 was merged yesterday and enforces restrictions not previously enforced

bet the https://github.com/openshift/origin/blob/master/test/extended/image_ecosystem/scl.go and https://github.com/openshift/origin/blob/master/test/extended/image_ecosystem/sample_repos.go combo is leading to this

Comment thread pkg/build/builder/daemonless.go Outdated
func generateTransientMounts() []string {
mounts := []string{}
mounts = appendRHSMMount(mounts)
mounts = appendETCPKIMount(mounts)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We also need to mount the redhat.repo file. This is only one file.

Copy link
Copy Markdown
Contributor Author

@gabemontero gabemontero Mar 19, 2021

Choose a reason for hiding this comment

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

right, but how to handle a top level file vs. a dir with the buildah temporary mount options is not obvious to me @adambkaplan @nalind since all the man pages / info that I can find only talks in the context of dirs

or can I ultimate create an

"tmpdir/redhat.repo:/run/secrets/redhat.repo:rw,nodev,noexec,nosuid"

entry in the array of strings fed into the buildah transient mounts?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That should work, but processes that try to modify it may get confused by it being a bind mount - it can't be removed, and nothing can be renamed on top of it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

thanks @nalind

I think that should be OK

Or am I forgetting something @adambkaplan ?

I'll cook up the change in the interim

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

update pushed

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I am a little curious how our e2e that does the recursive chmod would do if we had host entitlements in CI

I'm going to update the BZ to make sure QE covers this as well

@gabemontero gabemontero force-pushed the add-back-entitle-mnt branch from b4c063d to f61e907 Compare March 19, 2021 18:18
@gabemontero
Copy link
Copy Markdown
Contributor Author

CI fail on e2e-aws-builds ... tests never ran: * could not run steps: step e2e-aws-builds failed: "e2e-aws-builds" pre steps failed: "e2e-aws-builds" pod "e2e-aws-builds-ipi-install-install" failed: the pod ci-op-c5s84mm7/e2e-aws-builds-ipi-install-install was deleted without completing after 36m29s (failed containers: )

@gabemontero
Copy link
Copy Markdown
Contributor Author

/test e2e-aws-builds

@gabemontero
Copy link
Copy Markdown
Contributor Author

still waiting on openshift/origin#25985 for image eco

@gabemontero
Copy link
Copy Markdown
Contributor Author

/retest

@gabemontero
Copy link
Copy Markdown
Contributor Author

and all green tests @adambkaplan

Copy link
Copy Markdown
Contributor

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

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

Realized in the review that "subscription content" is a more user friendly term than "entitlements". We should update the log messages to reflect that.

In addition, if my understanding is correct the only thing a user has to have to access subscription content are the entitlement keys. redhat.repo and rhsm mounts are optional, and are used on nodes that talk to Satellite. If these aren't present, UBI8 falls back to using the Red Hat CDN to access content. Thus, I've suggested softening the language from "will not" to "may not" in those error messages.

Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
@adambkaplan
Copy link
Copy Markdown
Contributor

One other thought - should we log all of these error messages as V(4)? Thought here:

  1. The "typical" use case is a build that doesn't need subscription content
  2. Therefore if we fail to copy any of these mounts, the error message may lead to unnecessary support requests.
  3. When we would care is if a user's build fails because they can't mount something in. In that case asking the user to run a build with debug level logs (loglevel=5) is reasonable, and therefore these warnings would surface.

@gabemontero
Copy link
Copy Markdown
Contributor Author

gabemontero commented Mar 22, 2021

One other thought - should we log all of these error messages as V(4)? Thought here:

1. The "typical" use case is a build that doesn't need subscription content

2. Therefore if we fail to copy any of these mounts, the error message may lead to unnecessary support requests.

3. When we would care is if a user's build fails because they can't mount something in. In that case asking the user to run a build with debug level logs (loglevel=5) is reasonable, and therefore these warnings would surface.

my experience has been the opposite with this stuff ... the errors happen infrequently, but when they do, we have to go through a round trip with the customer getting trace

As your the approver here :-) you can ultimately make the decision, but going with V(0) was done intentionally on my part.

@gabemontero gabemontero force-pushed the add-back-entitle-mnt branch from d5939eb to 36d571f Compare March 22, 2021 19:30
@gabemontero
Copy link
Copy Markdown
Contributor Author

I accepted all your suggested commits @adambkaplan , pulled them down, squashed them, and re-pushed

@gabemontero
Copy link
Copy Markdown
Contributor Author

quay.io outage/degredation noted in announce-testplatform bit e2e-aws-builds

/test e2e-aws-builds

@wewang58
Copy link
Copy Markdown

/bugzilla cc-qa

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@wewang58: This pull request references Bugzilla bug 1940488, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @wewang58

Details

In response to this:

/bugzilla cc-qa

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.

@adambkaplan
Copy link
Copy Markdown
Contributor

my experience has been the opposite with this stuff ... the errors happen infrequently, but when they do, we have to go through a round trip with the customer getting trace

I'll defer to your experience, then. Update the error logs to V(0) so they are consistent.

@adambkaplan
Copy link
Copy Markdown
Contributor

/approve

Otherwise looks good. Marking approved so anyone on the team can lgtm once the log statement is updated.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 23, 2021
Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
Comment thread pkg/build/builder/daemonless.go Outdated
@gabemontero gabemontero force-pushed the add-back-entitle-mnt branch 2 times, most recently from ab0afec to 7382af7 Compare March 25, 2021 22:25
@wewang58
Copy link
Copy Markdown

/test e2e-aws

@gabemontero
Copy link
Copy Markdown
Contributor Author

/assign @coreydaley

@gabemontero gabemontero force-pushed the add-back-entitle-mnt branch 2 times, most recently from 3b0a5cd to 315b4c4 Compare March 26, 2021 15:59
Comment thread pkg/build/builder/daemonless.go
Comment thread pkg/build/builder/daemonless.go
Comment thread pkg/build/builder/daemonless.go Outdated
log.V(0).Infof("Red Hat entitlements will not be available in this build: rhsm secrets location /run/secrets/rhsm is not a directory")
if st.IsDir() {
// if the file is there, but an unexpected type, then always have log show up via V(0)
log.V(0).Infof("Falling back to the Red Hat yum repository configuration in the build's base image: redhat.repo secrets location /run/secrets/redhat.repo is a directory.")
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This should probably reference the path variable instead of hard coding the /run/secrets/redhat.repo in case it changes in the future.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

part of next push

Comment thread pkg/build/builder/daemonless.go Outdated
}
if !st.IsDir() {
log.V(0).Infof("Red Hat entitlements will not be available in this build: rhsm secrets location /run/secrets/rhsm is not a directory")
if st.IsDir() {
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

if !st.isFile() might be more clear here

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

not 100% sure that covers symlinks

I'll try it with the new unit tests and report back

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

also fyi there is no st.IsFile() method

the closest is st.Mode().IsRegular()

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ok it works .... part of next push

Comment thread pkg/build/builder/daemonless.go Outdated
func appendRHSMMount(mounts []string) []string {
st, err := os.Stat("/run/secrets/rhsm")
func appendRHRepoMount(pathStart string, mounts []string) []string {
path := filepath.Join(pathStart, "redhat.repo")
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

redhat.repo is used several places here, would it be worth using a constant for this as well?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'll do it for all 3 files / dirs ... part of next push

Comment thread pkg/build/builder/daemonless.go
@gabemontero
Copy link
Copy Markdown
Contributor Author

updates pushed as seperate commit @coreydaley ptal

i'll squash if you are good

@coreydaley
Copy link
Copy Markdown

@gabemontero looks good, squash away

@gabemontero gabemontero force-pushed the add-back-entitle-mnt branch from 86e04d6 to ba2162e Compare March 26, 2021 18:37
@gabemontero
Copy link
Copy Markdown
Contributor Author

@gabemontero looks good, squash away

commits squashed

@coreydaley
Copy link
Copy Markdown

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, coreydaley, gabemontero

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

@gabemontero
Copy link
Copy Markdown
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2021
@openshift-merge-robot openshift-merge-robot merged commit e2b31c6 into openshift:master Mar 26, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@gabemontero: All pull requests linked via external trackers have merged:

Bugzilla bug 1940488 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1940488: add etc-pki-entitlements from pod secrets if available to build container

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.

@gabemontero gabemontero deleted the add-back-entitle-mnt branch March 26, 2021 20:48
@gabemontero
Copy link
Copy Markdown
Contributor Author

I'll cherrypick this after QE verifies

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. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants