calculate usage on istag creates

Author: deads2k

pkg/quota/image/imagestreamtag_evaluator.go

@@ -48,13 +48,16 @@ func NewImageStreamTagEvaluator(istNamespacer osclient.ImageStreamTagsNamespacer
 	}
 
 	return &generic.GenericEvaluator{
-		Name:                       imageStreamTagEvaluatorName,
-		InternalGroupKind:          imageapi.Kind("ImageStreamTag"),
-		InternalOperationResources: map[admission.Operation][]kapi.ResourceName{admission.Update: computeResources},
-		MatchedResourceNames:       computeResources,
-		MatchesScopeFunc:           matchesScopeFunc,
-		UsageFunc:                  makeImageStreamTagAdmissionUsageFunc(isNamespacer),
-		GetFuncByNamespace:         getFuncByNamespace,
+		Name:              imageStreamTagEvaluatorName,
+		InternalGroupKind: imageapi.Kind("ImageStreamTag"),
+		InternalOperationResources: map[admission.Operation][]kapi.ResourceName{
+			admission.Update: computeResources,
+			admission.Create: computeResources,
+		},
+		MatchedResourceNames: computeResources,
+		MatchesScopeFunc:     matchesScopeFunc,
+		UsageFunc:            makeImageStreamTagAdmissionUsageFunc(isNamespacer),
+		GetFuncByNamespace:   getFuncByNamespace,
 		ListFuncByNamespace: func(namespace string, options kapi.ListOptions) (runtime.Object, error) {
 			return &imageapi.ImageStreamTagList{}, nil
 		},

test/cmd/quota.sh

@@ -4,6 +4,8 @@ trap os::test::junit::reconcile_output EXIT
 
 os::test::junit::declare_suite_start "cmd/quota"
 
+os::test::junit::declare_suite_start "cmd/quota/clusterquota"
+
 os::cmd::expect_success 'oc new-project foo --as=deads'
 os::cmd::expect_success 'oc label namespace/foo owner=deads'
 os::cmd::expect_success 'oc create clusterquota for-deads --project-label-selector=owner=deads --hard=secrets=10'
@@ -20,5 +22,17 @@ os::cmd::try_until_text 'oc describe appliedclusterresourcequota/for-deads-by-an
 os::cmd::expect_success 'oc delete project foo'
 os::cmd::expect_success 'oc delete project bar'
 
-echo "quota: ok"
+echo "clusterquota: ok"
+os::test::junit::declare_suite_end
+
+os::test::junit::declare_suite_start "cmd/quota/imagestreams"
+
+os::cmd::expect_success 'oc new-project foo-2 --as=deads'
+os::cmd::expect_success 'oc create quota -n foo-2 is-quota --hard openshift.io/imagestreams=1'
+os::cmd::try_until_success 'oc tag -n foo-2 openshift/hello-openshift myis2:v2'
+os::cmd::expect_failure_and_text 'oc tag -n foo-2 busybox mybox:v1' "Exceeded quota"
+
+echo "imagestreams: ok"
+os::test::junit::declare_suite_end
+
 os::test::junit::declare_suite_end