Replace util.GenerateFixedname with kmeta.ChildName (#43)

* use kmeta.ChildName for adapter deployment generation * update dependencies
knative-extensions · Mar 30, 2020 · 5f28a3b · 5f28a3b
1 parent b93378f
commit 5f28a3b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 305 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/reconciler/sample/resources/receive_adapter.go b/pkg/reconciler/sample/resources/receive_adapter.go
@@ -22,7 +22,6 @@ import (
 	v1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"knative.dev/eventing/pkg/utils"
 	"knative.dev/pkg/kmeta"
 
 	"knative.dev/sample-source/pkg/apis/samples/v1alpha1"
@@ -44,7 +43,7 @@ func MakeReceiveAdapter(args *ReceiveAdapterArgs) *v1.Deployment {
 	return &v1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: args.Source.Namespace,
-			Name:      utils.GenerateFixedName(args.Source, fmt.Sprintf("samplesource-%s", args.Source.Name)),
+			Name:      kmeta.ChildName(fmt.Sprintf("samplesource-%s-", args.Source.Name), string(args.Source.GetUID())),
 			Labels:    args.Labels,
 			OwnerReferences: []metav1.OwnerReference{
 				*kmeta.NewControllerRef(args.Source),

diff --git a/vendor/knative.dev/eventing/pkg/utils/context.go b/vendor/knative.dev/eventing/pkg/utils/context.go
diff --git a/vendor/knative.dev/eventing/pkg/utils/secret.go b/vendor/knative.dev/eventing/pkg/utils/secret.go
diff --git a/vendor/knative.dev/eventing/pkg/utils/utils.go b/vendor/knative.dev/eventing/pkg/utils/utils.go