Merge pull request #8195 from miminar/registry-quota-refactor

Merged by openshift-bot

Author: OpenShift Bot

contrib/completions/bash/oadm

@@ -1493,6 +1493,7 @@ _oadm_registry()
     flags_completion+=("__handle_filename_extension_flag kubeconfig")
     flags+=("--daemonset")
     flags+=("--dry-run")
+    flags+=("--enforce-quota")
     flags+=("--images=")
     flags+=("--labels=")
     flags+=("--latest-images")

contrib/completions/bash/oc

@@ -4513,6 +4513,7 @@ _oc_adm_registry()
     flags_completion+=("__handle_filename_extension_flag kubeconfig")
     flags+=("--daemonset")
     flags+=("--dry-run")
+    flags+=("--enforce-quota")
     flags+=("--images=")
     flags+=("--labels=")
     flags+=("--latest-images")

contrib/completions/bash/openshift

@@ -2069,6 +2069,7 @@ _openshift_admin_registry()
     flags_completion+=("__handle_filename_extension_flag kubeconfig")
     flags+=("--daemonset")
     flags+=("--dry-run")
+    flags+=("--enforce-quota")
     flags+=("--images=")
     flags+=("--labels=")
     flags+=("--latest-images")
@@ -8100,6 +8101,7 @@ _openshift_cli_adm_registry()
     flags_completion+=("__handle_filename_extension_flag kubeconfig")
     flags+=("--daemonset")
     flags+=("--dry-run")
+    flags+=("--enforce-quota")
     flags+=("--images=")
     flags+=("--labels=")
     flags+=("--latest-images")

hack/lib/util/environment.sh

@@ -239,6 +239,7 @@ function os::util::environment::setup_server_vars() {
 # Returns:
 #  - export USE_IMAGES
 #  - export TAG
+#  - export MAX_IMAGES_BULK_IMPORTED_PER_REPOSITORY
 function os::util::environment::setup_images_vars() {
     # Use either the latest release built images, or latest.
     if [[ -z "${USE_IMAGES-}" ]]; then
@@ -250,4 +251,5 @@ function os::util::environment::setup_images_vars() {
             export USE_IMAGES="openshift/origin-\${component}:${TAG}"
         fi
     fi
+	export MAX_IMAGES_BULK_IMPORTED_PER_REPOSITORY="${MAX_IMAGES_BULK_IMPORTED_PER_REPOSITORY:-3}"
 }

hack/util.sh

@@ -84,9 +84,14 @@ function configure_os_server {
 	--images="${USE_IMAGES}"
 
 
-	# Don't try this at home.  We don't have flags for setting etcd ports in the config, but we want deconflicted ones.  Use sed to replace defaults in a completely unsafe way
-	os::util::sed "s/:4001$/:${ETCD_PORT}/g" ${SERVER_CONFIG_DIR}/master/master-config.yaml
-	os::util::sed "s/:7001$/:${ETCD_PEER_PORT}/g" ${SERVER_CONFIG_DIR}/master/master-config.yaml
+	# Don't try this at home. We don't have flags for setting etcd ports in the config, but we want
+	# deconflicted ones. Use sed to replace defaults in a completely unsafe way.
+	# And be sure to use the same limit for bulk image import from repository in tests and server.
+	os::util::sed \
+		-e "s/:4001$/:${ETCD_PORT}/g" \
+		-e "s/:7001$/:${ETCD_PEER_PORT}/g" \
+		-e "s/\(maxImagesBulkImportedPerRepository:\s*\)\(.*\)/\1${MAX_IMAGES_BULK_IMPORTED_PER_REPOSITORY:-\2}/" \
+		${SERVER_CONFIG_DIR}/master/master-config.yaml
 
 
 	# Make oc use ${MASTER_CONFIG_DIR}/admin.kubeconfig, and ignore anything in the running user's $HOME dir
@@ -636,7 +641,11 @@ function install_router {
 function install_registry {
 	# The --mount-host option is provided to reuse local storage.
 	echo "[INFO] Installing the registry"
-	openshift admin registry --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}"
+	# For testing purposes, ensure the quota objects are always up to date in the registry by
+	# disabling project cache.
+	openshift admin registry --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" -o json | \
+		oc env -f - --output json "REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_PROJECTCACHETTL=0" | \
+		oc create -f -
 }
 
 function wait_for_registry {

images/dockerregistry/config.yml

@@ -18,3 +18,5 @@ middleware:
     - name: openshift
       options:
         pullthrough: true
+        enforcequota: false
+        projectcachettl: 1m

pkg/assets/bindata.go

@@ -9199,9 +9199,7 @@ cpu:"CPU (Request)",
 "limits.cpu":"CPU (Limit)",
 "limits.memory":"Memory (Limit)",
 memory:"Memory (Request)",
-"openshift.io/imagesize":"Image Size",
-"openshift.io/imagestreamsize":"Image Stream Size",
-"openshift.io/projectimagessize":"Project Image Size",
+"openshift.io/imagestreams":"Image Streams",
 persistentvolumeclaims:"Persistent Volume Claims",
 pods:"Pods",
 replicationcontrollers:"Replication Controllers",

pkg/client/imagestreamimages.go

@@ -1,8 +1,6 @@
 package client
 
 import (
-	"fmt"
-
 	"github.com/openshift/origin/pkg/image/api"
 )
 
@@ -33,6 +31,6 @@ func newImageStreamImages(c *Client, namespace string) *imageStreamImages {
 // Get finds the specified image by name of an image repository and id.
 func (c *imageStreamImages) Get(name, id string) (result *api.ImageStreamImage, err error) {
 	result = &api.ImageStreamImage{}
-	err = c.r.Get().Namespace(c.ns).Resource("imageStreamImages").Name(fmt.Sprintf("%s@%s", name, id)).Do().Into(result)
+	err = c.r.Get().Namespace(c.ns).Resource("imageStreamImages").Name(api.MakeImageStreamImageName(name, id)).Do().Into(result)
 	return
 }

pkg/client/imagestreams.go

@@ -8,6 +8,7 @@ import (
 	"k8s.io/kubernetes/pkg/watch"
 
 	imageapi "github.com/openshift/origin/pkg/image/api"
+	quotautil "github.com/openshift/origin/pkg/quota/util"
 )
 
 var ErrImageStreamImportUnsupported = errors.New("the server does not support directly importing images - create an image stream with tags or the dockerImageRepository field set")
@@ -139,7 +140,7 @@ func transformUnsupported(err error) error {
 	// enabled by policy. A create request will return a Forbidden(403) error.
 	// We want to return ErrImageStreamImportUnsupported to allow fallback behavior
 	// in clients.
-	if apierrs.IsForbidden(err) {
+	if apierrs.IsForbidden(err) && !quotautil.IsErrorQuotaExceeded(err) {
 		return ErrImageStreamImportUnsupported
 	}
 	return err

pkg/client/imagestreamtags.go

@@ -1,8 +1,6 @@
 package client
 
 import (
-	"fmt"
-
 	"github.com/openshift/origin/pkg/image/api"
 )
 
@@ -35,7 +33,7 @@ func newImageStreamTags(c *Client, namespace string) *imageStreamTags {
 // Get finds the specified image by name of an image stream and tag.
 func (c *imageStreamTags) Get(name, tag string) (result *api.ImageStreamTag, err error) {
 	result = &api.ImageStreamTag{}
-	err = c.r.Get().Namespace(c.ns).Resource("imageStreamTags").Name(fmt.Sprintf("%s:%s", name, tag)).Do().Into(result)
+	err = c.r.Get().Namespace(c.ns).Resource("imageStreamTags").Name(api.JoinImageStreamTag(name, tag)).Do().Into(result)
 	return
 }
 
@@ -48,5 +46,5 @@ func (c *imageStreamTags) Update(tag *api.ImageStreamTag) (result *api.ImageStre
 
 // Delete deletes the specified tag from the image stream.
 func (c *imageStreamTags) Delete(name, tag string) error {
-	return c.r.Delete().Namespace(c.ns).Resource("imageStreamTags").Name(fmt.Sprintf("%s:%s", name, tag)).Do().Error()
+	return c.r.Delete().Namespace(c.ns).Resource("imageStreamTags").Name(api.JoinImageStreamTag(name, tag)).Do().Error()
 }