Revert "Add shared content label to namespaces"
This reverts commit e692a01926.
Signed-off-by: Cody Roseborough <cdr@amazon.com>
This commit is contained in:
@@ -115,7 +115,6 @@
|
||||
package metadata
|
||||
|
||||
import (
|
||||
"github.com/containerd/containerd/labels"
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
bolt "go.etcd.io/bbolt"
|
||||
)
|
||||
@@ -183,45 +182,6 @@ func createBucketIfNotExists(tx *bolt.Tx, keys ...[]byte) (*bolt.Bucket, error)
|
||||
return bkt, nil
|
||||
}
|
||||
|
||||
func namespacesBucketPath() []byte {
|
||||
return bucketKeyVersion
|
||||
}
|
||||
|
||||
func getNamespacesBucket(tx *bolt.Tx) *bolt.Bucket {
|
||||
return getBucket(tx, namespacesBucketPath())
|
||||
}
|
||||
|
||||
// Given a namespace string and a bolt transaction
|
||||
// return true if the ns has the shared label in it.
|
||||
func hasSharedLabel(tx *bolt.Tx, ns string) bool {
|
||||
labelsBkt := getNamespaceLabelsBucket(tx, ns)
|
||||
if labelsBkt == nil {
|
||||
return false
|
||||
}
|
||||
cur := labelsBkt.Cursor()
|
||||
for k, v := cur.First(); k != nil; k, v = cur.Next() {
|
||||
if string(k) == labels.LabelSharedNamespace && string(v) == "true" {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func getShareableBucket(tx *bolt.Tx, dgst digest.Digest) *bolt.Bucket {
|
||||
var bkt *bolt.Bucket
|
||||
nsbkt := getNamespacesBucket(tx)
|
||||
cur := nsbkt.Cursor()
|
||||
for k, _ := cur.First(); k != nil; k, _ = cur.Next() {
|
||||
// If this bucket has shared label
|
||||
// get the bucket and return it.
|
||||
if hasSharedLabel(tx, string(k)) {
|
||||
bkt = getBlobBucket(tx, string(k), dgst)
|
||||
break
|
||||
}
|
||||
}
|
||||
return bkt
|
||||
}
|
||||
|
||||
func namespaceLabelsBucketPath(namespace string) [][]byte {
|
||||
return [][]byte{bucketKeyVersion, []byte(namespace), bucketKeyObjectLabels}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user