Skip to content

Bug 1945692: move entitlement related secrets back to mounts.conf #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 9, 2021
Merged

Bug 1945692: move entitlement related secrets back to mounts.conf #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions imagecontent/etc/containers/mounts.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/run/secrets/rhsm:/run/secrets/rhsm
/run/secrets/etc-pki-entitlement:/run/secrets/etc-pki-entitlement
/run/secrets/redhat.repo:/run/secrets/redhat.repo
21 changes: 0 additions & 21 deletions pkg/build/builder/daemonless.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (

"github.com/openshift/builder/pkg/build/builder/cmd/dockercfg"
builderutil "github.com/openshift/builder/pkg/build/builder/util"
s2ifs "github.com/openshift/source-to-image/pkg/util/fs"
)

var (
Expand Down Expand Up @@ -259,25 +258,6 @@ func buildDaemonlessImage(sc types.SystemContext, store storage.Store, isolation
}
}

var transientMounts []string
if st, err := os.Stat("/run/secrets/rhsm"); err == nil && st.IsDir() {
// Add a bind of /run/secrets/rhsm, to pass along anything that the
// runtime mounted from the node into our /run/secrets/rhsm.
log.V(0).Infof("Adding transient rw bind mount for /run/secrets/rhsm")
tmpDir, err := ioutil.TempDir("/tmp", "rhsm-copy")
if err != nil {
log.V(0).Infof("Error creating tmpdir to set up /run/secrets/rhsm in build container: %s", err.Error())
return err
}
fs := s2ifs.NewFileSystem()
err = fs.CopyContents("/run/secrets/rhsm", tmpDir, map[string]string{})
if err != nil {
log.V(0).Infof("Error copying /run/secrets/rhsm to tmpdir %s: %s", tmpDir, err.Error())
return err
}
transientMounts = append(transientMounts, fmt.Sprintf("%s:/run/secrets/rhsm:rw,nodev,noexec,nosuid", tmpDir))
}

// Use a profile provided in the image instead of the default provided
// in runtime-tools's generator logic.
seccompProfilePath := "/usr/share/containers/seccomp.json"
Expand All @@ -286,7 +266,6 @@ func buildDaemonlessImage(sc types.SystemContext, store storage.Store, isolation
ContextDirectory: contextDir,
PullPolicy: pullPolicy,
Isolation: isolation,
TransientMounts: transientMounts,
Args: args,
Output: opts.Name,
Out: opts.OutputStream,
Expand Down