Merge pull request rancher#29743 from ibuildthecloud/master

Show states on relationships

go.mod

@@ -93,9 +93,9 @@ require (
 	github.com/rancher/remotedialer v0.2.6-0.20200820180140-e5448aaba7ee
 	github.com/rancher/rke v1.2.2-rc3.0.20201021225325-b2197f54b7e5
 	github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168
-	github.com/rancher/steve v0.0.0-20201023000418-e29561cbf990
+	github.com/rancher/steve v0.0.0-20201023210011-92638937dffd
 	github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20200825145542-a04e2061be24
-	github.com/rancher/wrangler v0.7.2
+	github.com/rancher/wrangler v0.7.3-0.20201023210123-9b7d265b90ec
 	github.com/robfig/cron v1.1.0
 	github.com/russellhaering/goxmldsig v0.0.0-20180430223755-7acd5e4a6ef7 // indirect
 	github.com/satori/go.uuid v1.2.0

go.sum

@@ -1033,8 +1033,8 @@ github.com/rancher/saml v0.0.3-rancher1 h1:rX1UIHVGn8v8AXG8GyMHezXU9+l8zs6o+Psk7
 github.com/rancher/saml v0.0.3-rancher1/go.mod h1:Bp1IBnlwVB1EqRfSKecoPyf+1Wjh8zykMjlq4vJJhxY=
 github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168 h1:SIshhsz0O71FYyyDmjUmbFGvmgp4ASm8J1zmhMK/UG0=
 github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168/go.mod h1:WlLAocVyVQs5J8r0IiQXsp0ajVZO6hYi/Vo6zxjo73s=
-github.com/rancher/steve v0.0.0-20201023000418-e29561cbf990 h1:Y9m22mkVU/G84Ze24xXDgByVQxBg1KvI6GlUj+Uy9GI=
-github.com/rancher/steve v0.0.0-20201023000418-e29561cbf990/go.mod h1:X57vY9bp/Jla+9ZS0kIxXybCsBns8axTAjmQc7iu40k=
+github.com/rancher/steve v0.0.0-20201023210011-92638937dffd h1:HmFkmGPv0ie4p+qpd2i++dPudxMhg2QVKcVby9FEK0o=
+github.com/rancher/steve v0.0.0-20201023210011-92638937dffd/go.mod h1:X57vY9bp/Jla+9ZS0kIxXybCsBns8axTAjmQc7iu40k=
 github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20200825145542-a04e2061be24 h1:d98aZFpLw1txbsPgCC6z1Kjl+gqCnmB+1bqE8t1W9tk=
 github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20200825145542-a04e2061be24/go.mod h1:f8UA6yw5xPtSspqXUQZNfs7bTyG0UOfzJz7zOkegir4=
 github.com/rancher/wrangler v0.5.4-0.20200326191509-4054411d9736/go.mod h1:L4HtjPeX8iqLgsxfJgz+JjKMcX2q3qbRXSeTlC/CSd4=
@@ -1046,8 +1046,8 @@ github.com/rancher/wrangler v0.6.2-0.20200820173016-2068de651106/go.mod h1:iKqQc
 github.com/rancher/wrangler v0.6.2-0.20200822010948-6d667521af49/go.mod h1:iKqQcYs4YSDjsme52OZtQU4jHPmLlIiM93aj2c8c/W8=
 github.com/rancher/wrangler v0.6.2-0.20200916052259-24781350894c/go.mod h1:I7qe4DZNMOLKVa9ax7DJdBZ0XtKOppLF/dalhPX3vaE=
 github.com/rancher/wrangler v0.7.1/go.mod h1:goezjesEKwMxHLfltdjg9DW0xWV7txQee6vOuSDqXAI=
-github.com/rancher/wrangler v0.7.2 h1:GlUIFKO26qq1ICMf1CjAGBr2uP52GQX3E0E69zkW88Q=
-github.com/rancher/wrangler v0.7.2/go.mod h1:goezjesEKwMxHLfltdjg9DW0xWV7txQee6vOuSDqXAI=
+github.com/rancher/wrangler v0.7.3-0.20201023210123-9b7d265b90ec h1:FSHitOD9wDscz28bH5b9UPmFA9ZMe50Mu4GFWZqUfHg=
+github.com/rancher/wrangler v0.7.3-0.20201023210123-9b7d265b90ec/go.mod h1:goezjesEKwMxHLfltdjg9DW0xWV7txQee6vOuSDqXAI=
 github.com/rancher/wrangler-api v0.6.1-0.20200427172631-a7c2f09b783e/go.mod h1:2lcWR98q8HU3U4mVETnXc8quNG0uXxrt8vKd6cAa/30=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=

pkg/api/steve/catalog/operation.go

@@ -72,10 +72,10 @@ func (o *operation) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	})
 }
 
-func (o *operation) OnAdd(gvr schema2.GroupVersionResource, key string, obj runtime.Object) error {
-	return o.ops.Impersonator.PurgeOldRoles(gvr, key, obj)
+func (o *operation) OnAdd(gvk schema2.GroupVersionKind, key string, obj runtime.Object) error {
+	return o.ops.Impersonator.PurgeOldRoles(gvk, key, obj)
 }
 
-func (o *operation) OnChange(gvr schema2.GroupVersionResource, key string, obj, oldObj runtime.Object) error {
-	return o.ops.Impersonator.PurgeOldRoles(gvr, key, obj)
+func (o *operation) OnChange(gvk schema2.GroupVersionKind, key string, obj, oldObj runtime.Object) error {
+	return o.ops.Impersonator.PurgeOldRoles(gvk, key, obj)
 }

pkg/api/steve/clusters/clusters.go

@@ -24,8 +24,8 @@ func Register(ctx context.Context, server *steve.Server) error {
 	}
 
 	server.ClusterCache.OnAdd(ctx, shell.impersonator.PurgeOldRoles)
-	server.ClusterCache.OnChange(ctx, func(gvr schema.GroupVersionResource, key string, obj, oldObj runtime.Object) error {
-		return shell.impersonator.PurgeOldRoles(gvr, key, obj)
+	server.ClusterCache.OnChange(ctx, func(gvk schema.GroupVersionKind, key string, obj, oldObj runtime.Object) error {
+		return shell.impersonator.PurgeOldRoles(gvk, key, obj)
 	})
 
 	server.SchemaFactory.AddTemplate(schema2.Template{