Pick up the KindToResource helper. (knative#2075)

zrss · Sep 21, 2018 · 6650128 · 6650128
1 parent 69811e7
commit 6650128
Show file tree

Hide file tree

Showing 13 changed files with 149 additions and 13 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -31,10 +31,10 @@ required = [
   # HEAD as of 2018-09-20
   revision = "2891231d4e47f80c9b72637da071468d7072cb62"
 
-[[constraint]]
+[[override]]
   name = "github.com/knative/pkg"
-  # HEAD as of 2018-09-20
-  revision = "51f6214feeea1485dc8691a661d953fea1409402"
+  # HEAD as of 2018-09-21
+  revision = "f81d0f8f0fac9943f3892c5e86007dc00382a909"
 
 [[constraint]]
   name = "github.com/knative/caching"

diff --git a/pkg/reconciler/v1alpha1/autoscaling/kpa_scaler.go b/pkg/reconciler/v1alpha1/autoscaling/kpa_scaler.go
@@ -18,7 +18,6 @@ package autoscaling
 
 import (
 	"context"
-	"strings"
 	"sync"
 
 	"go.uber.org/zap"
@@ -27,6 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/scale"
 
+	"github.com/knative/pkg/apis"
 	"github.com/knative/pkg/configmap"
 	"github.com/knative/pkg/logging"
 	kpa "github.com/knative/serving/pkg/apis/autoscaling/v1alpha1"
@@ -116,11 +116,7 @@ func (rs *kpaScaler) Scale(ctx context.Context, kpa *kpa.PodAutoscaler, desiredS
 		logger.Error("Unable to parse APIVersion.", zap.Error(err))
 		return err
 	}
-	resource := schema.GroupResource{
-		Group: gv.Group,
-		// TODO(mattmoor): Do something better than this.
-		Resource: strings.ToLower(kpa.Spec.ScaleTargetRef.Kind) + "s",
-	}
+	resource := apis.KindToResource(gv.WithKind(kpa.Spec.ScaleTargetRef.Kind)).GroupResource()
 	resourceName := kpa.Spec.ScaleTargetRef.Name
 
 	// Identify the current scale.

diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/channelable_types.go b/vendor/github.com/knative/pkg/apis/duck/v1alpha1/channelable_types.go
diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/conditions_types.go b/vendor/github.com/knative/pkg/apis/duck/v1alpha1/conditions_types.go
diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/generational_types.go b/vendor/github.com/knative/pkg/apis/duck/v1alpha1/generational_types.go
diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/legacy_targetable_types.go b/vendor/github.com/knative/pkg/apis/duck/v1alpha1/legacy_targetable_types.go
diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/register.go b/vendor/github.com/knative/pkg/apis/duck/v1alpha1/register.go
diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/sinkable_types.go b/vendor/github.com/knative/pkg/apis/duck/v1alpha1/sinkable_types.go
diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/subscribable_types.go b/vendor/github.com/knative/pkg/apis/duck/v1alpha1/subscribable_types.go
diff --git a/vendor/github.com/knative/pkg/apis/duck/v1alpha1/targetable_types.go b/vendor/github.com/knative/pkg/apis/duck/v1alpha1/targetable_types.go
diff --git a/vendor/github.com/knative/pkg/apis/interfaces.go b/vendor/github.com/knative/pkg/apis/interfaces.go
diff --git a/vendor/github.com/knative/pkg/apis/kind2resource.go b/vendor/github.com/knative/pkg/apis/kind2resource.go