fix(executor): Resource template gets incorrect plural for certain types

[wreed4]

Fixes #9393

[terrytangyuan]

Thank you! Since we only rely on a single function from gengo, it might be better to fork the implementation (with a link and credit to original source code) instead of adding a less popular dependency.

[terrytangyuan]

Can you check if there’s any improvement to this function in the new versions of meta? Maybe the issue is already fixed.

[wreed4]

This is the PR that is open to fix the issue, but it's not merged and it's unclear to me if people are happy with this solution or if they want to use the solution I did in this PR.

kubernetes/kubernetes#110053

In master it's still in silly mode https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/api/meta/restmapper.go#L143

[wreed4]

re: forking the implementation it's not terribly much to fork and with a comment maybe it's okay, but using this function directly was suggested in the client-go bug because this is what is used by the tools that generate things like DeepCopy in controller-gen and a lot of other boiler plate code. Personally I wouldn't want to split away from that logic, but I do understand it's a small bit of code to add a whole dependency for. So whichever you guys feel happier with I'm happy to do.

This is the function implementation just to make things simple. There are a handful of calls out, but it's not massive. It is more than I would want to copy and paste personally, but again up to you guys.

// Name returns the plural form of the type's name. If the type's name is found
// in the exceptions map, the map value is returned.
func (r *pluralNamer) Name(t *types.Type) string {
	singular := t.Name.Name
	var plural string
	var ok bool
	if plural, ok = r.exceptions[singular]; ok {
		return r.finalize(plural)
	}
	if len(singular) < 2 {
		return r.finalize(singular)
	}

	switch rune(singular[len(singular)-1]) {
	case 's', 'x', 'z':
		plural = esPlural(singular)
	case 'y':
		sl := rune(singular[len(singular)-2])
		if isConsonant(sl) {
			plural = iesPlural(singular)
		} else {
			plural = sPlural(singular)
		}
	case 'h':
		sl := rune(singular[len(singular)-2])
		if sl == 'c' || sl == 's' {
			plural = esPlural(singular)
		} else {
			plural = sPlural(singular)
		}
	case 'e':
		sl := rune(singular[len(singular)-2])
		if sl == 'f' {
			plural = vesPlural(singular[:len(singular)-1])
		} else {
			plural = sPlural(singular)
		}
	case 'f':
		plural = vesPlural(singular)
	default:
		plural = sPlural(singular)
	}
	return r.finalize(plural)
}

[terrytangyuan]

this is what is used by the tools that generate things like DeepCopy in controller-gen and a lot of other boiler plate code

Could you link me to where this is being used?

Another concern is that there isn't any stable releases yet: https://github.com/kubernetes/gengo/releases

[wreed4]

https://github.com/kubernetes/gengo

I picked a random stable version of the kubernetes project to look into
https://github.com/kubernetes/kubernetes/blob/v1.21.10/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go
https://github.com/kubernetes/kubernetes/blob/a55bd631728590045b51a4f65bba31aed1415571/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go#L43

lots of places
https://github.com/kubernetes/kubernetes/search?p=3&q=%22k8s.io%2Fgengo%2Fnamer%22

[terrytangyuan]

Looks good. Thanks!