Merge pull request #88 from hoskeri/master

ericchiang · web-flow · commit 7f7ccea19d87 · 2018-05-29T13:32:09.000-07:00
fix pluralization for resources ending in 's', and 'y'
diff --git a/apis/policy/v1beta1/register.go b/apis/policy/v1beta1/register.go
@@ -4,8 +4,8 @@ import "github.com/ericchiang/k8s"
 
 func init() {
 	k8s.Register("policy", "v1beta1", "poddisruptionbudgets", true, &PodDisruptionBudget{})
-	k8s.Register("policy", "v1beta1", "podsecuritypolicys", false, &PodSecurityPolicy{})
+	k8s.Register("policy", "v1beta1", "podsecuritypolicies", false, &PodSecurityPolicy{})
 
 	k8s.RegisterList("policy", "v1beta1", "poddisruptionbudgets", true, &PodDisruptionBudgetList{})
-	k8s.RegisterList("policy", "v1beta1", "podsecuritypolicys", false, &PodSecurityPolicyList{})
+	k8s.RegisterList("policy", "v1beta1", "podsecuritypolicies", false, &PodSecurityPolicyList{})
 }
diff --git a/apis/scheduling/v1alpha1/register.go b/apis/scheduling/v1alpha1/register.go
@@ -3,7 +3,7 @@ package v1alpha1
 import "github.com/ericchiang/k8s"
 
 func init() {
-	k8s.Register("scheduling.k8s.io", "v1alpha1", "priorityclasss", false, &PriorityClass{})
+	k8s.Register("scheduling.k8s.io", "v1alpha1", "priorityclasses", false, &PriorityClass{})
 
-	k8s.RegisterList("scheduling.k8s.io", "v1alpha1", "priorityclasss", false, &PriorityClassList{})
+	k8s.RegisterList("scheduling.k8s.io", "v1alpha1", "priorityclasses", false, &PriorityClassList{})
 }
diff --git a/apis/storage/v1/register.go b/apis/storage/v1/register.go
@@ -3,7 +3,7 @@ package v1
 import "github.com/ericchiang/k8s"
 
 func init() {
-	k8s.Register("storage.k8s.io", "v1", "storageclasss", false, &StorageClass{})
+	k8s.Register("storage.k8s.io", "v1", "storageclasses", false, &StorageClass{})
 
-	k8s.RegisterList("storage.k8s.io", "v1", "storageclasss", false, &StorageClassList{})
+	k8s.RegisterList("storage.k8s.io", "v1", "storageclasses", false, &StorageClassList{})
 }
diff --git a/apis/storage/v1beta1/register.go b/apis/storage/v1beta1/register.go
@@ -3,7 +3,7 @@ package v1beta1
 import "github.com/ericchiang/k8s"
 
 func init() {
-	k8s.Register("storage.k8s.io", "v1beta1", "storageclasss", false, &StorageClass{})
+	k8s.Register("storage.k8s.io", "v1beta1", "storageclasses", false, &StorageClass{})
 
-	k8s.RegisterList("storage.k8s.io", "v1beta1", "storageclasss", false, &StorageClassList{})
+	k8s.RegisterList("storage.k8s.io", "v1beta1", "storageclasses", false, &StorageClassList{})
 }
diff --git a/scripts/register.go b/scripts/register.go
@@ -232,7 +232,7 @@ var apiGroups = []APIGroup{
 		Versions: map[string][]Resource{
 			"v1beta1": []Resource{
 				{"PodDisruptionBudget", "", 0},
-				{"PodSecurityPolicy", "", NotNamespaced},
+				{"PodSecurityPolicy", "podsecuritypolicies", NotNamespaced},
 			},
 		},
 	},
@@ -265,7 +265,7 @@ var apiGroups = []APIGroup{
 		Group:   "scheduling.k8s.io",
 		Versions: map[string][]Resource{
 			"v1alpha1": []Resource{
-				{"PriorityClass", "", NotNamespaced},
+				{"PriorityClass", "priorityclasses", NotNamespaced},
 			},
 		},
 	},
@@ -283,10 +283,10 @@ var apiGroups = []APIGroup{
 		Group:   "storage.k8s.io",
 		Versions: map[string][]Resource{
 			"v1": []Resource{
-				{"StorageClass", "", NotNamespaced},
+				{"StorageClass", "storageclasses", NotNamespaced},
 			},
 			"v1beta1": []Resource{
-				{"StorageClass", "", NotNamespaced},
+				{"StorageClass", "storageclasses", NotNamespaced},
 			},
 			"v1alpha1": []Resource{
 				{"VolumeAttachment", "", NotNamespaced},

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import "github.com/ericchiang/k8s"`
`4`	`4`
`5`	`5`	`func init() {`
`6`	`6`	`k8s.Register("policy", "v1beta1", "poddisruptionbudgets", true, &PodDisruptionBudget{})`
`7`		`- k8s.Register("policy", "v1beta1", "podsecuritypolicys", false, &PodSecurityPolicy{})`
	`7`	`+ k8s.Register("policy", "v1beta1", "podsecuritypolicies", false, &PodSecurityPolicy{})`
`8`	`8`
`9`	`9`	`k8s.RegisterList("policy", "v1beta1", "poddisruptionbudgets", true, &PodDisruptionBudgetList{})`
`10`		`- k8s.RegisterList("policy", "v1beta1", "podsecuritypolicys", false, &PodSecurityPolicyList{})`
	`10`	`+ k8s.RegisterList("policy", "v1beta1", "podsecuritypolicies", false, &PodSecurityPolicyList{})`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package v1alpha1`
`3`	`3`	`import "github.com/ericchiang/k8s"`
`4`	`4`
`5`	`5`	`func init() {`
`6`		`- k8s.Register("scheduling.k8s.io", "v1alpha1", "priorityclasss", false, &PriorityClass{})`
	`6`	`+ k8s.Register("scheduling.k8s.io", "v1alpha1", "priorityclasses", false, &PriorityClass{})`
`7`	`7`
`8`		`- k8s.RegisterList("scheduling.k8s.io", "v1alpha1", "priorityclasss", false, &PriorityClassList{})`
	`8`	`+ k8s.RegisterList("scheduling.k8s.io", "v1alpha1", "priorityclasses", false, &PriorityClassList{})`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package v1`
`3`	`3`	`import "github.com/ericchiang/k8s"`
`4`	`4`
`5`	`5`	`func init() {`
`6`		`- k8s.Register("storage.k8s.io", "v1", "storageclasss", false, &StorageClass{})`
	`6`	`+ k8s.Register("storage.k8s.io", "v1", "storageclasses", false, &StorageClass{})`
`7`	`7`
`8`		`- k8s.RegisterList("storage.k8s.io", "v1", "storageclasss", false, &StorageClassList{})`
	`8`	`+ k8s.RegisterList("storage.k8s.io", "v1", "storageclasses", false, &StorageClassList{})`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package v1beta1`
`3`	`3`	`import "github.com/ericchiang/k8s"`
`4`	`4`
`5`	`5`	`func init() {`
`6`		`- k8s.Register("storage.k8s.io", "v1beta1", "storageclasss", false, &StorageClass{})`
	`6`	`+ k8s.Register("storage.k8s.io", "v1beta1", "storageclasses", false, &StorageClass{})`
`7`	`7`
`8`		`- k8s.RegisterList("storage.k8s.io", "v1beta1", "storageclasss", false, &StorageClassList{})`
	`8`	`+ k8s.RegisterList("storage.k8s.io", "v1beta1", "storageclasses", false, &StorageClassList{})`
`9`	`9`	`}`