Provide additional shortnames for resources (#10030)

This change expands on existing shortnames while adding others for various policy resources. This improves the user experience when issuing commands via kubectl.

Fixes #9322

Signed-off-by: Paul Balogh <javaducky@gmail.com>

charts/linkerd-crds/templates/policy/authorization-policy.yaml

@@ -15,7 +15,7 @@ spec:
     kind: AuthorizationPolicy
     plural: authorizationpolicies
     singular: authorizationpolicy
-    shortNames: []
+    shortNames: [authzpolicy]
   versions:
     - name: v1alpha1
       served: true

charts/linkerd-crds/templates/policy/meshtls-authentication.yaml

@@ -15,7 +15,7 @@ spec:
     kind: MeshTLSAuthentication
     plural: meshtlsauthentications
     singular: meshtlsauthentication
-    shortNames: []
+    shortNames: [meshtlsauthn]
   versions:
     - name: v1alpha1
       served: true

charts/linkerd-crds/templates/policy/network-authentication.yaml

@@ -15,7 +15,7 @@ spec:
     kind: NetworkAuthentication
     plural: networkauthentications
     singular: networkauthentication
-    shortNames: []
+    shortNames: [netauthn, networkauthn]
   versions:
     - name: v1alpha1
       served: true

charts/linkerd-crds/templates/policy/server-authorization.yaml

@@ -15,7 +15,7 @@ spec:
     kind: ServerAuthorization
     plural: serverauthorizations
     singular: serverauthorization
-    shortNames: [saz]
+    shortNames: [saz, serverauthz, srvauthz]
   versions:
     - name: v1alpha1
       served: true

cli/cmd/testdata/install_crds.golden

@@ -15,7 +15,7 @@ spec:
     kind: AuthorizationPolicy
     plural: authorizationpolicies
     singular: authorizationpolicy
-    shortNames: []
+    shortNames: [authzpolicy]
   versions:
     - name: v1alpha1
       served: true
@@ -1649,7 +1649,7 @@ spec:
     kind: MeshTLSAuthentication
     plural: meshtlsauthentications
     singular: meshtlsauthentication
-    shortNames: []
+    shortNames: [meshtlsauthn]
   versions:
     - name: v1alpha1
       served: true
@@ -1735,7 +1735,7 @@ spec:
     kind: NetworkAuthentication
     plural: networkauthentications
     singular: networkauthentication
-    shortNames: []
+    shortNames: [netauthn, networkauthn]
   versions:
     - name: v1alpha1
       served: true
@@ -1788,7 +1788,7 @@ spec:
     kind: ServerAuthorization
     plural: serverauthorizations
     singular: serverauthorization
-    shortNames: [saz]
+    shortNames: [saz, serverauthz, srvauthz]
   versions:
     - name: v1alpha1
       served: true

cli/cmd/testdata/install_helm_crds_output.golden

@@ -17,7 +17,7 @@ spec:
     kind: AuthorizationPolicy
     plural: authorizationpolicies
     singular: authorizationpolicy
-    shortNames: []
+    shortNames: [authzpolicy]
   versions:
     - name: v1alpha1
       served: true
@@ -1655,7 +1655,7 @@ spec:
     kind: MeshTLSAuthentication
     plural: meshtlsauthentications
     singular: meshtlsauthentication
-    shortNames: []
+    shortNames: [meshtlsauthn]
   versions:
     - name: v1alpha1
       served: true
@@ -1743,7 +1743,7 @@ spec:
     kind: NetworkAuthentication
     plural: networkauthentications
     singular: networkauthentication
-    shortNames: []
+    shortNames: [netauthn, networkauthn]
   versions:
     - name: v1alpha1
       served: true
@@ -1798,7 +1798,7 @@ spec:
     kind: ServerAuthorization
     plural: serverauthorizations
     singular: serverauthorization
-    shortNames: [saz]
+    shortNames: [saz, serverauthz, srvauthz]
   versions:
     - name: v1alpha1
       served: true

cli/cmd/testdata/install_helm_crds_output_ha.golden

@@ -17,7 +17,7 @@ spec:
     kind: AuthorizationPolicy
     plural: authorizationpolicies
     singular: authorizationpolicy
-    shortNames: []
+    shortNames: [authzpolicy]
   versions:
     - name: v1alpha1
       served: true
@@ -1655,7 +1655,7 @@ spec:
     kind: MeshTLSAuthentication
     plural: meshtlsauthentications
     singular: meshtlsauthentication
-    shortNames: []
+    shortNames: [meshtlsauthn]
   versions:
     - name: v1alpha1
       served: true
@@ -1743,7 +1743,7 @@ spec:
     kind: NetworkAuthentication
     plural: networkauthentications
     singular: networkauthentication
-    shortNames: []
+    shortNames: [netauthn, networkauthn]
   versions:
     - name: v1alpha1
       served: true
@@ -1798,7 +1798,7 @@ spec:
     kind: ServerAuthorization
     plural: serverauthorizations
     singular: serverauthorization
-    shortNames: [saz]
+    shortNames: [saz, serverauthz, srvauthz]
   versions:
     - name: v1alpha1
       served: true

pkg/k8s/k8s.go

@@ -20,8 +20,10 @@ const (
 	Endpoints             = "endpoints"
 	EndpointSlices        = "endpointslices"
 	Job                   = "job"
+	MeshTLSAuthentication = "meshtlsauthentication"
 	MutatingWebhookConfig = "mutatingwebhookconfig"
 	Namespace             = "namespace"
+	NetworkAuthentication = "networkauthentication"
 	Pod                   = "pod"
 	ReplicationController = "replicationcontroller"
 	ReplicaSet            = "replicaset"
@@ -117,16 +119,21 @@ var resourceNames = []resourceName{
 	{"ds", "daemonset", "daemonsets"},
 	{"deploy", "deployment", "deployments"},
 	{"job", "job", "jobs"},
+	{"meshtlsauthn", "meshtlsauthentication", "meshtlsauthentications"},
 	{"ns", "namespace", "namespaces"},
+	{"netauthn", "networkauthentication", "networkauthentications"},
+	{"networkauthn", "networkauthentication", "networkauthentications"},
 	{"po", "pod", "pods"},
 	{"rc", "replicationcontroller", "replicationcontrollers"},
 	{"rs", "replicaset", "replicasets"},
 	{"svc", "service", "services"},
 	{"sp", "serviceprofile", "serviceprofiles"},
 	{"saz", "serverauthorization", "serverauthorizations"},
+	{"serverauthz", "serverauthorization", "serverauthorizations"},
+	{"srvauthz", "serverauthorization", "serverauthorizations"},
 	{"srv", "server", "servers"},
 	{"ap", "authorizationpolicy", "authorizationpolicies"},
-	{"route", "httproute", "httproutes"},
+	{"authzpolicy", "authorizationpolicy", "authorizationpolicies"},
 	{"sts", "statefulset", "statefulsets"},
 	{"ln", "link", "links"},
 	{"all", "all", "all"},
@@ -206,8 +213,9 @@ func ShortNameFromCanonicalResourceName(canonicalName string) string {
 
 // KindToL5DLabel converts a Kubernetes `kind` to a Linkerd label.
 // For example:
-//   `pod` -> `pod`
+//
-//   `job` -> `k8s_job`
+//	`pod` -> `pod`
+//	`job` -> `k8s_job`
 func KindToL5DLabel(k8sKind string) string {
 	if k8sKind == Job {
 		return l5dJob

pkg/k8s/k8s_test.go

@@ -28,14 +28,20 @@ func TestGetConfig(t *testing.T) {
 func TestCanonicalResourceNameFromFriendlyName(t *testing.T) {
 	t.Run("Returns canonical name for all known variants", func(t *testing.T) {
 		expectations := map[string]string{
-			"po":          Pod,
+			"po":           Pod,
-			"pod":         Pod,
+			"pod":          Pod,
-			"deployment":  Deployment,
+			"deployment":   Deployment,
-			"deployments": Deployment,
+			"deployments":  Deployment,
-			"au":          Authority,
+			"au":           Authority,
-			"authorities": Authority,
+			"authorities":  Authority,
-			"cj":          CronJob,
+			"cj":           CronJob,
-			"cronjob":     CronJob,
+			"cronjob":      CronJob,
+			"serverauthz":  ServerAuthorization,
+			"srvauthz":     ServerAuthorization,
+			"authzpolicy":  AuthorizationPolicy,
+			"meshtlsauthn": MeshTLSAuthentication,
+			"networkauthn": NetworkAuthentication,
+			"netauthn":     NetworkAuthentication,
 		}
 
 		for input, expectedName := range expectations {