Revert "Add RHEL super secrets patch"

This reverts commit 542c9b9.

Author: runcom

container/container_notlinux.go

@@ -17,11 +17,6 @@ func (container *Container) SecretMount() *Mount {
 	return nil
 }
 
-// SecretMountRHEL returns the mount for the secret path
-func (container *Container) SecretMountRHEL(rootUID, rootGID int) (*Mount, error) {
-	return nil
-}
-
 // UnmountSecrets unmounts the fs for secrets
 func (container *Container) UnmountSecrets() error {
 	return nil

container/container_unix.go

@@ -446,42 +446,3 @@ func cleanResourcePath(path string) string {
 func (container *Container) EnableServiceDiscoveryOnDefaultNetwork() bool {
 	return false
 }
-
-// SecretMountRHEL returns the Secret Mount point
-func (container *Container) SecretMountRHEL(rootUID, rootGID int) (*Mount, error) {
-	secretsPath, err := container.GetRootResourcePath("secrets")
-	if err != nil {
-		return nil, fmt.Errorf("GetSecretsPath failed: %v", err)
-	}
-
-	if err := os.RemoveAll(secretsPath); err != nil {
-		return nil, fmt.Errorf("RemoveSecretsPath failed: %v", err)
-	}
-
-	if err := os.MkdirAll(secretsPath, 0755); err != nil {
-		return nil, fmt.Errorf("MakeDirSecretsPath failed: %v", err)
-	}
-
-	data, err := getHostSecretData()
-	if err != nil {
-		return nil, fmt.Errorf("GetHostSecretData failed: %v", err)
-	}
-	for _, s := range data {
-		s.SaveTo(secretsPath)
-	}
-
-	if rootUID != 0 {
-		callback := func(p string, info os.FileInfo, err error) error {
-			return os.Chown(p, rootUID, rootGID)
-		}
-
-		filepath.Walk(secretsPath, callback)
-	}
-	label.Relabel(secretsPath, container.MountLabel, false)
-
-	m := &Mount{}
-	m.Source = secretsPath
-	m.Destination = "/run/secrets"
-	m.Writable = true
-	return m, nil
-}

container/container_windows.go

@@ -88,11 +88,6 @@ func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfi
 	return nil
 }
 
-// SecretMountRHEL returns the Secret Mount point
-func (container *Container) SecretMountRHEL(rootUID, rootGID int) (*Mount, error) {
-	return nil, nil
-}
-
 // cleanResourcePath cleans a resource path by removing C:\ syntax, and prepares
 // to combine with a volume path
 func cleanResourcePath(path string) string {

container/secrets.go

@@ -712,18 +712,6 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
 		ms = append(ms, *m)
 	}
 
-	rootUID, rootGID := daemon.GetRemappedUIDGID()
-	if daemon.configStore.EnableSecrets {
-		m, err := c.SecretMountRHEL(rootUID, rootGID)
-		if err != nil {
-			return nil, err
-		}
-		// SecretMountRHEL() returns m == nil && err == nil
-		// we check m before appending and dereferencing it
-		if m != nil {
-			ms = append(ms, *m)
-		}
-	}
 	sort.Sort(mounts(ms))
 	if err := setMounts(daemon, &s, c, ms); err != nil {
 		return nil, fmt.Errorf("linux mounts: %v", err)

daemon/oci_linux.go

@@ -83,8 +83,6 @@ func (s *DockerSuite) TestDiffEnsureDefaultDevs(c *check.C) {
 		"A /dev/tty":     true,
 		"A /dev/urandom": true,
 		"A /dev/zero":    true,
-		"A /run":         true, // secrets patch
-		"A /run/secrets": true, // secrets patch
 	}
 
 	for _, line := range strings.Split(out, "\n") {